Partially Revert "Adapt controller and partially fix tests"

This reverts commit d4828f8d0edb0878ed1cca5cbafc061b3a46e2f0.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,14 @@
 blank_issues_enabled: true
 contact_links:
-  - name: 🚀 Discussions
-    url: https://github.com/btcpayserver/btcpayserver/discussions
-    about: Technical discussions, questions and feature requests
+  - name: 💡 Request a feature
+    url: https://github.com/btcpayserver/btcpayserver/discussions/categories/ideas-feature-requests
+    about: Submit a feature request or vote on ideas posted by others. Features with most upvotes become roadmap candidates
+  - name: 🧑‍💻 Ask a technical question
+    url: https://github.com/btcpayserver/btcpayserver/discussions/new?category=technical-support
+    about: If you're experiencing a technical problem post it to our community support forum
+  - name: 🔌 Report a problem with a plugin
+    url: https://github.com/btcpayserver/btcpayserver/discussions/new?category=plugins-integrations
+    about: Experiencing a problem with a third-party plugin? Post it here and we will tag their developers to assist
   - name: 📝 Official Documentation
     url: https://docs.btcpayserver.org
     about: Check our documentation for answers to common questions

.github/codeql/codeql-config.yml

@@ -0,0 +1,2 @@
+paths-ignore:
+  - 'BTCPayServer/wwwroot/vendor/**/*.js'

.github/workflows/codeql.yml

@@ -0,0 +1,80 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+# Allow running tests manually. Usefull if scan failure, or need to rescan before next scheduled date.
+  workflow_dispatch:
+# We scan only on a schedule for now, can uncomment the following to scan on commit or PR merge later on if deemed appropriate.
+  # push:
+  #  branches: [ "master" ]
+  # pull_request:
+  #   branches: [ "master" ]
+  schedule:
+  # Scan every Monday 06:00 UTC.
+    - cron: '0 6 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.run/Pack Test Extension.run.xml

@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Pack Test Plugin" type="DotNetProject" factoryName=".NET Project" singleton="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/BTCPayServer.PluginPacker/bin/Debug/netcoreapp3.1/BTCPayServer.PluginPacker.dll" />
-    <option name="PROGRAM_PARAMETERS" value="../../../../BTCPayServer.Plugins.Test\bin\Debug\netcoreapp3.1 BTCPayServer.Plugins.Test &quot;../../../../Packed Plugins&quot;" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/BTCPayServer.PluginPacker/bin/Debug/netcoreapp3.1" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/BTCPayServer.PluginPacker/BTCPayServer.PluginPacker.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
-    <method v="2">
-      <option name="Build" default="false" projectName="BTCPayServer.Plugins.Test" projectPath="C:\Git\btcpayserver\Plugins\BTCPayServer.Plugins.Test\BTCPayServer.Plugins.Test.csproj" />
-      <option name="Build" />
-    </method>
-  </configuration>
-</component>

BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Data.Common;
 using BTCPayServer.Abstractions.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -21,7 +22,6 @@ namespace BTCPayServer.Abstractions.Contracts
         }
 
         public abstract T CreateContext();
-
         class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator
         {
 #pragma warning disable EF1001 // Internal EF Core API usage.

BTCPayServer.Abstractions/Custodians/Client/Exception/AssetBalancesUnavailableException.cs

@@ -5,4 +5,8 @@ public class AssetBalancesUnavailableException : CustodianApiException
     public AssetBalancesUnavailableException(System.Exception e) : base(500, "asset-balances-unavailable", $"Cannot fetch the asset balances: {e.Message}", e)
     {
     }
+
+    public AssetBalancesUnavailableException(string errorMsg) : base(500, "asset-balances-unavailable", $"Cannot fetch the asset balances: {errorMsg}")
+    {
+    }
 }

BTCPayServer.Abstractions/Custodians/Client/Exception/CustodianApiException.cs

@@ -10,7 +10,7 @@ public class CustodianApiException : Exception
         HttpStatus = httpStatus;
         Code = code;
     }
-    
+
     public CustodianApiException(int httpStatus, string code, string message) : this(httpStatus, code, message, null)
     {
     }

BTCPayServer.Abstractions/Custodians/Client/SimulateWithdrawalResult.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using BTCPayServer.Client.Models;
+using BTCPayServer.JsonConverters;
+
+namespace BTCPayServer.Abstractions.Custodians.Client;
+
+public class SimulateWithdrawalResult
+{
+    public string PaymentMethod { get; }
+    public string Asset { get; }
+    public decimal MinQty { get; }
+    public decimal MaxQty { get; }
+
+    public List<LedgerEntryData> LedgerEntries { get; }
+
+    // Fee can be NULL if unknown.
+    public decimal? Fee { get; }
+
+    public SimulateWithdrawalResult(string paymentMethod, string asset, List<LedgerEntryData> ledgerEntries,
+        decimal minQty, decimal maxQty)
+    {
+        PaymentMethod = paymentMethod;
+        Asset = asset;
+        LedgerEntries = ledgerEntries;
+        MinQty = minQty;
+        MaxQty = maxQty;
+    }
+}

BTCPayServer.Abstractions/Custodians/ICanWithdraw.cs

@@ -5,9 +5,14 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Abstractions.Custodians;
 
+/// <summary>
+/// Interface for custodians that can move funds to the store wallet.
+/// </summary>
 public interface ICanWithdraw
 {
-    public Task<WithdrawResult> WithdrawAsync(string paymentMethod, decimal amount, JObject config, CancellationToken cancellationToken);
+    public Task<WithdrawResult> WithdrawToStoreWalletAsync(string paymentMethod, decimal amount, JObject config, CancellationToken cancellationToken);
+
+    public Task<SimulateWithdrawalResult> SimulateWithdrawalAsync(string paymentMethod, decimal qty, JObject config, CancellationToken cancellationToken);
 
     public Task<WithdrawResult> GetWithdrawalInfoAsync(string paymentMethod, string withdrawalId, JObject config, CancellationToken cancellationToken);
 

BTCPayServer.Abstractions/Custodians/ICustodian.cs

@@ -1,3 +1,4 @@
+#nullable enable
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -20,7 +21,6 @@ public interface ICustodian
      */
     Task<Dictionary<string, decimal>> GetAssetBalancesAsync(JObject config, CancellationToken cancellationToken);
 
-    public Task<Form.Form> GetConfigForm(JObject config, string locale,
-        CancellationToken cancellationToken = default);
+    public Task<Form.Form> GetConfigForm(JObject config, CancellationToken cancellationToken = default);
 
 }

BTCPayServer.Abstractions/Extensions/GreenfieldExtensions.cs

@@ -7,6 +7,10 @@ namespace BTCPayServer.Abstractions.Extensions;
 
 public static class GreenfieldExtensions
 {
+    public static IActionResult UserNotFound(this ControllerBase ctrl)
+    {
+        return ctrl.CreateAPIError(404, "user-not-found", "The user was not found");
+    }
     public static IActionResult CreateValidationError(this ControllerBase controller, ModelStateDictionary modelState)
     {
         return controller.UnprocessableEntity(modelState.ToGreenfieldValidationError());

BTCPayServer.Abstractions/Form/Field.cs

@@ -28,7 +28,7 @@ public class Field
 
     public bool Constant;
 
-    // HTML5 compatible type string like "text", "textarea", "email", "password", etc. Each type is a class and may contain more fields (i.e. "select" would have options).
+    // HTML5 compatible type string like "text", "textarea", "email", "password", etc.
     public string Type;
 
     public static Field CreateFieldset()
@@ -52,10 +52,10 @@ public class Field
     public string HelpText;
 
     [JsonExtensionData] public IDictionary<string, JToken> AdditionalData { get; set; }
-    public List<Field> Fields { get; set; } = new ();
+    public List<Field> Fields { get; set; } = new();
 
     // The field is considered "valid" if there are no validation errors
-    public List<string> ValidationErrors = new ();
+    public List<string> ValidationErrors = new();
 
     public virtual bool IsValid()
     {

BTCPayServer.Abstractions/Form/Form.cs

@@ -32,6 +32,8 @@ public class Form
     // Are all the fields valid in the form?
     public bool IsValid()
     {
+        if (TopMessages?.Any(t => t.Type == AlertMessage.AlertMessageType.Danger) is true)
+            return false;
         return Fields.Select(f => f.IsValid()).All(o => o);
     }
 
@@ -50,7 +52,7 @@ public class Form
         HashSet<string> nameReturned = new();
         foreach (var f in GetAllFieldsCore(new List<string>(), Fields))
         {
-            var fullName = string.Join('_', f.Path);
+            var fullName = string.Join('_', f.Path.Where(s => !string.IsNullOrEmpty(s)));
             if (!nameReturned.Add(fullName))
                 continue;
             yield return (fullName, f.Path, f.Field);
@@ -63,11 +65,10 @@ public class Form
         HashSet<string> nameReturned = new();
         foreach (var f in GetAllFieldsCore(new List<string>(), Fields))
         {
-            var fullName = string.Join('_', f.Path);
+            var fullName = string.Join('_', f.Path.Where(s => !string.IsNullOrEmpty(s)));
             if (!nameReturned.Add(fullName))
             {
                 errors.Add($"Form contains duplicate field names '{fullName}'");
-                continue;
             }
         }
         return errors.Count == 0;
@@ -84,15 +85,10 @@ public class Form
                 thisPath.Add(field.Name);
                 yield return (thisPath, field);
             }
-
-            foreach (var child in field.Fields)
+            foreach (var descendant in GetAllFieldsCore(thisPath, field.Fields))
             {
-                if (field.Constant)
-                    child.Constant = true;
-                foreach (var descendant in GetAllFieldsCore(thisPath, field.Fields))
-                {
-                    yield return descendant;
-                }
+                descendant.Field.Constant = field.Constant || descendant.Field.Constant;
+                yield return descendant;
             }
         }
     }
@@ -128,32 +124,12 @@ public class Form
             }
             else if (prop.Value.Type == JTokenType.String)
             {
-                var fullname = String.Join('_', propPath);
-                if (fields.TryGetValue(fullname, out var f) && !f.Constant)
+                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>();
             }
         }
     }
 
-    public JObject GetValues()
-    {
-        var r = new JObject();
-        foreach (var f in GetAllFields())
-        {
-            var node = r;
-            for (int i = 0; i < f.Path.Count - 1; i++)
-            {
-                var p = f.Path[i];
-                var child = node[p] as JObject;
-                if (child is null)
-                {
-                    child = new JObject();
-                    node[p] = child;
-                }
-                node = child;
-            }
-            node[f.Field.Name] = f.Field.Value;
-        }
-        return r;
-    }
+
 }

BTCPayServer.Abstractions/Security/ContentSecurityPolicies.cs

@@ -114,6 +114,11 @@ namespace BTCPayServer.Security
             _Policies.Add(policy);
         }
 
+        public void UnsafeEval()
+        {
+            Add("script-src", "'unsafe-eval'");
+        }
+
         public IEnumerable<ConsentSecurityPolicy> Rules => _Policies;
         public bool HasRules => _Policies.Count != 0;
 

BTCPayServer.Abstractions/TagHelpers/PermissionTagHelper.cs

@@ -6,7 +6,8 @@ using Microsoft.Extensions.Logging;
 
 namespace BTCPayServer.Abstractions.TagHelpers;
 
-[HtmlTargetElement(Attributes = nameof(Permission))]
+[HtmlTargetElement(Attributes = "[permission]")]
+[HtmlTargetElement(Attributes = "[not-permission]"  )]
 public class PermissionTagHelper : TagHelper
 {
     private readonly IAuthorizationService _authorizationService;
@@ -21,16 +22,19 @@ public class PermissionTagHelper : TagHelper
     }
 
     public string Permission { get; set; }
+    public string NotPermission { get; set; }
     public string PermissionResource { get; set; }
+    
 
     public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        if (string.IsNullOrEmpty(Permission))
+        if (string.IsNullOrEmpty(Permission) && string.IsNullOrEmpty(NotPermission))
             return;
         if (_httpContextAccessor.HttpContext is null)
             return;
 
-        var key = $"{Permission}_{PermissionResource}";
+        var expectedResult = !string.IsNullOrEmpty(Permission);
+        var key = $"{Permission??NotPermission}_{PermissionResource}";
         if (!_httpContextAccessor.HttpContext.Items.TryGetValue(key, out var o) ||
             o is not AuthorizationResult res)
         {
@@ -39,7 +43,7 @@ public class PermissionTagHelper : TagHelper
                 Permission);
             _httpContextAccessor.HttpContext.Items.Add(key, res);
         }
-        if (!res.Succeeded)
+        if (expectedResult != res.Succeeded)
         {
             output.SuppressOutput();
         }

BTCPayServer.Abstractions/TagHelpers/SVGUse.cs

@@ -23,12 +23,12 @@ public class SVGUse : UrlResolutionTagHelper2
     {
         _fileVersionProvider = fileVersionProvider;
     }
-    
+
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
         var attr = output.Attributes["href"].Value.ToString();
         var symbolIndex = attr!.IndexOf("#", StringComparison.InvariantCulture);
-        var start = attr.IndexOf("~", StringComparison.InvariantCulture) + 1; 
+        var start = attr.IndexOf("~", StringComparison.InvariantCulture) + 1;
         var length = (symbolIndex != -1 ? symbolIndex : attr.Length) - start;
         var filePath = attr.Substring(start, length);
         if (!string.IsNullOrEmpty(filePath))

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -12,6 +12,8 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/btcpayserver/btcpayserver</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
+        <Configurations>Debug;Release;Altcoins-Debug;Altcoins-Release</Configurations>
+        <Platforms>AnyCPU</Platforms>
     </PropertyGroup>
   <PropertyGroup>
     <Version Condition=" '$(Version)' == '' ">1.7.2</Version>

BTCPayServer.Client/BTCPayServerClient.Apps.cs

@@ -51,7 +51,7 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Get), token);
             return await HandleResponse<AppDataBase>(response);
         }
-        
+
         public virtual async Task<AppDataBase[]> GetAllApps(string storeId, CancellationToken token = default)
         {
             if (storeId == null)

BTCPayServer.Client/BTCPayServerClient.CustodianAccounts.cs

@@ -50,7 +50,7 @@ namespace BTCPayServer.Client
             await HandleResponse(response);
         }
 
-        public virtual async Task<DepositAddressData> GetDepositAddress(string storeId, string accountId, string paymentMethod, CancellationToken token = default)
+        public virtual async Task<DepositAddressData> GetCustodianAccountDepositAddress(string storeId, string accountId, string paymentMethod, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/addresses/{paymentMethod}"), token);
             return await HandleResponse<DepositAddressData>(response);
@@ -58,7 +58,6 @@ namespace BTCPayServer.Client
 
         public virtual async Task<MarketTradeResponseData> MarketTradeCustodianAccountAsset(string storeId, string accountId, TradeRequestData request, CancellationToken token = default)
         {
-
             //var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/users", null, request, HttpMethod.Post), token);
             //return await HandleResponse<ApplicationUserData>(response);
             var internalRequest = CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/market", null,
@@ -67,13 +66,13 @@ namespace BTCPayServer.Client
             return await HandleResponse<MarketTradeResponseData>(response);
         }
 
-        public virtual async Task<MarketTradeResponseData> GetTradeInfo(string storeId, string accountId, string tradeId, CancellationToken token = default)
+        public virtual async Task<MarketTradeResponseData> GetCustodianAccountTradeInfo(string storeId, string accountId, string tradeId, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/{tradeId}", method: HttpMethod.Get), token);
             return await HandleResponse<MarketTradeResponseData>(response);
         }
 
-        public virtual async Task<TradeQuoteResponseData> GetTradeQuote(string storeId, string accountId, string fromAsset, string toAsset, CancellationToken token = default)
+        public virtual async Task<TradeQuoteResponseData> GetCustodianAccountTradeQuote(string storeId, string accountId, string fromAsset, string toAsset, CancellationToken token = default)
         {
             var queryPayload = new Dictionary<string, object>();
             queryPayload.Add("fromAsset", fromAsset);
@@ -82,13 +81,19 @@ namespace BTCPayServer.Client
             return await HandleResponse<TradeQuoteResponseData>(response);
         }
 
-        public virtual async Task<WithdrawalResponseData> CreateWithdrawal(string storeId, string accountId, WithdrawRequestData request, CancellationToken token = default)
+        public virtual async Task<WithdrawalResponseData> CreateCustodianAccountWithdrawal(string storeId, string accountId, WithdrawRequestData request, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/withdrawals", bodyPayload: request, method: HttpMethod.Post), token);
             return await HandleResponse<WithdrawalResponseData>(response);
         }
 
-        public virtual async Task<WithdrawalResponseData> GetWithdrawalInfo(string storeId, string accountId, string paymentMethod, string withdrawalId, CancellationToken token = default)
+        public virtual async Task<WithdrawalSimulationResponseData> SimulateCustodianAccountWithdrawal(string storeId, string accountId, WithdrawRequestData request, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/withdrawals/simulation", bodyPayload: request, method: HttpMethod.Post), token);
+            return await HandleResponse<WithdrawalSimulationResponseData>(response);
+        }
+
+        public virtual async Task<WithdrawalResponseData> GetCustodianAccountWithdrawalInfo(string storeId, string accountId, string paymentMethod, string withdrawalId, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/withdrawals/{paymentMethod}/{withdrawalId}", method: HttpMethod.Get), token);
             return await HandleResponse<WithdrawalResponseData>(response);

BTCPayServer.Client/BTCPayServerClient.Lightning.Internal.cs

@@ -113,7 +113,7 @@ namespace BTCPayServer.Client
                 CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/invoices", queryPayload), token);
             return await HandleResponse<LightningInvoiceData[]>(response);
         }
-        
+
         public virtual async Task<LightningPaymentData[]> GetLightningPayments(string cryptoCode,
             bool? includePending = null, long? offsetIndex = null, CancellationToken token = default)
         {

BTCPayServer.Client/BTCPayServerClient.Lightning.Store.cs

@@ -115,7 +115,7 @@ namespace BTCPayServer.Client
                 CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices", queryPayload), token);
             return await HandleResponse<LightningInvoiceData[]>(response);
         }
-        
+
         public virtual async Task<LightningPaymentData[]> GetLightningPayments(string storeId, string cryptoCode,
             bool? includePending = null, long? offsetIndex = null, CancellationToken token = default)
         {

BTCPayServer.Client/BTCPayServerClient.ServerInfo.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
@@ -11,5 +12,11 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/server/info"), token);
             return await HandleResponse<ServerInfoData>(response);
         }
+        
+        public virtual async Task<List<RoleData>> GetServerRoles(CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/server/roles"), token);
+            return await HandleResponse<List<RoleData>>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.StoreRatesConfiguration.cs

@@ -54,7 +54,7 @@ namespace BTCPayServer.Client
             CancellationToken token = default)
         {
             using var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/stores/{storeId}/rates", 
+                CreateHttpRequest($"api/v1/stores/{storeId}/rates",
                     queryPayload: new Dictionary<string, object>() { { "currencyPair", currencyPair } },
                     method: HttpMethod.Get),
                 token);

BTCPayServer.Client/BTCPayServerClient.StoreUsers.cs

@@ -9,6 +9,13 @@ namespace BTCPayServer.Client
 {
     public partial class BTCPayServerClient
     {
+        public virtual async Task<List<RoleData>> GetStoreRoles(string storeId,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/roles"), token);
+            return await HandleResponse<List<RoleData>>(response);
+        }
+        
         public virtual async Task<IEnumerable<StoreUserData>> GetStoreUsers(string storeId,
             CancellationToken token = default)
         {

BTCPayServer.Client/BTCPayServerClient.cs

@@ -51,7 +51,8 @@ namespace BTCPayServer.Client
             {
                 if (message.StatusCode == System.Net.HttpStatusCode.UnprocessableEntity)
                 {
-                    var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(await message.Content.ReadAsStringAsync());
+                    var aa = await message.Content.ReadAsStringAsync();
+                    var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(aa);
                     throw new GreenfieldValidationException(err);
                 }
                 if (message.StatusCode == System.Net.HttpStatusCode.Forbidden)

BTCPayServer.Client/JsonConverters/NumericStringJsonConverter.cs

@@ -30,9 +30,9 @@ namespace BTCPayServer.JsonConverters
                 case JTokenType.Integer:
                 case JTokenType.String:
                     if (objectType == typeof(decimal) || objectType == typeof(decimal?))
-                        return decimal.Parse(token.ToString(), CultureInfo.InvariantCulture);
+                        return decimal.Parse(token.ToString(), NumberStyles.Any, CultureInfo.InvariantCulture);
                     if (objectType == typeof(double) || objectType == typeof(double?))
-                        return double.Parse(token.ToString(), CultureInfo.InvariantCulture);
+                        return double.Parse(token.ToString(), NumberStyles.Any, CultureInfo.InvariantCulture);
                     throw new JsonSerializationException("Unexpected object type: " + objectType);
                 case JTokenType.Null when objectType == typeof(decimal?) || objectType == typeof(double?):
                     return null;

BTCPayServer.Client/JsonConverters/TradeQuantityJsonConverter.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Globalization;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Lightning;
+using NBitcoin.JsonConverters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Client.JsonConverters
+{
+    public class TradeQuantityJsonConverter : JsonConverter<TradeQuantity>
+    {
+        public override TradeQuantity ReadJson(JsonReader reader, Type objectType, TradeQuantity existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            JToken token = JToken.Load(reader);
+            switch (token.Type)
+            {
+                case JTokenType.Float:
+                case JTokenType.Integer:
+                case JTokenType.String:
+                    if (TradeQuantity.TryParse(token.ToString(), out var q))
+                        return q;
+                    break;
+                case JTokenType.Null:
+                    return null;
+            }
+            throw new JsonObjectException("Invalid TradeQuantity, expected string. Expected: \"1.50\" or \"50%\"", reader);
+        }
+
+        public override void WriteJson(JsonWriter writer, TradeQuantity value, JsonSerializer serializer)
+        {
+            if (value is not null)
+                writer.WriteValue(value.ToString());
+        }
+    }
+}

BTCPayServer.Client/Models/InvoiceData.cs

@@ -86,6 +86,8 @@ namespace BTCPayServer.Client.Models
             public bool? RequiresRefundEmail { get; set; } = null;
             public string DefaultLanguage { get; set; }
             public CheckoutType? CheckoutType { get; set; }
+            public bool? LazyPaymentMethods { get; set; }
+            public string ExplicitRateScript { get; set; }
         }
     }
     public class InvoiceData : InvoiceDataBase

BTCPayServer.Client/Models/LNURLPayPaymentMethodBaseData.cs

@@ -3,7 +3,6 @@ namespace BTCPayServer.Client.Models
     public class LNURLPayPaymentMethodBaseData
     {
         public bool UseBech32Scheme { get; set; }
-        public bool EnableForStandardInvoices { get; set; }
         public bool LUD12Enabled { get; set; }
 
         public LNURLPayPaymentMethodBaseData()

BTCPayServer.Client/Models/LNURLPayPaymentMethodData.cs

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

BTCPayServer.Client/Models/LedgerEntryData.cs

@@ -1,3 +1,4 @@
+using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -6,6 +7,7 @@ namespace BTCPayServer.Client.Models;
 public class LedgerEntryData
 {
     public string Asset { get; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
     public decimal Qty { get; }
 
     [JsonConverter(typeof(StringEnumConverter))]

BTCPayServer.Client/Models/LightningAddressData.cs

@@ -6,5 +6,5 @@ public class LightningAddressData
     public string CurrencyCode { get; set; }
     public decimal? Min { get; set; }
     public decimal? Max { get; set; }
-    
+
 }

BTCPayServer.Client/Models/LightningInvoiceData.cs

@@ -16,7 +16,7 @@ namespace BTCPayServer.Client.Models
 
         [JsonProperty("BOLT11")]
         public string BOLT11 { get; set; }
-        
+
         public string PaymentHash { get; set; }
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
@@ -24,7 +24,7 @@ namespace BTCPayServer.Client.Models
 
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset? PaidAt { get; set; }
-        
+
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset ExpiresAt { get; set; }
 

BTCPayServer.Client/Models/LightningNetworkPaymentMethodBaseData.cs

@@ -4,7 +4,6 @@ namespace BTCPayServer.Client.Models
     {
 
         public string ConnectionString { get; set; }
-        public bool DisableBOLT11PaymentOption { get; set; }
         public LightningNetworkPaymentMethodBaseData()
         {
 

BTCPayServer.Client/Models/LightningNetworkPaymentMethodData.cs

@@ -16,13 +16,12 @@ namespace BTCPayServer.Client.Models
         {
         }
 
-        public LightningNetworkPaymentMethodData(string cryptoCode, string connectionString, bool enabled, string paymentMethod, bool disableBOLT11PaymentOption)
+        public LightningNetworkPaymentMethodData(string cryptoCode, string connectionString, bool enabled, string paymentMethod)
         {
             Enabled = enabled;
             CryptoCode = cryptoCode;
             ConnectionString = connectionString;
             PaymentMethod = paymentMethod;
-            DisableBOLT11PaymentOption = disableBOLT11PaymentOption;
         }
 
         public string PaymentMethod { get; set; }

BTCPayServer.Client/Models/RefundInvoiceRequest.cs

@@ -9,6 +9,7 @@ namespace BTCPayServer.Client.Models
     {
         RateThen,
         CurrentRate,
+        OverpaidAmount,
         Fiat,
         Custom
     }
@@ -18,8 +19,13 @@ namespace BTCPayServer.Client.Models
         public string? Name { get; set; } = null;
         public string? PaymentMethod { get; set; }
         public string? Description { get; set; } = null;
+        
         [JsonConverter(typeof(StringEnumConverter))]
         public RefundVariant? RefundVariant { get; set; }
+        
+        [JsonConverter(typeof(NumericStringJsonConverter))]
+        public decimal SubtractPercentage { get; set; }
+        
         [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal? CustomAmount { get; set; }
         public string? CustomCurrency { get; set; }

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -16,6 +16,8 @@ namespace BTCPayServer.Client.Models
 
         public string Website { get; set; }
 
+        public string SupportUrl { get; set; }
+
         [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public TimeSpan InvoiceExpiration { get; set; } = TimeSpan.FromMinutes(15);

BTCPayServer.Client/Models/StoreData.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace BTCPayServer.Client.Models
 {
     public class StoreData : StoreBaseData
@@ -17,4 +19,12 @@ namespace BTCPayServer.Client.Models
 
         public string Role { get; set; }
     }
+
+    public class RoleData
+    {
+        public string Id { get; set; }
+        public List<string> Permissions { get; set; }
+        public string Role { get; set; }
+        public bool IsServerRole { get; set; }
+    }
 }

BTCPayServer.Client/Models/TradeQuoteResponseData.cs

@@ -1,8 +1,13 @@
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+
 namespace BTCPayServer.Client.Models;
 
 public class TradeQuoteResponseData
 {
+    [JsonConverter(typeof(NumericStringJsonConverter))]
     public decimal Bid { get; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
     public decimal Ask { get; }
     public string ToAsset { get; }
     public string FromAsset { get; }

BTCPayServer.Client/Models/TradeRequestData.cs

@@ -1,8 +1,11 @@
+using Newtonsoft.Json;
+
 namespace BTCPayServer.Client.Models;
 
 public class TradeRequestData
 {
     public string FromAsset { set; get; }
     public string ToAsset { set; get; }
-    public string Qty { set; get; }
+    [JsonConverter(typeof(JsonConverters.TradeQuantityJsonConverter))]
+    public TradeQuantity Qty { set; get; }
 }

BTCPayServer.Client/Models/WebhookEvent.cs

@@ -51,6 +51,10 @@ namespace BTCPayServer.Client.Models
         public DateTimeOffset Timestamp { get; set; }
         [JsonExtensionData]
         public IDictionary<string, JToken> AdditionalData { get; set; }
+        public bool IsPruned()
+        {
+            return DeliveryId is null;
+        }
         public T ReadAs<T>()
         {
             var str = JsonConvert.SerializeObject(this, DefaultSerializerSettings);

BTCPayServer.Client/Models/WithdrawRequestData.cs

@@ -1,13 +1,85 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Net.Http.Headers;
+using Newtonsoft.Json;
+
 namespace BTCPayServer.Client.Models;
 
 public class WithdrawRequestData
 {
     public string PaymentMethod { set; get; }
-    public decimal Qty { set; get; }
+    [JsonConverter(typeof(JsonConverters.TradeQuantityJsonConverter))]
+    public TradeQuantity Qty { set; get; }
 
-    public WithdrawRequestData(string paymentMethod, decimal qty)
+    public WithdrawRequestData()
+    {
+
+    }
+
+    public WithdrawRequestData(string paymentMethod, TradeQuantity qty)
     {
         PaymentMethod = paymentMethod;
         Qty = qty;
     }
 }
+
+#nullable enable
+public record TradeQuantity
+{
+    public TradeQuantity(decimal value, ValueType type)
+    {
+        Type = type;
+        Value = value;
+    }
+
+    public enum ValueType
+    {
+        Exact,
+        Percent
+    }
+
+    public ValueType Type { get; }
+    public decimal Value { get; set; }
+
+    public override string ToString()
+    {
+        if (Type == ValueType.Exact)
+            return Value.ToString(CultureInfo.InvariantCulture);
+        else
+            return Value.ToString(CultureInfo.InvariantCulture) + "%";
+    }
+    public static TradeQuantity Parse(string str)
+    {
+        if (!TryParse(str, out var r))
+            throw new FormatException("Invalid TradeQuantity");
+        return r;
+    }
+    public static bool TryParse(string str, [MaybeNullWhen(false)] out TradeQuantity quantity)
+    {
+        if (str is null)
+            throw new ArgumentNullException(nameof(str));
+        quantity = null;
+        str = str.Trim();
+        str = str.Replace(" ", "");
+        if (str.Length == 0)
+            return false;
+        if (str[^1] == '%')
+        {
+            if (!decimal.TryParse(str[..^1], NumberStyles.Any, CultureInfo.InvariantCulture, out var r))
+                return false;
+            if (r < 0.0m)
+                return false;
+            quantity = new TradeQuantity(r, TradeQuantity.ValueType.Percent);
+        }
+        else
+        {
+            if (!decimal.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out var r))
+                return false;
+            if (r < 0.0m)
+                return false;
+            quantity = new TradeQuantity(r, TradeQuantity.ValueType.Exact);
+        }
+        return true;
+    }
+}

BTCPayServer.Client/Models/WithdrawalBaseResponseData.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace BTCPayServer.Client.Models;
+
+public abstract class WithdrawalBaseResponseData
+{
+    public string Asset { get; }
+    public string PaymentMethod { get; }
+    public List<LedgerEntryData> LedgerEntries { get; }
+    public string AccountId { get; }
+    public string CustodianCode { get; }
+
+    public WithdrawalBaseResponseData(string paymentMethod, string asset, List<LedgerEntryData> ledgerEntries, string accountId,
+        string custodianCode)
+    {
+        PaymentMethod = paymentMethod;
+        Asset = asset;
+        LedgerEntries = ledgerEntries;
+        AccountId = accountId;
+        CustodianCode = custodianCode;
+    }
+}

BTCPayServer.Client/Models/WithdrawalResponseData.cs

@@ -5,18 +5,13 @@ using Newtonsoft.Json.Converters;
 
 namespace BTCPayServer.Client.Models;
 
-public class WithdrawalResponseData
+public class WithdrawalResponseData : WithdrawalBaseResponseData
 {
-    public string Asset { get; }
-    public string PaymentMethod { get; }
-    public List<LedgerEntryData> LedgerEntries { get; }
-    public string WithdrawalId { get; }
-    public string AccountId { get; }
-    public string CustodianCode { get; }
 
     [JsonConverter(typeof(StringEnumConverter))]
     public WithdrawalStatus Status { get; }
 
+    public string WithdrawalId { get; }
     public DateTimeOffset CreatedTime { get; }
 
     public string TransactionId { get; }
@@ -24,14 +19,10 @@ public class WithdrawalResponseData
     public string TargetAddress { get; }
 
     public WithdrawalResponseData(string paymentMethod, string asset, List<LedgerEntryData> ledgerEntries, string withdrawalId, string accountId,
-        string custodianCode, WithdrawalStatus status, DateTimeOffset createdTime, string targetAddress, string transactionId)
+        string custodianCode, WithdrawalStatus status, DateTimeOffset createdTime, string targetAddress, string transactionId) : base(paymentMethod, asset, ledgerEntries, accountId,
+        custodianCode)
     {
-        PaymentMethod = paymentMethod;
-        Asset = asset;
-        LedgerEntries = ledgerEntries;
         WithdrawalId = withdrawalId;
-        AccountId = accountId;
-        CustodianCode = custodianCode;
         TargetAddress = targetAddress;
         TransactionId = transactionId;
         Status = status;

BTCPayServer.Client/Models/WithdrawalSimulationResponseData.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Client.Models;
+
+public class WithdrawalSimulationResponseData : WithdrawalBaseResponseData
+{
+    [JsonConverter(typeof(NumericStringJsonConverter))]
+    public decimal? MinQty { get; set; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
+    public decimal? MaxQty { get; set; }
+
+    public WithdrawalSimulationResponseData(string paymentMethod, string asset, string accountId,
+        string custodianCode, List<LedgerEntryData> ledgerEntries, decimal? minQty, decimal? maxQty) : base(paymentMethod,
+        asset, ledgerEntries, accountId, custodianCode)
+    {
+        MinQty = minQty;
+        MaxQty = maxQty;
+    }
+}

BTCPayServer.Client/Permissions.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
+using System.Linq.Expressions;
 
 namespace BTCPayServer.Client
 {
@@ -98,14 +100,45 @@ namespace BTCPayServer.Client
         {
             return policy.StartsWith("btcpay.plugin", StringComparison.OrdinalIgnoreCase);
         }
+        public static bool IsUserPolicy(string policy)
+        {
+            return policy.StartsWith("btcpay.user", StringComparison.OrdinalIgnoreCase);
+        }
+    }
+
+    public class PermissionSet
+    {
+        public PermissionSet() : this(Array.Empty<Permission>())
+        {
+
+        }
+        public PermissionSet(Permission[] permissions)
+        {
+            Permissions = permissions;
+        }
+
+        public Permission[] Permissions { get; }
+
+        public bool Contains(Permission requestedPermission)
+        {
+            return Permissions.Any(p => p.Contains(requestedPermission));
+        }
+        public bool Contains(string permission, string store)
+        {
+            if (permission is null)
+                throw new ArgumentNullException(nameof(permission));
+            if (store is null)
+                throw new ArgumentNullException(nameof(store));
+            return Contains(Permission.Create(permission, store));
+        }
     }
     public class Permission
     {
         static Permission()
         {
-            Init();
+            PolicyMap = Init();
         }
-        
+
         public static Permission Create(string policy, string scope = null)
         {
             if (TryCreatePermission(policy, scope, out var r))
@@ -121,7 +154,7 @@ namespace BTCPayServer.Client
             policy = policy.Trim().ToLowerInvariant();
             if (!Policies.IsValidPolicy(policy))
                 return false;
-            if (scope != null && !Policies.IsStorePolicy(policy))
+            if (!string.IsNullOrEmpty(scope) && !Policies.IsStorePolicy(policy))
                 return false;
             permission = new Permission(policy, scope);
             return true;
@@ -174,7 +207,7 @@ namespace BTCPayServer.Client
             }
             if (!Policies.IsStorePolicy(subpermission.Policy))
                 return true;
-            return Scope == null || subpermission.Scope == this.Scope;
+            return Scope == null || subpermission.Scope == Scope;
         }
 
         public static IEnumerable<Permission> ToPermissions(string[] permissions)
@@ -199,42 +232,62 @@ namespace BTCPayServer.Client
                 return true;
             if (policy == subpolicy)
                 return true;
-            if (!PolicyMap.TryGetValue(policy, out var subPolicies)) return false;
+            if (!PolicyMap.TryGetValue(policy, out var subPolicies))
+                return false;
             return subPolicies.Contains(subpolicy) || subPolicies.Any(s => ContainsPolicy(s, subpolicy));
         }
 
-        private static Dictionary<string, HashSet<string>> PolicyMap = new();
+        public static ReadOnlyDictionary<string, HashSet<string>> PolicyMap { get; private set; }
+    
 
-        private static void Init()
+        private static ReadOnlyDictionary<string, HashSet<string>> Init()
         {
-            PolicyHasChild(Policies.CanModifyStoreSettings,
+            var policyMap = new Dictionary<string, HashSet<string>>();
+            PolicyHasChild(policyMap, Policies.CanModifyStoreSettings,
                 Policies.CanManageCustodianAccounts,
                 Policies.CanManagePullPayments,
                 Policies.CanModifyInvoices,
                 Policies.CanViewStoreSettings,
                 Policies.CanModifyStoreWebhooks,
-                Policies.CanModifyPaymentRequests);
+                Policies.CanModifyPaymentRequests,
+                Policies.CanUseLightningNodeInStore);
 
-            PolicyHasChild(Policies.CanManageUsers, Policies.CanCreateUser);
-            PolicyHasChild(Policies.CanManagePullPayments, Policies.CanCreatePullPayments );
-            PolicyHasChild(Policies.CanCreatePullPayments, Policies.CanCreateNonApprovedPullPayments );
-            PolicyHasChild(Policies.CanModifyPaymentRequests, Policies.CanViewPaymentRequests );
-            PolicyHasChild(Policies.CanModifyProfile, Policies.CanViewProfile );
-            PolicyHasChild(Policies.CanUseLightningNodeInStore, Policies.CanViewLightningInvoiceInStore, Policies.CanCreateLightningInvoiceInStore );
-            PolicyHasChild(Policies.CanManageNotificationsForUser, Policies.CanViewNotificationsForUser );
-            PolicyHasChild(Policies.CanModifyServerSettings,
+            PolicyHasChild(policyMap,Policies.CanManageUsers, Policies.CanCreateUser);
+            PolicyHasChild(policyMap,Policies.CanManagePullPayments, Policies.CanCreatePullPayments);
+            PolicyHasChild(policyMap,Policies.CanCreatePullPayments, Policies.CanCreateNonApprovedPullPayments);
+            PolicyHasChild(policyMap,Policies.CanModifyPaymentRequests, Policies.CanViewPaymentRequests);
+            PolicyHasChild(policyMap,Policies.CanModifyProfile, Policies.CanViewProfile);
+            PolicyHasChild(policyMap,Policies.CanUseLightningNodeInStore, Policies.CanViewLightningInvoiceInStore, Policies.CanCreateLightningInvoiceInStore);
+            PolicyHasChild(policyMap,Policies.CanManageNotificationsForUser, Policies.CanViewNotificationsForUser);
+            PolicyHasChild(policyMap,Policies.CanModifyServerSettings,
                 Policies.CanUseInternalLightningNode,
                 Policies.CanManageUsers);
-            PolicyHasChild(Policies.CanUseInternalLightningNode, Policies.CanCreateLightningInvoiceInternalNode,Policies.CanViewLightningInvoiceInternalNode );
-            PolicyHasChild(Policies.CanManageCustodianAccounts, Policies.CanViewCustodianAccounts );
-            PolicyHasChild(Policies.CanModifyInvoices, Policies.CanViewInvoices, Policies.CanCreateInvoice );
-            PolicyHasChild(Policies.CanViewStoreSettings, Policies.CanViewInvoices, Policies.CanViewPaymentRequests  );
-            
+            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);
+
+            var missingPolicies = Policies.AllPolicies.ToHashSet();
+            //recurse through the tree to see which policies are not included in the tree
+            foreach (var policy in policyMap)
+            {
+                missingPolicies.Remove(policy.Key);
+                foreach (var subPolicy in policy.Value)
+                {
+                    missingPolicies.Remove(subPolicy);
+                }
+            }
+
+            foreach (var missingPolicy in missingPolicies)
+            {
+                policyMap.Add(missingPolicy, new HashSet<string>());
+            }
+            return new ReadOnlyDictionary<string, HashSet<string>>(policyMap);
         }
 
-        private static void PolicyHasChild(string policy, params string[] subPolicies)
+        private static void PolicyHasChild(Dictionary<string, HashSet<string>>policyMap, string policy, params string[] subPolicies)
         {
-            if (PolicyMap.TryGetValue(policy, out var existingSubPolicies))
+            if (policyMap.TryGetValue(policy, out var existingSubPolicies))
             {
                 foreach (string subPolicy in subPolicies)
                 {
@@ -243,33 +296,26 @@ namespace BTCPayServer.Client
             }
             else
             {
-                PolicyMap.Add(policy,subPolicies.ToHashSet());
+                policyMap.Add(policy, subPolicies.ToHashSet());
             }
         }
-        
 
         public string Scope { get; }
         public string Policy { get; }
 
         public override string ToString()
         {
-            if (Scope != null)
-            {
-                return $"{Policy}:{Scope}";
-            }
-            return Policy;
+            return Scope != null ? $"{Policy}:{Scope}" : Policy;
         }
 
         public override bool Equals(object obj)
         {
             Permission item = obj as Permission;
-            if (item == null)
-                return false;
-            return ToString().Equals(item.ToString());
+            return item != null && ToString().Equals(item.ToString());
         }
         public static bool operator ==(Permission a, Permission b)
         {
-            if (System.Object.ReferenceEquals(a, b))
+            if (ReferenceEquals(a, b))
                 return true;
             if (((object)a == null) || ((object)b == null))
                 return false;

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="NBXplorer.Client" Version="4.2.3" />
+    <PackageReference Include="NBXplorer.Client" Version="4.2.5" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="2.0.1" />
   </ItemGroup>
   <ItemGroup Condition="'$(Altcoins)' != 'true'">

BTCPayServer.Data/ApplicationDbContext.cs

@@ -64,6 +64,7 @@ namespace BTCPayServer.Data
         public DbSet<U2FDevice> U2FDevices { get; set; }
         public DbSet<Fido2Credential> Fido2Credentials { get; set; }
         public DbSet<UserStore> UserStore { get; set; }
+        public DbSet<StoreRole> StoreRoles { get; set; }
         [Obsolete]
         public DbSet<WalletData> Wallets { get; set; }
         public DbSet<WalletObjectData> WalletObjects { get; set; }
@@ -124,14 +125,15 @@ namespace BTCPayServer.Data
 #pragma warning disable CS0612 // Type or member is obsolete
             WalletTransactionData.OnModelCreating(builder);
 #pragma warning restore CS0612 // Type or member is obsolete
-			WebhookDeliveryData.OnModelCreating(builder, Database);
-			LightningAddressData.OnModelCreating(builder, Database);
-			PayoutProcessorData.OnModelCreating(builder, Database);
-			WebhookData.OnModelCreating(builder, Database);
-			FormData.OnModelCreating(builder, Database);
+            WebhookDeliveryData.OnModelCreating(builder, Database);
+            LightningAddressData.OnModelCreating(builder, Database);
+            PayoutProcessorData.OnModelCreating(builder, Database);
+            WebhookData.OnModelCreating(builder, Database);
+            FormData.OnModelCreating(builder, Database);
+            StoreRole.OnModelCreating(builder, Database);
 
 
-			if (Database.IsSqlite() && !_designTime)
+            if (Database.IsSqlite() && !_designTime)
             {
                 // SQLite does not have proper support for DateTimeOffset via Entity Framework Core, see the limitations
                 // here: https://docs.microsoft.com/en-us/ef/core/providers/sqlite/limitations#query-limitations

BTCPayServer.Data/Data/FormData.cs

@@ -13,14 +13,14 @@ public class FormData
     public StoreData Store { get; set; }
     public string Config { get; set; }
     public bool Public { get; set; }
-    
+
     internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
     {
         builder.Entity<FormData>()
             .HasOne(o => o.Store)
             .WithMany(o => o.Forms).OnDelete(DeleteBehavior.Cascade);
         builder.Entity<FormData>().HasIndex(o => o.StoreId);
-        
+
         if (databaseFacade.IsNpgsql())
         {
             builder.Entity<FormData>()

BTCPayServer.Data/Data/LightingAddressData.cs

@@ -1,6 +1,9 @@
 using System;
+using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Data;
 
@@ -38,4 +41,9 @@ public class LightningAddressDataBlob
     public string CurrencyCode { get; set; }
     public decimal? Min { get; set; }
     public decimal? Max { get; set; }
+
+    public JObject InvoiceMetadata { get; set; }
+    
+    [JsonExtensionData] public Dictionary<string, JToken> AdditionalData { get; set; }
+    
 }

BTCPayServer.Data/Data/NotificationData.cs

@@ -24,8 +24,8 @@ namespace BTCPayServer.Data
         public string Blob2 { get; set; }
 
 
-		internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
-		{
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
+        {
             builder.Entity<NotificationData>()
                 .HasOne(o => o.ApplicationUser)
                 .WithMany(n => n.Notifications)

BTCPayServer.Data/Data/StoreData.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
 using BTCPayServer.Client.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using PayoutProcessorData = BTCPayServer.Data.PayoutProcessorData;
 
 namespace BTCPayServer.Data
 {
@@ -36,8 +34,6 @@ namespace BTCPayServer.Data
 
         public byte[] StoreCertificate { get; set; }
 
-        [NotMapped] public string Role { get; set; }
-
         public string StoreBlob { get; set; }
 
         [Obsolete("Use GetDefaultPaymentId instead")]
@@ -51,6 +47,7 @@ namespace BTCPayServer.Data
         public IEnumerable<CustodianAccountData> CustodianAccounts { get; set; }
         public IEnumerable<StoreSettingData> Settings { get; set; }
         public IEnumerable<FormData> Forms { get; set; }
+        public IEnumerable<StoreRole> StoreRoles { get; set; }
 
         internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {

BTCPayServer.Data/Data/StoreRole.cs

@@ -0,0 +1,50 @@
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Data;
+
+public class StoreRole
+{
+    public string Id { get; set; }
+    public string StoreDataId { get; set; }
+    public string Role { get; set; }
+    public List<string> Permissions { get; set; }
+    public List<UserStore> Users { get; set; }
+    public StoreData StoreData { get; set; }
+
+    internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
+    {
+        builder.Entity<StoreRole>(entity =>
+        {
+            entity.HasOne(e => e.StoreData)
+                .WithMany(s => s.StoreRoles)
+                .HasForeignKey(e => e.StoreDataId)
+                .OnDelete(DeleteBehavior.Cascade)
+                .IsRequired(false);
+            
+            entity.HasIndex(entity => new {entity.StoreDataId, entity.Role}).IsUnique();
+        });
+        
+        
+        
+        if (!databaseFacade.IsNpgsql())
+        {
+            builder.Entity<StoreRole>()
+                .Property(o => o.Permissions)
+                .HasConversion(
+                    v => JsonConvert.SerializeObject(v),
+                    v => JsonConvert.DeserializeObject<List<string>>(v)?? new List<string>(),
+                    new ValueComparer<List<string>>(
+                        (c1, c2) =>  c1 ==c2 || c1 != null && c2 != null && c1.SequenceEqual(c2),
+                        c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
+                        c => c.ToList()));
+        }
+    }
+}

BTCPayServer.Data/Data/UserStore.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data
@@ -9,7 +10,10 @@ namespace BTCPayServer.Data
 
         public string StoreDataId { get; set; }
         public StoreData StoreData { get; set; }
-        public string Role { get; set; }
+        [Column("Role")]
+        public string StoreRoleId { get; set; }
+        public StoreRole StoreRole { get; set; }
+        
 
 
         internal static void OnModelCreating(ModelBuilder builder)
@@ -32,6 +36,10 @@ namespace BTCPayServer.Data
                 .HasOne(pt => pt.StoreData)
                 .WithMany(t => t.UserStores)
                 .HasForeignKey(pt => pt.StoreDataId);
+
+            builder.Entity<UserStore>().HasOne(e => e.StoreRole)
+                .WithMany(role => role.Users)
+                .HasForeignKey(e => e.StoreRoleId);
         }
     }
 }

BTCPayServer.Data/Data/WebhookDeliveryData.cs

@@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class WebhookDeliveryData : IHasBlobUntyped
+    public class WebhookDeliveryData
     {
         [Key]
         [MaxLength(25)]
@@ -17,10 +17,8 @@ namespace BTCPayServer.Data
 
         [Required]
         public DateTimeOffset Timestamp { get; set; }
-        [Obsolete("Use Blob2 instead")]
-        public byte[] Blob { get; set; }
-        public string Blob2 { get; set; }
-
+        public string Blob { get; set; }
+        public bool Pruned { get; set; }
 
         internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
@@ -28,11 +26,11 @@ namespace BTCPayServer.Data
                 .HasOne(o => o.Webhook)
                 .WithMany(a => a.Deliveries).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<WebhookDeliveryData>().HasIndex(o => o.WebhookId);
-
+            builder.Entity<WebhookDeliveryData>().HasIndex(o => o.Timestamp);
             if (databaseFacade.IsNpgsql())
             {
                 builder.Entity<WebhookDeliveryData>()
-                    .Property(o => o.Blob2)
+                    .Property(o => o.Blob)
                     .HasColumnType("JSONB");
             }
         }

BTCPayServer.Data/Migrations/20230125085242_AddForms.cs

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

BTCPayServer.Data/Migrations/20230315062447_fixmaxlength.cs

@@ -0,0 +1,31 @@
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20230315062447_fixmaxlength")]
+    public partial class fixmaxlength : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (migrationBuilder.IsNpgsql())
+            {
+                migrationBuilder.Sql("ALTER TABLE \"InvoiceSearches\" ALTER COLUMN \"Value\" TYPE TEXT USING \"Value\"::TEXT;");
+                migrationBuilder.Sql("ALTER TABLE \"Invoices\"  ALTER COLUMN \"OrderId\" TYPE TEXT USING \"OrderId\"::TEXT;");
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // Not supported
+        }
+    }
+}

BTCPayServer.Data/Migrations/20230504125505_StoreRoles.cs

@@ -0,0 +1,106 @@
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NBitcoin;
+using Newtonsoft.Json;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20230504125505_StoreRoles")]
+    public partial class StoreRoles : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var permissionsType = migrationBuilder.IsNpgsql() ? "TEXT[]" : "TEXT";
+            migrationBuilder.CreateTable(
+                name: "StoreRoles",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "TEXT", nullable: false),
+                    StoreDataId = table.Column<string>(type: "TEXT", nullable: true),
+                    Role = table.Column<string>(type: "TEXT", nullable: false),
+                    Permissions = table.Column<string>(type: permissionsType, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_StoreRoles", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_StoreRoles_Stores_StoreDataId",
+                        column: x => x.StoreDataId,
+                        principalTable: "Stores",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_StoreRoles_StoreDataId_Role",
+                table: "StoreRoles",
+                columns: new[] { "StoreDataId", "Role" },
+                unique: true);
+
+            object GetPermissionsData(string[] permissions)
+            {
+                if (migrationBuilder.IsNpgsql())
+                    return permissions;
+                return JsonConvert.SerializeObject(permissions);
+            }
+
+            migrationBuilder.InsertData(
+                "StoreRoles",
+                columns: new[] { "Id", "Role", "Permissions" },
+                columnTypes: new[] { "TEXT", "TEXT", permissionsType },
+                values: new object[,]
+                {
+                    {
+                        "Owner", "Owner", GetPermissionsData(new[]
+                        {
+                            "btcpay.store.canmodifystoresettings",
+                            "btcpay.store.cantradecustodianaccount",
+                            "btcpay.store.canwithdrawfromcustodianaccount",
+                            "btcpay.store.candeposittocustodianaccount"
+                        })
+                    },
+                    {
+                        "Guest", "Guest", GetPermissionsData(new[]
+                        {
+                            "btcpay.store.canviewstoresettings",
+                            "btcpay.store.canmodifyinvoices",
+                            "btcpay.store.canviewcustodianaccounts",
+                            "btcpay.store.candeposittocustodianaccount"
+                        })
+                }
+                });
+
+            if (this.SupportAddForeignKey(migrationBuilder.ActiveProvider))
+            {
+                
+                migrationBuilder.AddForeignKey(
+                    name: "FK_UserStore_StoreRoles_Role",
+                    table: "UserStore",
+                    column: "Role",
+                    principalTable: "StoreRoles",
+                    principalColumn: "Id");
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+            if (this.SupportDropForeignKey(migrationBuilder.ActiveProvider))
+            {
+                migrationBuilder.DropForeignKey(
+                    name: "FK_UserStore_StoreRoles_Role",
+                    table: "UserStore");
+            }
+
+            migrationBuilder.DropTable(
+                name: "StoreRoles");
+        }
+    }
+}

BTCPayServer.Data/Migrations/20230529135505_WebhookDeliveriesCleanup.cs

@@ -0,0 +1,83 @@
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NBitcoin;
+using Newtonsoft.Json;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20230529135505_WebhookDeliveriesCleanup")]
+    public partial class WebhookDeliveriesCleanup : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (migrationBuilder.IsNpgsql())
+            {
+                migrationBuilder.Sql("DROP TABLE IF EXISTS \"InvoiceWebhookDeliveries\", \"WebhookDeliveries\";");
+
+                migrationBuilder.CreateTable(
+                name: "WebhookDeliveries",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "TEXT", nullable: false),
+                    WebhookId = table.Column<string>(type: "TEXT", nullable: false),
+                    Timestamp = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    Pruned = table.Column<bool>(type: "BOOLEAN", nullable: false),
+                    Blob = table.Column<string>(type: "JSONB", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WebhookDeliveries", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_WebhookDeliveries_Webhooks_WebhookId",
+                        column: x => x.WebhookId,
+                        principalTable: "Webhooks",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+
+                migrationBuilder.CreateIndex(
+                    name: "IX_WebhookDeliveries_WebhookId",
+                    table: "WebhookDeliveries",
+                    column: "WebhookId");
+                migrationBuilder.Sql("CREATE INDEX \"IX_WebhookDeliveries_Timestamp\" ON \"WebhookDeliveries\"(\"Timestamp\") WHERE \"Pruned\" IS FALSE");
+
+                migrationBuilder.CreateTable(
+                name: "InvoiceWebhookDeliveries",
+                columns: table => new
+                {
+                    InvoiceId = table.Column<string>(type: "TEXT", nullable: false),
+                    DeliveryId = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InvoiceWebhookDeliveries", x => new { x.InvoiceId, x.DeliveryId });
+                    table.ForeignKey(
+                        name: "FK_InvoiceWebhookDeliveries_WebhookDeliveries_DeliveryId",
+                        column: x => x.DeliveryId,
+                        principalTable: "WebhookDeliveries",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InvoiceWebhookDeliveries_Invoices_InvoiceId",
+                        column: x => x.InvoiceId,
+                        principalTable: "Invoices",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -214,56 +214,6 @@ namespace BTCPayServer.Migrations
                     b.ToTable("CustodianAccount");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.FormData", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Config")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("Public")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("StoreId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("StoreId");
-
-                    b.ToTable("Forms");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PayoutProcessorData", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<byte[]>("Blob")
-                        .HasColumnType("BLOB");
-
-                    b.Property<string>("PaymentMethod")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Processor")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("StoreId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("StoreId");
-
-                    b.ToTable("PayoutProcessors");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.Fido2Credential", b =>
                 {
                     b.Property<string>("Id")
@@ -292,6 +242,31 @@ namespace BTCPayServer.Migrations
                     b.ToTable("Fido2Credentials");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.FormData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Config")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Public")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("StoreId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("Forms");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
                 {
                     b.Property<string>("Id")
@@ -655,6 +630,34 @@ namespace BTCPayServer.Migrations
                     b.ToTable("Payouts");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.PayoutProcessorData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("Blob")
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Processor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StoreId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("PayoutProcessors");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
                 {
                     b.Property<string>("Id")
@@ -802,6 +805,28 @@ namespace BTCPayServer.Migrations
                     b.ToTable("Files");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.StoreRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Permissions")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StoreDataId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreDataId", "Role")
+                        .IsUnique();
+
+                    b.ToTable("StoreRoles");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.StoreSettingData", b =>
                 {
                     b.Property<string>("StoreId")
@@ -878,13 +903,16 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("StoreDataId")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("Role")
-                        .HasColumnType("TEXT");
+                    b.Property<string>("StoreRoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("Role");
 
                     b.HasKey("ApplicationUserId", "StoreDataId");
 
                     b.HasIndex("StoreDataId");
 
+                    b.HasIndex("StoreRoleId");
+
                     b.ToTable("UserStore");
                 });
 
@@ -991,12 +1019,12 @@ namespace BTCPayServer.Migrations
                         .HasMaxLength(25)
                         .HasColumnType("TEXT");
 
-                    b.Property<byte[]>("Blob")
-                        .HasColumnType("BLOB");
-
-                    b.Property<string>("Blob2")
+                    b.Property<string>("Blob")
                         .HasColumnType("TEXT");
 
+                    b.Property<bool>("Pruned")
+                        .HasColumnType("INTEGER");
+
                     b.Property<DateTimeOffset>("Timestamp")
                         .HasColumnType("TEXT");
 
@@ -1007,6 +1035,8 @@ namespace BTCPayServer.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Timestamp");
+
                     b.HasIndex("WebhookId");
 
                     b.ToTable("WebhookDeliveries");
@@ -1188,26 +1218,6 @@ namespace BTCPayServer.Migrations
                     b.Navigation("StoreData");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.FormData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.StoreData", "Store")
-                        .WithMany("Forms")
-                        .HasForeignKey("StoreId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Store");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PayoutProcessorData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.StoreData", "Store")
-                        .WithMany("PayoutProcessors")
-                        .HasForeignKey("StoreId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Store");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.Fido2Credential", b =>
                 {
                     b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
@@ -1218,6 +1228,16 @@ namespace BTCPayServer.Migrations
                     b.Navigation("ApplicationUser");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.FormData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "Store")
+                        .WithMany("Forms")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("Store");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
@@ -1343,6 +1363,16 @@ namespace BTCPayServer.Migrations
                     b.Navigation("StoreData");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.PayoutProcessorData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "Store")
+                        .WithMany("PayoutProcessors")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("Store");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
@@ -1392,6 +1422,16 @@ namespace BTCPayServer.Migrations
                     b.Navigation("ApplicationUser");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.StoreRole", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                        .WithMany("StoreRoles")
+                        .HasForeignKey("StoreDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("StoreData");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.StoreSettingData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "Store")
@@ -1446,9 +1486,15 @@ namespace BTCPayServer.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("BTCPayServer.Data.StoreRole", "StoreRole")
+                        .WithMany("Users")
+                        .HasForeignKey("StoreRoleId");
+
                     b.Navigation("ApplicationUser");
 
                     b.Navigation("StoreData");
+
+                    b.Navigation("StoreRole");
                 });
 
             modelBuilder.Entity("BTCPayServer.Data.WalletObjectLinkData", b =>
@@ -1606,9 +1652,16 @@ namespace BTCPayServer.Migrations
 
                     b.Navigation("Settings");
 
+                    b.Navigation("StoreRoles");
+
                     b.Navigation("UserStores");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.StoreRole", b =>
+                {
+                    b.Navigation("Users");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.WalletData", b =>
                 {
                     b.Navigation("WalletTransactions");

BTCPayServer.Rating/Currencies.json

@@ -1305,7 +1305,7 @@
       "name":"Satoshis",
       "code":"SATS",
       "divisibility":0,
-      "symbol":"Sats",
+      "symbol":"sats",
       "crypto":true
    },
    {

BTCPayServer.Rating/CurrencyNameTable.cs

@@ -5,7 +5,6 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using BTCPayServer.Rating;
 using NBitcoin;
 using Newtonsoft.Json;
 
@@ -28,14 +27,6 @@ namespace BTCPayServer.Services.Rates
         }
 
         static readonly Dictionary<string, IFormatProvider> _CurrencyProviders = new Dictionary<string, IFormatProvider>();
-        public string FormatCurrency(string price, string currency)
-        {
-            return FormatCurrency(decimal.Parse(price, CultureInfo.InvariantCulture), currency);
-        }
-        public string FormatCurrency(decimal price, string currency)
-        {
-            return price.ToString("C", GetCurrencyProvider(currency));
-        }
 
         public NumberFormatInfo GetNumberFormatInfo(string currency, bool useFallback)
         {
@@ -56,6 +47,7 @@ namespace BTCPayServer.Services.Rates
             currencyInfo.CurrencySymbol = currency;
             return currencyInfo;
         }
+
         public NumberFormatInfo GetNumberFormatInfo(string currency)
         {
             var curr = GetCurrencyProvider(currency);
@@ -65,6 +57,7 @@ namespace BTCPayServer.Services.Rates
                 return ni;
             return null;
         }
+
         public IFormatProvider GetCurrencyProvider(string currency)
         {
             lock (_CurrencyProviders)
@@ -104,30 +97,6 @@ namespace BTCPayServer.Services.Rates
             currencyProviders.TryAdd(code, number);
         }
 
-        /// <summary>
-        /// Format a currency like "0.004 $ (USD)", round to significant divisibility
-        /// </summary>
-        /// <param name="value">The value</param>
-        /// <param name="currency">Currency code</param>
-        /// <returns></returns>
-        public string DisplayFormatCurrency(decimal value, string currency)
-        {
-            var provider = GetNumberFormatInfo(currency, true);
-            var currencyData = GetCurrencyData(currency, true);
-            var divisibility = currencyData.Divisibility;
-            value = value.RoundToSignificant(ref divisibility);
-            if (divisibility != provider.CurrencyDecimalDigits)
-            {
-                provider = (NumberFormatInfo)provider.Clone();
-                provider.CurrencyDecimalDigits = divisibility;
-            }
-
-            if (currencyData.Crypto)
-                return value.ToString("C", provider);
-            else
-                return value.ToString("C", provider) + $" ({currency})";
-        }
-
         readonly Dictionary<string, CurrencyData> _Currencies;
 
         static CurrencyData[] LoadCurrency()

BTCPayServer.Rating/Extensions.cs

@@ -15,7 +15,7 @@ namespace BTCPayServer.Rating
                 while (true)
                 {
                     var rounded = decimal.Round(value, divisibility, MidpointRounding.AwayFromZero);
-                    if ((Math.Abs(rounded - value) / value) < 0.001m)
+                    if ((Math.Abs(rounded - value) / value) < 0.01m)
                     {
                         value = rounded;
                         break;

BTCPayServer.Rating/Providers/NullRateProvider.cs

@@ -20,7 +20,7 @@ namespace BTCPayServer.Services.Rates
             }
         }
 
-        public RateSourceInfo RateSourceInfo => new RateSourceInfo("NULL","NULL", "https://NULL.NULL");
+        public RateSourceInfo RateSourceInfo => new RateSourceInfo("NULL", "NULL", "https://NULL.NULL");
 
         public Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {

BTCPayServer.Rating/Services/RateProviderFactory.cs

@@ -89,7 +89,7 @@ namespace BTCPayServer.Services.Rates
                     AvailableRateProviders.Add(new(rsi.Id, rsi.DisplayName, rsi.Url, RateSource.Coingecko));
                 }
             }
-            AvailableRateProviders.Sort((a,b) => StringComparer.Ordinal.Compare(a.DisplayName, b.DisplayName));
+            AvailableRateProviders.Sort((a, b) => StringComparer.Ordinal.Compare(a.DisplayName, b.DisplayName));
         }
 
         public List<AvailableRateProvider> AvailableRateProviders { get; } = new List<AvailableRateProvider>();

BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs

@@ -6,11 +6,13 @@ using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
+using BTCPayServer.Hosting;
 using BTCPayServer.Lightning;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Models.WalletViewModels;
 using BTCPayServer.Payments;
+using BTCPayServer.Plugins.PointOfSale;
 using BTCPayServer.Plugins.PointOfSale.Controllers;
 using BTCPayServer.Plugins.PointOfSale.Models;
 using BTCPayServer.Services.Apps;
@@ -50,6 +52,7 @@ namespace BTCPayServer.Tests
                 user.RegisterDerivationScheme(cryptoCode);
                 user.RegisterDerivationScheme("LTC");
                 user.RegisterLightningNode(cryptoCode, LightningConnectionType.CLightning);
+                user.SetLNUrl("BTC", false);
                 var btcNetwork = tester.PayTester.Networks.GetNetwork<BTCPayNetwork>(cryptoCode);
                 var invoice = await user.BitPay.CreateInvoiceAsync(
                     new Invoice
@@ -243,7 +246,7 @@ namespace BTCPayServer.Tests
                 await tester.EnsureChannelsSetup();
                 var user = tester.NewAccount();
                 user.GrantAccess(true);
-                user.RegisterLightningNode("BTC", LightningConnectionType.Charge);
+                user.RegisterLightningNode("BTC");
                 user.RegisterDerivationScheme("BTC");
                 user.RegisterDerivationScheme("LTC");
 
@@ -386,7 +389,7 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("BOLT11Expiration")).SendKeys("5" + Keys.Enter);
             s.GoToInvoice(invoice.Id);
             s.Driver.FindElement(By.Id("IssueRefund")).Click();
-            
+
             if (multiCurrency)
             {
                 s.Driver.WaitUntilAvailable(By.Id("RefundForm"), TimeSpan.FromSeconds(1));
@@ -396,21 +399,21 @@ namespace BTCPayServer.Tests
             }
 
             s.Driver.WaitUntilAvailable(By.Id("RefundForm"), TimeSpan.FromSeconds(1));
-            Assert.Contains("$5,500.00", s.Driver.PageSource); // Should propose reimburse in fiat
-            Assert.Contains("1.10000000 ₿", s.Driver.PageSource); // Should propose reimburse in BTC at the rate of before
-            Assert.Contains("2.20000000 ₿", s.Driver.PageSource); // Should propose reimburse in BTC at the current rate
+            Assert.Contains("5,500.00 USD", s.Driver.PageSource); // Should propose reimburse in fiat
+            Assert.Contains("1.10000000 BTC", s.Driver.PageSource); // Should propose reimburse in BTC at the rate of before
+            Assert.Contains("2.20000000 BTC", s.Driver.PageSource); // Should propose reimburse in BTC at the current rate
             s.Driver.WaitForAndClick(By.Id(rateSelection));
             s.Driver.FindElement(By.Id("ok")).Click();
-            
+
             s.Driver.WaitUntilAvailable(By.Id("Destination"), TimeSpan.FromSeconds(1));
             Assert.Contains("pull-payments", s.Driver.Url);
             if (rateSelection == "FiatOption")
-                Assert.Contains("$5,500.00", s.Driver.PageSource);
+                Assert.Contains("5,500.00 USD", s.Driver.PageSource);
             if (rateSelection == "CurrentOption")
-                Assert.Contains("2.20000000 ₿", s.Driver.PageSource);
+                Assert.Contains("2.20000000 BTC", s.Driver.PageSource);
             if (rateSelection == "RateThenOption")
-                Assert.Contains("1.10000000 ₿", s.Driver.PageSource);
-            
+                Assert.Contains("1.10000000 BTC", s.Driver.PageSource);
+
             s.GoToInvoice(invoice.Id);
             s.Driver.FindElement(By.Id("IssueRefund")).Click();
             s.Driver.WaitUntilAvailable(By.Id("Destination"), TimeSpan.FromSeconds(1));
@@ -584,7 +587,7 @@ namespace BTCPayServer.Tests
                 Assert.True(invoice.SupportedTransactionCurrencies["LTC"].Enabled);
                 Assert.True(invoice.PaymentSubtotals.ContainsKey("LTC"));
                 Assert.True(invoice.PaymentTotals.ContainsKey("LTC"));
-                
+
                 // Check if we can disable LTC
                 invoice = await user.BitPay.CreateInvoiceAsync(
                     new Invoice
@@ -622,10 +625,11 @@ namespace BTCPayServer.Tests
                 var apps = user.GetController<UIAppsController>();
                 var pos = user.GetController<UIPointOfSaleController>();
                 var vm = Assert.IsType<CreateAppViewModel>(Assert.IsType<ViewResult>(apps.CreateApp(user.StoreId)).Model);
-                var appType = AppType.PointOfSale.ToString();
+                var appType = PointOfSaleAppType.AppType;
                 vm.AppName = "test";
                 vm.SelectedAppType = appType;
-                Assert.IsType<RedirectToActionResult>(apps.CreateApp(user.StoreId, vm).Result);
+                var redirect = Assert.IsType<RedirectResult>(apps.CreateApp(user.StoreId, vm).Result);
+                Assert.EndsWith("/settings/pos", redirect.Url);
                 var appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
                 var app = appList.Apps[0];
                 var appData = new AppData { Id = app.Id, StoreDataId = app.StoreId, Name = app.AppName, AppType = appType };
@@ -648,6 +652,7 @@ donation:
   price: 1.02
   custom: true
 ";
+                vmpos.Template = AppService.SerializeTemplate(MigrationStartupTask.ParsePOSYML(vmpos.Template));
                 Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
                 vmpos = await pos.UpdatePointOfSale(app.Id).AssertViewModelAsync<UpdatePointOfSaleViewModel>();
                 Assert.Equal("hello", vmpos.Title);
@@ -659,13 +664,12 @@ donation:
                 Assert.Equal("good apple", vmview.Items[0].Title);
                 Assert.Equal("orange", vmview.Items[1].Title);
                 Assert.Equal(10.0m, vmview.Items[1].Price.Value);
-                Assert.Equal("$5.00", vmview.Items[0].Price.Formatted);
                 Assert.Equal("{0} Purchase", vmview.ButtonText);
                 Assert.Equal("Nicolas Sexy Hair", vmview.CustomButtonText);
                 Assert.Equal("Wanna tip?", vmview.CustomTipText);
                 Assert.Equal("15,18,20", string.Join(',', vmview.CustomTipPercentages));
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 0, null, null, null, null, "orange").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "orange").Result);
 
                 //
                 var invoices = await user.BitPay.GetInvoicesAsync();
@@ -674,16 +678,16 @@ donation:
                 Assert.Equal("CAD", orangeInvoice.Currency);
                 Assert.Equal("orange", orangeInvoice.ItemDesc);
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 0, null, null, null, null, "apple").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "apple").Result);
 
                 invoices = user.BitPay.GetInvoices();
                 var appleInvoice = invoices.SingleOrDefault(invoice => invoice.ItemCode.Equals("apple"));
                 Assert.NotNull(appleInvoice);
                 Assert.Equal("good apple", appleInvoice.ItemDesc);
-                
+
                 // testing custom amount
                 var action = Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 6.6m, null, null, null, null, "donation").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 6.6m, choiceKey: "donation").Result);
                 Assert.Equal(nameof(UIInvoiceController.Checkout), action.ActionName);
                 invoices = user.BitPay.GetInvoices();
                 var donationInvoice = invoices.Single(i => i.Price == 6.6m);
@@ -720,6 +724,7 @@ donation:
   price: 1.02
   custom: true
 ";
+                    vmpos.Template = AppService.SerializeTemplate(MigrationStartupTask.ParsePOSYML(vmpos.Template));
                     Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
                     publicApps = user.GetController<UIPointOfSaleController>();
                     vmview = await publicApps.ViewPointOfSale(app.Id, PosViewType.Cart).AssertViewModelAsync<ViewPointOfSaleViewModel>();
@@ -735,7 +740,7 @@ donation:
                     Assert.Equal(test.ExpectedDivisibility, vmview.CurrencyInfo.Divisibility);
                     Assert.Equal(test.ExpectedSymbolSpace, vmview.CurrencyInfo.SymbolSpace);
                 }
-                
+
                 //test inventory related features
                 vmpos = await pos.UpdatePointOfSale(app.Id).AssertViewModelAsync<UpdatePointOfSaleViewModel>();
                 vmpos.Title = "hello";
@@ -747,26 +752,28 @@ inventoryitem:
   inventory: 1
 noninventoryitem:
   price: 10.0";
+                
+                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>(() =>
                 {
                     Assert.IsType<RedirectToActionResult>(publicApps
-                        .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "inventoryitem").Result);
+                        .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "inventoryitem").Result);
                     return Task.CompletedTask;
                 });
-                
+
                 //we already bought all available stock so this should fail
                 await Task.Delay(100);
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "inventoryitem").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "inventoryitem").Result);
 
                 //inventoryitem has unlimited items available
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "noninventoryitem").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "noninventoryitem").Result);
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "noninventoryitem").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "noninventoryitem").Result);
 
                 //verify invoices where created
                 invoices = user.BitPay.GetInvoices();
@@ -777,15 +784,13 @@ noninventoryitem:
 
                 //let's mark the inventoryitem invoice as invalid, this should return the item to back in stock
                 var controller = tester.PayTester.GetController<UIInvoiceController>(user.UserId, user.StoreId);
-                var appService = tester.PayTester.GetService<AppService>();
-                var eventAggregator = tester.PayTester.GetService<EventAggregator>();
                 Assert.IsType<JsonResult>(await controller.ChangeInvoiceState(inventoryItemInvoice.Id, "invalid"));
                 //check that item is back in stock
                 await TestUtils.EventuallyAsync(async () =>
                 {
                     vmpos = await pos.UpdatePointOfSale(app.Id).AssertViewModelAsync<UpdatePointOfSaleViewModel>();
                     Assert.Equal(1,
-                        appService.Parse(vmpos.Template, "BTC").Single(item => item.Id == "inventoryitem").Inventory);
+                        AppService.Parse(vmpos.Template).Single(item => item.Id == "inventoryitem").Inventory);
                 }, 10000);
 
                 //test payment methods option
@@ -800,11 +805,13 @@ 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
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "btconly").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "btconly").Result);
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "normal").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "normal").Result);
                 invoices = user.BitPay.GetInvoices();
                 var normalInvoice = invoices.Single(invoice => invoice.ItemCode == "normal");
                 var btcOnlyInvoice = invoices.Single(invoice => invoice.ItemCode == "btconly");
@@ -819,13 +826,13 @@ normal:
                     normalInvoice.CryptoInfo,
                     s => PaymentTypes.BTCLike.ToString() == s.PaymentType && new[] { "BTC", "LTC" }.Contains(
                              s.CryptoCode));
-                
+
                 //test topup option
                 vmpos.Template = @"
 a:
   price: 1000.0
   title: good apple
-  
+
 b:
   price: 10.0
   custom: false
@@ -843,21 +850,22 @@ f:
 g:
   custom: topup
 ";
-                
+
+                vmpos.Template = AppService.SerializeTemplate(MigrationStartupTask.ParsePOSYML(vmpos.Template));
                 Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
                 vmpos = await pos.UpdatePointOfSale(app.Id).AssertViewModelAsync<UpdatePointOfSaleViewModel>();
                 Assert.DoesNotContain("custom", vmpos.Template);
-                var items = appService.Parse(vmpos.Template, vmpos.Currency);
-                Assert.Contains(items, item => item.Id == "a" && item.Price.Type == ViewPointOfSaleViewModel.Item.ItemPrice.ItemPriceType.Fixed);
-                Assert.Contains(items, item => item.Id == "b" && item.Price.Type == ViewPointOfSaleViewModel.Item.ItemPrice.ItemPriceType.Fixed);
-                Assert.Contains(items, item => item.Id == "c" && item.Price.Type == ViewPointOfSaleViewModel.Item.ItemPrice.ItemPriceType.Minimum);
-                Assert.Contains(items, item => item.Id == "d" && item.Price.Type == ViewPointOfSaleViewModel.Item.ItemPrice.ItemPriceType.Fixed);
-                Assert.Contains(items, item => item.Id == "e" && item.Price.Type == ViewPointOfSaleViewModel.Item.ItemPrice.ItemPriceType.Minimum);
-                Assert.Contains(items, item => item.Id == "f" && item.Price.Type == ViewPointOfSaleViewModel.Item.ItemPrice.ItemPriceType.Topup);
-                Assert.Contains(items, item => item.Id == "g" && item.Price.Type == ViewPointOfSaleViewModel.Item.ItemPrice.ItemPriceType.Topup);
+                var items = AppService.Parse(vmpos.Template);
+                Assert.Contains(items, item => item.Id == "a" && item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Fixed);
+                Assert.Contains(items, item => item.Id == "b" && item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Fixed);
+                Assert.Contains(items, item => item.Id == "c" && item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Minimum);
+                Assert.Contains(items, item => item.Id == "d" && item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Fixed);
+                Assert.Contains(items, item => item.Id == "e" && item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Minimum);
+                Assert.Contains(items, item => item.Id == "f" && item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Topup);
+                Assert.Contains(items, item => item.Id == "g" && item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Topup);
                 
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Static, null, null, null, null, null, "g").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Static, choiceKey: "g").Result);
                 invoices = user.BitPay.GetInvoices();
                 var topupInvoice = invoices.Single(invoice => invoice.ItemCode == "g");
                 Assert.Equal(0, topupInvoice.Price);

BTCPayServer.Tests/ApiKeysTests.cs

@@ -286,7 +286,7 @@ namespace BTCPayServer.Tests
             if (permissions.Contains(canModifyAllStores) || storePermissions.Any())
             {
                 var resultStores =
-                    await TestApiAgainstAccessToken<StoreData[]>(accessToken, $"{TestApiPath}/me/stores",
+                    await TestApiAgainstAccessToken<Client.Models.StoreData[]>(accessToken, $"{TestApiPath}/me/stores",
                         tester.PayTester.HttpClient);
 
                 foreach (var selectiveStorePermission in storePermissions)

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14" />
     <PackageReference Include="Selenium.Support" Version="4.1.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.1.1" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="110.0.5481.7700" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="112.0.5615.4900" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>

BTCPayServer.Tests/CheckoutUITests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
 using BTCPayServer.Payments;
 using BTCPayServer.Tests.Logging;
 using BTCPayServer.Views.Stores;
@@ -27,6 +28,7 @@ namespace BTCPayServer.Tests
             s.GoToRegister();
             s.RegisterNewUser();
             s.CreateNewStore();
+            s.EnableCheckout(CheckoutType.V1);
             s.AddDerivationScheme();
             s.GoToStore(StoreNavPages.CheckoutAppearance);
             s.Driver.FindElement(By.Id("RequiresRefundEmail")).Click();
@@ -72,6 +74,7 @@ namespace BTCPayServer.Tests
             s.GoToRegister();
             s.RegisterNewUser();
             s.CreateNewStore();
+            s.EnableCheckout(CheckoutType.V1);
             s.AddDerivationScheme();
 
             // Now create an invoice that requires a refund email
@@ -124,6 +127,7 @@ namespace BTCPayServer.Tests
             s.GoToRegister();
             s.RegisterNewUser();
             s.CreateNewStore();
+            s.EnableCheckout(CheckoutType.V1);
             s.AddDerivationScheme();
 
             var invoiceId = s.CreateInvoice();
@@ -154,13 +158,13 @@ namespace BTCPayServer.Tests
             s.GoToRegister();
             s.RegisterNewUser(true);
             s.CreateNewStore();
+            s.EnableCheckout(CheckoutType.V1);
             s.AddLightningNode();
             s.AddDerivationScheme();
 
             var invoiceId = s.CreateInvoice(defaultPaymentMethod: "BTC_LightningLike");
             s.GoToInvoiceCheckout(invoiceId);
-
-            Assert.Equal("Bitcoin (Lightning) (BTC)", s.Driver.FindElement(By.ClassName("payment__currencies")).Text);
+            Assert.Equal("Bitcoin (Lightning)", s.Driver.FindElement(By.ClassName("payment__currencies")).Text);
             s.Driver.Quit();
         }
 
@@ -174,6 +178,7 @@ namespace BTCPayServer.Tests
             s.GoToRegister();
             s.RegisterNewUser(true);
             s.CreateNewStore();
+            s.EnableCheckout(CheckoutType.V1);
             s.AddLightningNode();
             s.GoToLightningSettings();
             s.Driver.SetCheckbox(By.Id("LightningAmountInSatoshi"), true);
@@ -182,7 +187,7 @@ namespace BTCPayServer.Tests
 
             var invoiceId = s.CreateInvoice(10, "USD", "a@g.com");
             s.GoToInvoiceCheckout(invoiceId);
-            Assert.Contains("Sats", s.Driver.FindElement(By.ClassName("payment__currencies_noborder")).Text);
+            Assert.Contains("sats", s.Driver.FindElement(By.ClassName("buyerTotalLine")).Text);
         }
 
         [Fact(Timeout = TestTimeout)]
@@ -193,6 +198,7 @@ namespace BTCPayServer.Tests
             s.GoToRegister();
             s.RegisterNewUser();
             s.CreateNewStore();
+            s.EnableCheckout(CheckoutType.V1);
             s.GoToStore();
             s.AddDerivationScheme();
             var invoiceId = s.CreateInvoice(0.001m, "BTC", "a@x.com");

BTCPayServer.Tests/Checkoutv2Tests.cs

@@ -1,11 +1,10 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Payments;
-using BTCPayServer.Tests.Logging;
 using BTCPayServer.Views.Stores;
 using NBitcoin;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Support.UI;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -31,26 +30,26 @@ namespace BTCPayServer.Tests
             s.GoToRegister();
             s.RegisterNewUser(true);
             s.CreateNewStore();
-            s.EnableCheckoutV2();
             s.AddLightningNode();
             // Use non-legacy derivation scheme
             s.AddDerivationScheme("BTC", "tpubDD79XF4pzhmPSJ9AyUay9YbXAeD1c6nkUqC32pnKARJH6Ja5hGUfGc76V82ahXpsKqN6UcSGXMkzR34aZq4W23C6DAdZFaVrzWqzj24F8BC");
 
             // Configure store url
             var storeUrl = "https://satoshisteaks.com/";
+            var supportUrl = "https://support.satoshisteaks.com/{InvoiceId}/";
             s.GoToStore();
             s.Driver.FindElement(By.Id("StoreWebsite")).SendKeys(storeUrl);
+            s.Driver.FindElement(By.Id("StoreSupportUrl")).SendKeys(supportUrl);
             s.Driver.FindElement(By.Id("Save")).Click();
             Assert.Contains("Store successfully updated", s.FindAlertMessage().Text);
-            
-            // Enable LNURL, which we will need for (non-)presence checks throughout this test
-            s.GoToHome();
-            s.GoToLightningSettings();
-            s.Driver.SetCheckbox(By.Id("LNURLEnabled"), true);
-            s.Driver.SetCheckbox(By.Id("LNURLStandardInvoiceEnabled"), true);
-            s.Driver.FindElement(By.Id("save")).Click();
-            Assert.Contains("BTC Lightning settings successfully updated", s.FindAlertMessage().Text);
-            
+
+            s.GoToStore(StoreNavPages.CheckoutAppearance);
+            s.Driver.WaitForAndClick(By.Id("Presets"));
+            s.Driver.WaitForAndClick(By.Id("Presets_InStore"));
+            Assert.True(s.Driver.SetCheckbox(By.Id("ShowPayInWalletButton"), true));
+            s.Driver.FindElement(By.Id("Save")).SendKeys(Keys.Enter);
+            Assert.Contains("Store successfully updated", s.FindAlertMessage().Text);
+
             // Top up/zero amount invoices
             var invoiceId = s.CreateInvoice(amount: null);
             s.GoToInvoiceCheckout(invoiceId);
@@ -63,29 +62,35 @@ namespace BTCPayServer.Tests
             var qrValue = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-qr-value");
             var address = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
             var payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
-            var copyAddress = s.Driver.FindElement(By.Id("Address_BTC")).GetAttribute("value");
+            var copyAddress = s.Driver.FindElement(By.CssSelector("#Address_BTC .truncate-center-start")).Text;
             Assert.Equal($"bitcoin:{address}", payUrl);
-            Assert.StartsWith("bcrt", s.Driver.FindElement(By.Id("Address_BTC")).GetAttribute("value"));
+            Assert.StartsWith("bcrt", s.Driver.FindElement(By.CssSelector("#Address_BTC .truncate-center-start")).Text);
             Assert.DoesNotContain("lightning=", payUrl);
             Assert.Equal(address, copyAddress);
             Assert.Equal($"bitcoin:{address.ToUpperInvariant()}", qrValue);
             s.Driver.ElementDoesNotExist(By.Id("Lightning_BTC"));
-            s.Driver.ElementDoesNotExist(By.Id("PayByLNURL"));
-            
+
+            // Details should show exchange rate
+            s.Driver.ToggleCollapse("PaymentDetails");
+            s.Driver.ElementDoesNotExist(By.Id("PaymentDetails-TotalPrice"));
+            s.Driver.ElementDoesNotExist(By.Id("PaymentDetails-TotalFiat"));
+            s.Driver.ElementDoesNotExist(By.Id("PaymentDetails-AmountDue"));
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            Assert.Contains("sat/byte", s.Driver.FindElement(By.Id("PaymentDetails-RecommendedFee")).Text);
+
             // Switch to LNURL
             s.Driver.FindElement(By.CssSelector(".payment-method:nth-child(2)")).Click();
             TestUtils.Eventually(() =>
             {
                 payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
                 Assert.StartsWith("lightning:lnurl", payUrl);
-                Assert.StartsWith("lnurl", s.Driver.WaitForElement(By.Id("Lightning_BTC")).GetAttribute("value"));
+                Assert.StartsWith("lnurl", s.Driver.WaitForElement(By.CssSelector("#Lightning_BTC .truncate-center-start")).Text);
                 s.Driver.ElementDoesNotExist(By.Id("Address_BTC"));
-                s.Driver.FindElement(By.Id("PayByLNURL"));
             });
 
             // Default payment method
             s.GoToHome();
-            invoiceId = s.CreateInvoice(defaultPaymentMethod: "BTC_LightningLike");
+            invoiceId = s.CreateInvoice(21000, "SATS", defaultPaymentMethod: "BTC_LightningLike");
             s.GoToInvoiceCheckout(invoiceId);
             s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
             Assert.Equal(2, s.Driver.FindElements(By.CssSelector(".payment-method")).Count);
@@ -94,14 +99,13 @@ namespace BTCPayServer.Tests
             qrValue = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-qr-value");
             address = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
             payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
-            copyAddress = s.Driver.FindElement(By.Id("Lightning_BTC_LightningLike")).GetAttribute("value");
+            copyAddress = s.Driver.FindElement(By.CssSelector("#Lightning_BTC_LightningLike .truncate-center-start")).Text;
             Assert.Equal($"lightning:{address}", payUrl);
             Assert.Equal(address, copyAddress);
             Assert.Equal($"lightning:{address.ToUpperInvariant()}", qrValue);
             s.Driver.ElementDoesNotExist(By.Id("Address_BTC"));
-            s.Driver.FindElement(By.Id("PayByLNURL"));
 
-            // Lightning amount in Sats
+            // Lightning amount in sats
             Assert.Contains("BTC", s.Driver.FindElement(By.Id("AmountDue")).Text);
             s.GoToHome();
             s.GoToLightningSettings();
@@ -110,7 +114,15 @@ namespace BTCPayServer.Tests
             Assert.Contains("BTC Lightning settings successfully updated", s.FindAlertMessage().Text);
             s.GoToInvoiceCheckout(invoiceId);
             s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
-            Assert.Contains("Sats", s.Driver.FindElement(By.Id("AmountDue")).Text);
+            Assert.Contains("sats", s.Driver.FindElement(By.Id("AmountDue")).Text);
+
+            // Details should not show exchange rate
+            s.Driver.ToggleCollapse("PaymentDetails");
+            s.Driver.ElementDoesNotExist(By.Id("PaymentDetails-ExchangeRate"));
+            s.Driver.ElementDoesNotExist(By.Id("PaymentDetails-TotalFiat"));
+            s.Driver.ElementDoesNotExist(By.Id("PaymentDetails-RecommendedFee"));
+            Assert.Contains("21 000 sats", s.Driver.FindElement(By.Id("PaymentDetails-AmountDue")).Text);
+            Assert.Contains("21 000 sats", s.Driver.FindElement(By.Id("PaymentDetails-TotalPrice")).Text);
 
             // Expire
             var expirySeconds = s.Driver.FindElement(By.Id("ExpirySeconds"));
@@ -123,10 +135,49 @@ namespace BTCPayServer.Tests
             Assert.DoesNotContain("Please send", paymentInfo.Text);
             TestUtils.Eventually(() =>
             {
-                var expiredSection = s.Driver.FindElement(By.Id("expired"));
+                var expiredSection = s.Driver.FindElement(By.Id("unpaid"));
                 Assert.True(expiredSection.Displayed);
                 Assert.Contains("Invoice Expired", expiredSection.Text);
+                Assert.Contains("resubmit a payment", expiredSection.Text);
+                Assert.DoesNotContain("This invoice expired with partial payment", expiredSection.Text);
+                
             });
+            Assert.True(s.Driver.ElementDoesNotExist(By.Id("ContactLink")));
+            Assert.True(s.Driver.ElementDoesNotExist(By.Id("ReceiptLink")));
+            Assert.Equal(storeUrl, s.Driver.FindElement(By.Id("StoreLink")).GetAttribute("href"));
+
+            // Expire paid partial
+            s.GoToHome();
+            invoiceId = s.CreateInvoice(2100, "EUR");
+            s.GoToInvoiceCheckout(invoiceId);
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
+            
+            await Task.Delay(200);
+            address = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
+            var amountFraction = "0.00001";
+            await s.Server.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create(address, Network.RegTest),
+                Money.Parse(amountFraction));
+            await s.Server.ExplorerNode.GenerateAsync(1);
+            
+            expirySeconds = s.Driver.FindElement(By.Id("ExpirySeconds"));
+            expirySeconds.Clear();
+            expirySeconds.SendKeys("3");
+            s.Driver.FindElement(By.Id("Expire")).Click();
+
+            paymentInfo = s.Driver.WaitForElement(By.Id("PaymentInfo"));
+            Assert.Contains("The invoice hasn't been paid in full.", paymentInfo.Text);
+            Assert.Contains("Please send", paymentInfo.Text);
+            TestUtils.Eventually(() =>
+            {
+                var expiredSection = s.Driver.FindElement(By.Id("unpaid"));
+                Assert.True(expiredSection.Displayed);
+                Assert.Contains("Invoice Expired", expiredSection.Text);
+                Assert.Contains("This invoice expired with partial payment", expiredSection.Text);
+                Assert.DoesNotContain("resubmit a payment", expiredSection.Text);
+            });
+            var contactLink = s.Driver.FindElement(By.Id("ContactLink"));
+            Assert.Equal("Contact us", contactLink.Text);
+            Assert.Matches(supportUrl.Replace("{InvoiceId}", invoiceId), contactLink.GetAttribute("href"));
             Assert.True(s.Driver.ElementDoesNotExist(By.Id("ReceiptLink")));
             Assert.Equal(storeUrl, s.Driver.FindElement(By.Id("StoreLink")).GetAttribute("href"));
 
@@ -144,54 +195,67 @@ namespace BTCPayServer.Tests
             Assert.Contains("Exchange Rate", details.Text);
             Assert.Contains("Amount Due", details.Text);
             Assert.Contains("Recommended Fee", details.Text);
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-TotalFiat")).Text);
+            Assert.Contains("BTC", s.Driver.FindElement(By.Id("PaymentDetails-AmountDue")).Text);
+            Assert.Contains("BTC", s.Driver.FindElement(By.Id("PaymentDetails-TotalPrice")).Text);
 
             // Pay partial amount
             await Task.Delay(200);
             address = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
-            var amountFraction = "0.00001";
+            amountFraction = "0.00001";
             await s.Server.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create(address, Network.RegTest),
                 Money.Parse(amountFraction));
             await s.Server.ExplorerNode.GenerateAsync(1);
 
             // Fake Pay
-            s.Driver.FindElement(By.Id("FakePayAmount")).FillIn(amountFraction);
-            s.Driver.FindElement(By.Id("FakePay")).Click();
             TestUtils.Eventually(() =>
             {
-                Assert.Contains("Created transaction",
-                    s.Driver.WaitForElement(By.Id("CheatSuccessMessage")).Text);
-                s.Server.ExplorerNode.Generate(1);
                 paymentInfo = s.Driver.WaitForElement(By.Id("PaymentInfo"));
                 Assert.Contains("The invoice hasn't been paid in full", paymentInfo.Text);
                 Assert.Contains("Please send", paymentInfo.Text);
             });
 
+            s.Driver.Navigate().Refresh();
+
+            // Pay full amount
+            s.PayInvoice();
+
+            // Processing
+            TestUtils.Eventually(() =>
+            {
+                var processingSection = s.Driver.WaitForElement(By.Id("processing"));
+                Assert.True(processingSection.Displayed);
+                Assert.Contains("Payment Received", processingSection.Text);
+                Assert.Contains("Your payment has been received and is now processing", processingSection.Text);
+            });
+            s.Driver.FindElement(By.Id("confetti"));
+
             // Mine
-            s.Driver.FindElement(By.Id("Mine")).Click();
+            s.MineBlockOnInvoiceCheckout();
             TestUtils.Eventually(() =>
             {
                 Assert.Contains("Mined 1 block",
                     s.Driver.WaitForElement(By.Id("CheatSuccessMessage")).Text);
             });
 
-            // Pay full amount
-            var amountDue = s.Driver.FindElement(By.Id("AmountDue")).GetAttribute("data-amount-due");
-            s.Driver.FindElement(By.Id("FakePayAmount")).FillIn(amountDue);
-            s.Driver.FindElement(By.Id("FakePay")).Click();
+            // Settled
             TestUtils.Eventually(() =>
             {
-                s.Server.ExplorerNode.Generate(1);
-                var paidSection = s.Driver.WaitForElement(By.Id("paid"));
-                Assert.True(paidSection.Displayed);
-                Assert.Contains("Invoice Paid", paidSection.Text);
+                var settledSection = s.Driver.WaitForElement(By.Id("settled"));
+                Assert.True(settledSection.Displayed);
+                Assert.Contains("Invoice Paid", settledSection.Text);
             });
+            s.Driver.FindElement(By.Id("confetti"));
             s.Driver.FindElement(By.Id("ReceiptLink"));
+            Assert.True(s.Driver.ElementDoesNotExist(By.Id("ContactLink")));
             Assert.Equal(storeUrl, s.Driver.FindElement(By.Id("StoreLink")).GetAttribute("href"));
 
             // BIP21
             s.GoToHome();
             s.GoToStore(StoreNavPages.CheckoutAppearance);
             s.Driver.SetCheckbox(By.Id("OnChainWithLnInvoiceFallback"), true);
+            s.Driver.SetCheckbox(By.Id("LightningAmountInSatoshi"), false);
             s.Driver.FindElement(By.Id("Save")).Click();
             Assert.Contains("Store successfully updated", s.FindAlertMessage().Text);
 
@@ -199,11 +263,12 @@ namespace BTCPayServer.Tests
             s.GoToInvoiceCheckout(invoiceId);
             s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
             Assert.Empty(s.Driver.FindElements(By.CssSelector(".payment-method")));
+            Assert.Contains("BTC", s.Driver.FindElement(By.Id("AmountDue")).Text);
             qrValue = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-qr-value");
             address = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
             payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
-            var copyAddressOnchain = s.Driver.FindElement(By.Id("Address_BTC")).GetAttribute("value");
-            var copyAddressLightning = s.Driver.FindElement(By.Id("Lightning_BTC")).GetAttribute("value");
+            var copyAddressOnchain = s.Driver.FindElement(By.CssSelector("#Address_BTC .truncate-center-start")).Text;
+            var copyAddressLightning = s.Driver.FindElement(By.CssSelector("#Lightning_BTC .truncate-center-start")).Text;
             Assert.StartsWith($"bitcoin:{address}?amount=", payUrl);
             Assert.Contains("?amount=", payUrl);
             Assert.Contains("&lightning=", payUrl);
@@ -212,7 +277,32 @@ namespace BTCPayServer.Tests
             Assert.StartsWith("lnbcrt", copyAddressLightning);
             Assert.StartsWith($"bitcoin:{address.ToUpperInvariant()}?amount=", qrValue);
             Assert.Contains("&lightning=LNBCRT", qrValue);
-            s.Driver.FindElement(By.Id("PayByLNURL"));
+
+            // Check details
+            s.Driver.ToggleCollapse("PaymentDetails");
+            Assert.Contains("1 BTC = ", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-TotalFiat")).Text);
+            Assert.Contains("BTC", s.Driver.FindElement(By.Id("PaymentDetails-AmountDue")).Text);
+            Assert.Contains("BTC", s.Driver.FindElement(By.Id("PaymentDetails-TotalPrice")).Text);
+
+            // Switch to amount displayed in sats
+            s.GoToHome();
+            s.GoToStore(StoreNavPages.CheckoutAppearance);
+            s.Driver.SetCheckbox(By.Id("LightningAmountInSatoshi"), true);
+            s.Driver.FindElement(By.Id("Save")).Click();
+            Assert.Contains("Store successfully updated", s.FindAlertMessage().Text);
+            s.GoToInvoiceCheckout(invoiceId);
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
+            Assert.Contains("sats", s.Driver.FindElement(By.Id("AmountDue")).Text);
+
+            // Check details
+            s.Driver.ToggleCollapse("PaymentDetails");
+            Assert.Contains("1 sat = ", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-TotalFiat")).Text);
+            Assert.Contains("sats", s.Driver.FindElement(By.Id("PaymentDetails-AmountDue")).Text);
+            Assert.Contains("sats", s.Driver.FindElement(By.Id("PaymentDetails-TotalPrice")).Text);
 
             // BIP21 with LN as default payment method
             s.GoToHome();
@@ -223,14 +313,20 @@ namespace BTCPayServer.Tests
             payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
             Assert.StartsWith("bitcoin:", payUrl);
             Assert.Contains("&lightning=lnbcrt", payUrl);
-            s.Driver.FindElement(By.Id("PayByLNURL"));
+
+            // Check details
+            s.Driver.ToggleCollapse("PaymentDetails");
+            Assert.Contains("1 sat = ", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-TotalFiat")).Text);
+            Assert.Contains("sats", s.Driver.FindElement(By.Id("PaymentDetails-AmountDue")).Text);
+            Assert.Contains("sats", s.Driver.FindElement(By.Id("PaymentDetails-TotalPrice")).Text);
 
             // Ensure LNURL is enabled
             s.GoToHome();
             s.GoToLightningSettings();
             Assert.True(s.Driver.FindElement(By.Id("LNURLEnabled")).Selected);
-            Assert.True(s.Driver.FindElement(By.Id("LNURLStandardInvoiceEnabled")).Selected);
-            
+
             // BIP21 with top-up invoice
             invoiceId = s.CreateInvoice(amount: null);
             s.GoToInvoiceCheckout(invoiceId);
@@ -239,8 +335,8 @@ namespace BTCPayServer.Tests
             qrValue = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-qr-value");
             address = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
             payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
-            copyAddressOnchain = s.Driver.FindElement(By.Id("Address_BTC")).GetAttribute("value");
-            copyAddressLightning = s.Driver.FindElement(By.Id("Lightning_BTC")).GetAttribute("value");
+            copyAddressOnchain = s.Driver.FindElement(By.CssSelector("#Address_BTC .truncate-center-start")).Text;
+            copyAddressLightning = s.Driver.FindElement(By.CssSelector("#Lightning_BTC .truncate-center-start")).Text;
             Assert.StartsWith($"bitcoin:{address}", payUrl);
             Assert.Contains("?lightning=lnurl", payUrl);
             Assert.DoesNotContain("amount=", payUrl);
@@ -248,7 +344,14 @@ namespace BTCPayServer.Tests
             Assert.Equal(address, copyAddressOnchain);
             Assert.StartsWith("lnurl", copyAddressLightning);
             Assert.StartsWith($"bitcoin:{address.ToUpperInvariant()}?lightning=LNURL", qrValue);
-            s.Driver.FindElement(By.Id("PayByLNURL"));
+
+            // Check details
+            s.Driver.ToggleCollapse("PaymentDetails");
+            Assert.Contains("1 sat = ", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            Assert.Contains("$", s.Driver.FindElement(By.Id("PaymentDetails-ExchangeRate")).Text);
+            s.Driver.ElementDoesNotExist(By.Id("PaymentDetails-TotalFiat"));
+            s.Driver.ElementDoesNotExist(By.Id("PaymentDetails-AmountDue"));
+            s.Driver.ElementDoesNotExist(By.Id("PaymentDetails-TotalPrice"));
 
             // Expiry message should not show amount for top-up invoice
             expirySeconds = s.Driver.FindElement(By.Id("ExpirySeconds"));
@@ -260,7 +363,7 @@ namespace BTCPayServer.Tests
             Assert.Contains("This invoice will expire in", paymentInfo.Text);
             Assert.Contains("00:0", paymentInfo.Text);
             Assert.DoesNotContain("Please send", paymentInfo.Text);
-            
+
             // Configure countdown timer
             s.GoToHome();
             invoiceId = s.CreateInvoice();
@@ -272,13 +375,13 @@ namespace BTCPayServer.Tests
             displayExpirationTimer.SendKeys("10");
             s.Driver.FindElement(By.Id("Save")).Click();
             Assert.Contains("Store successfully updated", s.FindAlertMessage().Text);
-            
+
             s.GoToInvoiceCheckout(invoiceId);
             s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
             paymentInfo = s.Driver.FindElement(By.Id("PaymentInfo"));
             Assert.False(paymentInfo.Displayed);
             Assert.DoesNotContain("This invoice will expire in", paymentInfo.Text);
-            
+
             expirySeconds = s.Driver.FindElement(By.Id("ExpirySeconds"));
             expirySeconds.Clear();
             expirySeconds.SendKeys("599");
@@ -288,11 +391,12 @@ namespace BTCPayServer.Tests
             Assert.True(paymentInfo.Displayed);
             Assert.Contains("This invoice will expire in", paymentInfo.Text);
             Assert.Contains("09:5", paymentInfo.Text);
-            
+
             // Disable LNURL again
             s.GoToHome();
             s.GoToLightningSettings();
             s.Driver.SetCheckbox(By.Id("LNURLEnabled"), false);
+            s.Driver.ScrollTo(By.Id("save"));
             s.Driver.FindElement(By.Id("save")).Click();
             Assert.Contains("BTC Lightning settings successfully updated", s.FindAlertMessage().Text);
 
@@ -307,7 +411,23 @@ namespace BTCPayServer.Tests
             payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
             Assert.StartsWith("bitcoin:", payUrl);
             Assert.Contains("&lightning=lnbcrt", payUrl);
-            s.Driver.FindElement(By.Id("PayByLNURL"));
+
+            // Language Switch
+            var languageSelect = new SelectElement(s.Driver.FindElement(By.Id("DefaultLang")));
+            Assert.Equal("English", languageSelect.SelectedOption.Text);
+            Assert.Equal("View Details", s.Driver.FindElement(By.Id("DetailsToggle")).Text);
+            Assert.DoesNotContain("lang=", s.Driver.Url);
+            languageSelect.SelectByText("Deutsch");
+            Assert.Equal("Details anzeigen", s.Driver.FindElement(By.Id("DetailsToggle")).Text);
+            Assert.Contains("lang=de", s.Driver.Url);
+
+            s.Driver.Navigate().Refresh();
+            languageSelect = new SelectElement(s.Driver.WaitForElement(By.Id("DefaultLang")));
+            Assert.Equal("Deutsch", languageSelect.SelectedOption.Text);
+            Assert.Equal("Details anzeigen", s.Driver.FindElement(By.Id("DetailsToggle")).Text);
+            languageSelect.SelectByText("English");
+            Assert.Equal("View Details", s.Driver.FindElement(By.Id("DetailsToggle")).Text);
+            Assert.Contains("lang=en", s.Driver.Url);
         }
 
         [Fact(Timeout = TestTimeout)]
@@ -318,7 +438,6 @@ namespace BTCPayServer.Tests
             s.GoToRegister();
             s.RegisterNewUser();
             s.CreateNewStore();
-            s.EnableCheckoutV2();
             s.GoToStore();
             s.AddDerivationScheme();
             var invoiceId = s.CreateInvoice(0.001m, "BTC", "a@x.com");

BTCPayServer.Tests/CrowdfundTests.cs

@@ -1,14 +1,15 @@
 using System;
 using System.Threading.Tasks;
+using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Controllers;
 using BTCPayServer.Data;
 using BTCPayServer.Models.AppViewModels;
+using BTCPayServer.Plugins.Crowdfund;
 using BTCPayServer.Plugins.Crowdfund.Controllers;
 using BTCPayServer.Plugins.Crowdfund.Models;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
-using BTCPayServer.Tests.Logging;
 using Microsoft.AspNetCore.Mvc;
 using NBitcoin;
 using NBitpayClient;
@@ -34,18 +35,16 @@ namespace BTCPayServer.Tests
             await user.GrantAccessAsync();
             var user2 = tester.NewAccount();
             await user2.GrantAccessAsync();
-            var stores = user.GetController<UIStoresController>();
             var apps = user.GetController<UIAppsController>();
             var apps2 = user2.GetController<UIAppsController>();
             var crowdfund = user.GetController<UICrowdfundController>();
-            var vm = Assert.IsType<CreateAppViewModel>(Assert.IsType<ViewResult>(apps.CreateApp(user.StoreId)).Model);
-            var appType = AppType.Crowdfund.ToString();
-            Assert.NotNull(vm.SelectedAppType);
+            var appType = CrowdfundAppType.AppType;
+            var vm = Assert.IsType<CreateAppViewModel>(Assert.IsType<ViewResult>(apps.CreateApp(user.StoreId, appType)).Model);
+            Assert.Equal(appType, vm.SelectedAppType);
             Assert.Null(vm.AppName);
             vm.AppName = "test";
-            vm.SelectedAppType = appType;
-            var redirectToAction = Assert.IsType<RedirectToActionResult>(apps.CreateApp(user.StoreId, vm).Result);
-            Assert.Equal(nameof(crowdfund.UpdateCrowdfund), redirectToAction.ActionName);
+            var redirect = Assert.IsType<RedirectResult>(apps.CreateApp(user.StoreId, vm).Result);
+            Assert.EndsWith("/settings/crowdfund", redirect.Url);
             var appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
             var app = appList.Apps[0];
             var appData = new AppData { Id = app.Id, StoreDataId = app.StoreId, Name = app.AppName, AppType = appType };
@@ -57,12 +56,12 @@ namespace BTCPayServer.Tests
             Assert.Empty(appList2.Apps);
             Assert.Equal("test", appList.Apps[0].AppName);
             Assert.Equal(apps.CreatedAppId, appList.Apps[0].Id);
-            Assert.True(appList.Apps[0].IsOwner);
+            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));
-            redirectToAction = Assert.IsType<RedirectToActionResult>(apps.DeleteAppPost(appList.Apps[0].Id).Result);
-            Assert.Equal(nameof(stores.Dashboard), redirectToAction.ActionName);
+            var redirectToAction = Assert.IsType<RedirectToActionResult>(apps.DeleteAppPost(appList.Apps[0].Id).Result);
+            Assert.Equal(nameof(UIStoresController.Dashboard), redirectToAction.ActionName);
             appList = await apps.ListApps(user.StoreId).AssertViewModelAsync<ListAppsViewModel>();
             Assert.Empty(appList.Apps);
         }
@@ -79,10 +78,11 @@ namespace BTCPayServer.Tests
             var apps = user.GetController<UIAppsController>();
             var crowdfund = user.GetController<UICrowdfundController>();
             var vm = apps.CreateApp(user.StoreId).AssertViewModel<CreateAppViewModel>();
-            var appType = AppType.Crowdfund.ToString();
+            var appType = CrowdfundAppType.AppType;
             vm.AppName = "test";
             vm.SelectedAppType = appType;
-            Assert.IsType<RedirectToActionResult>(apps.CreateApp(user.StoreId, vm).Result);
+            var redirect = Assert.IsType<RedirectResult>(apps.CreateApp(user.StoreId, vm).Result);
+            Assert.EndsWith("/settings/crowdfund", redirect.Url);
             var appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
             var app = appList.Apps[0];
             var appData = new AppData { Id = app.Id, StoreDataId = app.StoreId, Name = app.AppName, AppType = appType };
@@ -105,7 +105,7 @@ namespace BTCPayServer.Tests
                 Amount = new decimal(0.01)
             }, default));
 
-            Assert.IsType<NotFoundResult>(await anonAppPubsController.ViewCrowdfund(app.Id, string.Empty));
+            Assert.IsType<NotFoundResult>(await anonAppPubsController.ViewCrowdfund(app.Id));
 
             //Scenario 2: Not Enabled But Admin - Allowed
             Assert.IsType<OkObjectResult>(await crowdfundController.ContributeToCrowdfund(app.Id, new ContributeToCrowdfund()
@@ -113,8 +113,8 @@ namespace BTCPayServer.Tests
                 RedirectToCheckout = false,
                 Amount = new decimal(0.01)
             }, default));
-            Assert.IsType<ViewResult>(await crowdfundController.ViewCrowdfund(app.Id, string.Empty));
-            Assert.IsType<NotFoundResult>(await anonAppPubsController.ViewCrowdfund(app.Id, string.Empty));
+            Assert.IsType<ViewResult>(await crowdfundController.ViewCrowdfund(app.Id));
+            Assert.IsType<NotFoundResult>(await anonAppPubsController.ViewCrowdfund(app.Id));
 
             //Scenario 3: Enabled But Start Date > Now - Not Allowed
             crowdfundViewModel.StartDate = DateTime.Today.AddDays(2);
@@ -170,10 +170,10 @@ namespace BTCPayServer.Tests
             var apps = user.GetController<UIAppsController>();
             var crowdfund = user.GetController<UICrowdfundController>();
             var vm = Assert.IsType<CreateAppViewModel>(Assert.IsType<ViewResult>(apps.CreateApp(user.StoreId)).Model);
-            var appType = AppType.Crowdfund.ToString();
+            var appType = CrowdfundAppType.AppType;
             vm.AppName = "test";
             vm.SelectedAppType = appType;
-            Assert.IsType<RedirectToActionResult>(apps.CreateApp(user.StoreId, vm).Result);
+            Assert.IsType<RedirectResult>(apps.CreateApp(user.StoreId, vm).Result);
             var appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
             var app = appList.Apps[0];
             var appData = new AppData { Id = app.Id, StoreDataId = app.StoreId, Name = app.AppName, AppType = appType };
@@ -193,7 +193,7 @@ namespace BTCPayServer.Tests
             var publicApps = user.GetController<UICrowdfundController>();
 
             var model = Assert.IsType<ViewCrowdfundViewModel>(Assert
-                .IsType<ViewResult>(publicApps.ViewCrowdfund(app.Id, String.Empty).Result).Model);
+                .IsType<ViewResult>(publicApps.ViewCrowdfund(app.Id).Result).Model);
 
             Assert.Equal(crowdfundViewModel.TargetAmount, model.TargetAmount);
             Assert.Equal(crowdfundViewModel.EndDate, model.EndDate);
@@ -217,7 +217,7 @@ namespace BTCPayServer.Tests
             }, Facade.Merchant);
 
             model = Assert.IsType<ViewCrowdfundViewModel>(Assert
-                .IsType<ViewResult>(publicApps.ViewCrowdfund(app.Id, string.Empty).Result).Model);
+                .IsType<ViewResult>(publicApps.ViewCrowdfund(app.Id).Result).Model);
 
             Assert.Equal(0m, model.Info.CurrentAmount);
             Assert.Equal(1m, model.Info.CurrentPendingAmount);
@@ -226,12 +226,12 @@ namespace BTCPayServer.Tests
 
             TestLogs.LogInformation("Let's check current amount change once payment is confirmed");
             var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, tester.ExplorerNode.Network);
-            tester.ExplorerNode.SendToAddress(invoiceAddress, invoice.BtcDue);
-            tester.ExplorerNode.Generate(1); // By default invoice confirmed at 1 block
+            await tester.ExplorerNode.SendToAddressAsync(invoiceAddress, invoice.BtcDue);
+            await tester.ExplorerNode.GenerateAsync(1); // By default invoice confirmed at 1 block
             TestUtils.Eventually(() =>
             {
                 model = Assert.IsType<ViewCrowdfundViewModel>(Assert
-                .IsType<ViewResult>(publicApps.ViewCrowdfund(app.Id, String.Empty).Result).Model);
+                .IsType<ViewResult>(publicApps.ViewCrowdfund(app.Id).Result).Model);
                 Assert.Equal(1m, model.Info.CurrentAmount);
                 Assert.Equal(0m, model.Info.CurrentPendingAmount);
             });
@@ -279,7 +279,7 @@ namespace BTCPayServer.Tests
             TestUtils.Eventually(() =>
             {
                 model = Assert.IsType<ViewCrowdfundViewModel>(Assert
-                .IsType<ViewResult>(publicApps.ViewCrowdfund(app.Id, string.Empty).Result).Model);
+                .IsType<ViewResult>(publicApps.ViewCrowdfund(app.Id).Result).Model);
                 Assert.Equal(0.7m, model.Info.CurrentPendingAmount);
             });
         }

BTCPayServer.Tests/Extensions.cs

@@ -122,6 +122,13 @@ retry:
             driver.ExecuteJavaScript($"document.getElementById('{element}').{funcName}()");
         }
 
+        public static void WaitWalletTransactionsLoaded(this IWebDriver driver)
+        {
+            var wait = new WebDriverWait(driver, SeleniumTester.ImplicitWait);
+            wait.UntilJsIsReady();
+            wait.Until(d => d.WaitForElement(By.CssSelector("#WalletTransactions[data-loaded='true']")));
+        }
+
         public static IWebElement WaitForElement(this IWebDriver driver, By selector)
         {
             var wait = new WebDriverWait(driver, SeleniumTester.ImplicitWait);
@@ -199,11 +206,15 @@ retry:
             return true;
         }
 
-        public static void SetCheckbox(this IWebDriver driver, By selector, bool value)
+        public static bool SetCheckbox(this IWebDriver driver, By selector, bool value)
         {
             var element = driver.FindElement(selector);
             if (value != element.Selected)
+            {
                 driver.WaitForAndClick(selector);
+                return true;
+            }
+            return false;
         }
     }
 }

BTCPayServer.Tests/FastTests.cs

@@ -26,6 +26,7 @@ using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Labels;
 using BTCPayServer.Services.Rates;
+using BTCPayServer.Services.Stores;
 using BTCPayServer.Validation;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
@@ -51,7 +52,6 @@ namespace BTCPayServer.Tests
     {
         public FastTests(ITestOutputHelper helper) : base(helper)
         {
-
         }
         class DockerImage
         {
@@ -135,6 +135,33 @@ namespace BTCPayServer.Tests
             }
         }
 
+
+        [Fact]
+        public void CanParseDecimals()
+        {
+            CanParseDecimalsCore("{\"qty\": 1}", 1.0m);
+            CanParseDecimalsCore("{\"qty\": \"1\"}", 1.0m);
+            CanParseDecimalsCore("{\"qty\": 1.0}", 1.0m);
+            CanParseDecimalsCore("{\"qty\": \"1.0\"}", 1.0m);
+            CanParseDecimalsCore("{\"qty\": 6.1e-7}", 6.1e-7m);
+            CanParseDecimalsCore("{\"qty\": \"6.1e-7\"}", 6.1e-7m);
+
+            var data = JsonConvert.DeserializeObject<TradeRequestData>("{\"qty\": \"6.1e-7\", \"fromAsset\":\"Test\"}");
+            Assert.Equal(6.1e-7m, data.Qty.Value);
+            Assert.Equal("Test", data.FromAsset);
+            data = JsonConvert.DeserializeObject<TradeRequestData>("{\"fromAsset\":\"Test\", \"qty\": \"6.1e-7\"}");
+            Assert.Equal(6.1e-7m, data.Qty.Value);
+            Assert.Equal("Test", data.FromAsset);
+        }
+
+        private void CanParseDecimalsCore(string str, decimal expected)
+        {
+            var d = JsonConvert.DeserializeObject<LedgerEntryData>(str);
+            Assert.Equal(expected, d.Qty);
+            var d2 = JsonConvert.DeserializeObject<TradeRequestData>(str);
+            Assert.Equal(new TradeQuantity(expected, TradeQuantity.ValueType.Exact), d2.Qty);
+        }
+
         [Fact]
         public void CanMergeReceiptOptions()
         {
@@ -326,7 +353,7 @@ namespace BTCPayServer.Tests
             var networkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
             var paymentMethodHandlerDictionary = new PaymentMethodHandlerDictionary(new IPaymentMethodHandler[]
             {
-                new BitcoinLikePaymentHandler(null, networkProvider, null, null, null),
+                new BitcoinLikePaymentHandler(null, networkProvider, null, null, null, null),
                 new LightningLikePaymentHandler(null, null, networkProvider, null, null, null),
             });
             var entity = new InvoiceEntity();
@@ -512,7 +539,7 @@ namespace BTCPayServer.Tests
             var networkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
             var paymentMethodHandlerDictionary = new PaymentMethodHandlerDictionary(new IPaymentMethodHandler[]
             {
-                new BitcoinLikePaymentHandler(null, networkProvider, null, null, null),
+                new BitcoinLikePaymentHandler(null, networkProvider, null, null, null, null),
                 new LightningLikePaymentHandler(null, null, networkProvider, null, null, null),
             });
             var entity = new InvoiceEntity();
@@ -600,15 +627,16 @@ namespace BTCPayServer.Tests
         [Fact]
         public void RoundupCurrenciesCorrectly()
         {
+            DisplayFormatter displayFormatter = new(CurrencyNameTable.Instance);
             foreach (var test in new[]
             {
-                (0.0005m, "$0.0005 (USD)", "USD"), (0.001m, "$0.001 (USD)", "USD"), (0.01m, "$0.01 (USD)", "USD"),
-                (0.1m, "$0.10 (USD)", "USD"), (0.1m, "0,10 € (EUR)", "EUR"), (1000m, "¥1,000 (JPY)", "JPY"),
-                (1000.0001m, "₹ 1,000.00 (INR)", "INR"),
-                (0.0m, "$0.00 (USD)", "USD")
+                (0.0005m, "0.0005 USD", "USD"), (0.001m, "0.001 USD", "USD"), (0.01m, "0.01 USD", "USD"),
+                (0.1m, "0.10 USD", "USD"), (0.1m, "0,10 EUR", "EUR"), (1000m, "1,000 JPY", "JPY"),
+                (1000.0001m, "1,000.00 INR", "INR"),
+                (0.0m, "0.00 USD", "USD")
             })
             {
-                var actual = CurrencyNameTable.Instance.DisplayFormatCurrency(test.Item1, test.Item3);
+                var actual = displayFormatter.Currency(test.Item1, test.Item3);
                 actual = actual.Replace("￥", "¥"); // Hack so JPY test pass on linux as well
                 Assert.Equal(test.Item2, actual);
             }
@@ -706,22 +734,69 @@ namespace BTCPayServer.Tests
             Assert.Throws<ParsingException>(() => { parser.ParseOutputDescriptor("wpkh([8b60afd1/49h/0h/0h]xpub661MyMwAFXkMnyoBjyHndD3QwRbcGVBsTGeNZN6QGVHcfz4MPzBUxjSevweNFQx7SqmMHLdSA4FteGsRrEriu4pnVZMZWnruFFAYZATtcDw/0/*)#9x4vkw48"); }); // invalid checksum
         }
 
+        [Fact]
+        public void ParseTradeQuantity()
+        {
+            Assert.Throws<FormatException>(() => TradeQuantity.Parse("1.2345o"));
+            Assert.Throws<FormatException>(() => TradeQuantity.Parse("o"));
+            Assert.Throws<FormatException>(() => TradeQuantity.Parse(""));
+            Assert.Throws<FormatException>(() => TradeQuantity.Parse("1.353%%"));
+            Assert.Throws<FormatException>(() => TradeQuantity.Parse("1.353 %%"));
+            Assert.Throws<FormatException>(() => TradeQuantity.Parse("-1.353%"));
+            Assert.Throws<FormatException>(() => TradeQuantity.Parse("-1.353"));
+
+            var qty = TradeQuantity.Parse("1.3%");
+            Assert.Equal(1.3m, qty.Value);
+            Assert.Equal(TradeQuantity.ValueType.Percent, qty.Type);
+            var qty2 = TradeQuantity.Parse("1.3");
+            Assert.Equal(1.3m, qty2.Value);
+            Assert.Equal(TradeQuantity.ValueType.Exact, qty2.Type);
+            Assert.NotEqual(qty, qty2);
+            Assert.Equal(qty, TradeQuantity.Parse("1.3%"));
+            Assert.Equal(qty2, TradeQuantity.Parse("1.3"));
+            Assert.Equal(TradeQuantity.Parse(qty.ToString()), TradeQuantity.Parse("1.3%"));
+            Assert.Equal(TradeQuantity.Parse(qty2.ToString()), TradeQuantity.Parse("1.3"));
+            Assert.Equal(TradeQuantity.Parse(qty2.ToString()), TradeQuantity.Parse(" 1.3 "));
+        }
+
         [Fact]
         public void ParseDerivationSchemeSettings()
         {
+            var testnet = new BTCPayNetworkProvider(ChainName.Testnet).GetNetwork<BTCPayNetwork>("BTC");
             var mainnet = new BTCPayNetworkProvider(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();
 
+            // xpub
+            var tpub = "tpubD6NzVbkrYhZ4YHNiuTdTmHRmbcPRLfqgyneZFCL1mkzkUBjXriQShxTh9HL34FK2mhieasJVk9EzJrUfkFqRNQBjiXgx3n5BhPkxKBoFmaS";
+            Assert.True(DerivationSchemeSettings.TryParseFromWalletFile(tpub, testnet, out var settings, out var error));
+            Assert.Null(error);
+            Assert.True(settings.AccountDerivation is DirectDerivationStrategy { Segwit: false });
+            Assert.Equal($"{tpub}-[legacy]", ((DirectDerivationStrategy)settings.AccountDerivation).ToString());
+
+            // xpub with fingerprint and account
+            tpub = "tpubDCXK98mNrPWuoWweaoUkqwxQF5NMWpQLy7n7XJgDCpwYfoZRXGafPaVM7mYqD7UKhsbMxkN864JY2PniMkt1Uk4dNuAMnWFVqdquyvZNyca";
+            var vpub = "vpub5YVA1ZbrqkUVq8NZTtvRDrS2a1yoeBvHbG9NbxqJ6uRtpKGFwjQT11WEqKYsgoDF6gpqrDf8ddmPZe4yXWCjzqF8ad2Cw9xHiE8DSi3X3ik";
+            var fingerprint = "e5746fd9";
+            var account = "84'/1'/0'";
+            var str = $"[{fingerprint}/{account}]{vpub}";
+            Assert.True(DerivationSchemeSettings.TryParseFromWalletFile(str, testnet, out settings, out error));
+            Assert.Null(error);
+            Assert.True(settings.AccountDerivation is DirectDerivationStrategy { Segwit: true });
+            Assert.Equal(vpub, settings.AccountOriginal);
+            Assert.Equal(tpub, ((DirectDerivationStrategy)settings.AccountDerivation).ToString());
+            Assert.Equal(HDFingerprint.TryParse(fingerprint, out var hd) ? hd : default, settings.AccountKeySettings[0].RootFingerprint);
+            Assert.Equal(account, settings.AccountKeySettings[0].AccountKeyPath.ToString());
+
             // ColdCard
             Assert.True(DerivationSchemeSettings.TryParseFromWalletFile(
                 "{\"keystore\": {\"ckcc_xpub\": \"xpub661MyMwAqRbcGVBsTGeNZN6QGVHmMHLdSA4FteGsRrEriu4pnVZMZWnruFFFXkMnyoBjyHndD3Qwcfz4MPzBUxjSevweNFQx7SAYZATtcDw\", \"xpub\": \"ypub6WWc2gWwHbdnAAyJDnR4SPL1phRh7REqrPBfZeizaQ1EmTshieRXJC3Z5YoU4wkcdKHEjQGkh6AYEzCQC1Kz3DNaWSwdc1pc8416hAjzqyD\", \"label\": \"Coldcard Import 0x60d1af8b\", \"ckcc_xfp\": 1624354699, \"type\": \"hardware\", \"hw_type\": \"coldcard\", \"derivation\": \"m/49'/0'/0'\"}, \"wallet_type\": \"standard\", \"use_encryption\": false, \"seed_version\": 17}",
-                mainnet, out var settings, out var error));
+                mainnet, out settings, out error));
             Assert.Null(error);
             Assert.Equal(root.GetPublicKey().GetHDFingerPrint(), settings.AccountKeySettings[0].RootFingerprint);
             Assert.Equal(settings.AccountKeySettings[0].RootFingerprint,
-                HDFingerprint.TryParse("8bafd160", out var hd) ? hd : default);
+                HDFingerprint.TryParse("8bafd160", out hd) ? hd : default);
             Assert.Equal("Coldcard Import 0x60d1af8b", settings.Label);
             Assert.Equal("49'/0'/0'", settings.AccountKeySettings[0].AccountKeyPath.ToString());
             Assert.Equal(
@@ -729,28 +804,26 @@ namespace BTCPayServer.Tests
                 settings.AccountOriginal);
             Assert.Equal(root.Derive(new KeyPath("m/49'/0'/0'")).Neuter().PubKey.WitHash.ScriptPubKey.Hash.ScriptPubKey,
                 settings.AccountDerivation.GetDerivation().ScriptPubKey);
-            var testnet = new BTCPayNetworkProvider(ChainName.Testnet).GetNetwork<BTCPayNetwork>("BTC");
 
             // Should be legacy
             Assert.True(DerivationSchemeSettings.TryParseFromWalletFile(
                 "{\"keystore\": {\"ckcc_xpub\": \"tpubD6NzVbkrYhZ4YHNiuTdTmHRmbcPRLfqgyneZFCL1mkzkUBjXriQShxTh9HL34FK2mhieasJVk9EzJrUfkFqRNQBjiXgx3n5BhPkxKBoFmaS\", \"xpub\": \"tpubDDWYqT3P24znfsaGX7kZcQhNc5LAjnQiKQvUCHF2jS6dsgJBRtymopEU5uGpMaR5YChjuiExZG1X2aTbqXkp82KqH5qnqwWHp6EWis9ZvKr\", \"label\": \"Coldcard Import 0x60d1af8b\", \"ckcc_xfp\": 1624354699, \"type\": \"hardware\", \"hw_type\": \"coldcard\", \"derivation\": \"m/44'/1'/0'\"}, \"wallet_type\": \"standard\", \"use_encryption\": false, \"seed_version\": 17}",
                 testnet, out settings, out error));
-            Assert.True(settings.AccountDerivation is DirectDerivationStrategy s && !s.Segwit);
+            Assert.True(settings.AccountDerivation is DirectDerivationStrategy { Segwit: false });
             Assert.Null(error);
 
             // Should be segwit p2sh
             Assert.True(DerivationSchemeSettings.TryParseFromWalletFile(
                 "{\"keystore\": {\"ckcc_xpub\": \"tpubD6NzVbkrYhZ4YHNiuTdTmHRmbcPRLfqgyneZFCL1mkzkUBjXriQShxTh9HL34FK2mhieasJVk9EzJrUfkFqRNQBjiXgx3n5BhPkxKBoFmaS\", \"xpub\": \"upub5DSddA9NoRUyJrQ4p86nsCiTSY7kLHrSxx3joEJXjHd4HPARhdXUATuk585FdWPVC2GdjsMePHb6BMDmf7c6KG4K4RPX6LVqBLtDcWpQJmh\", \"label\": \"Coldcard Import 0x60d1af8b\", \"ckcc_xfp\": 1624354699, \"type\": \"hardware\", \"hw_type\": \"coldcard\", \"derivation\": \"m/49'/1'/0'\"}, \"wallet_type\": \"standard\", \"use_encryption\": false, \"seed_version\": 17}",
                 testnet, out settings, out error));
-            Assert.True(settings.AccountDerivation is P2SHDerivationStrategy p &&
-                        p.Inner is DirectDerivationStrategy s2 && s2.Segwit);
+            Assert.True(settings.AccountDerivation is P2SHDerivationStrategy { Inner: DirectDerivationStrategy { Segwit: true } });
             Assert.Null(error);
 
             // Should be segwit
             Assert.True(DerivationSchemeSettings.TryParseFromWalletFile(
                 "{\"keystore\": {\"ckcc_xpub\": \"tpubD6NzVbkrYhZ4YHNiuTdTmHRmbcPRLfqgyneZFCL1mkzkUBjXriQShxTh9HL34FK2mhieasJVk9EzJrUfkFqRNQBjiXgx3n5BhPkxKBoFmaS\", \"xpub\": \"vpub5YjYxTemJ39tFRnuAhwduyxG2tKGjoEpmvqVQRPqdYrqa6YGoeSzBtHXaJUYB19zDbXs3JjbEcVWERjQBPf9bEfUUMZNMv1QnMyHV8JPqyf\", \"label\": \"Coldcard Import 0x60d1af8b\", \"ckcc_xfp\": 1624354699, \"type\": \"hardware\", \"hw_type\": \"coldcard\", \"derivation\": \"m/84'/1'/0'\"}, \"wallet_type\": \"standard\", \"use_encryption\": false, \"seed_version\": 17}",
                 testnet, out settings, out error));
-            Assert.True(settings.AccountDerivation is DirectDerivationStrategy s3 && s3.Segwit);
+            Assert.True(settings.AccountDerivation is DirectDerivationStrategy { Segwit: true });
             Assert.Null(error);
 
             // Specter
@@ -970,14 +1043,13 @@ namespace BTCPayServer.Tests
         [Fact]
         public void CanParseFilter()
         {
+            var storeId = "6DehZnc9S7qC6TUTNWuzJ1pFsHTHvES6An21r3MjvLey";
             var filter = "storeid:abc, status:abed, blabhbalh ";
             var search = new SearchString(filter);
             Assert.Equal("storeid:abc, status:abed, blabhbalh", search.ToString());
             Assert.Equal("blabhbalh", search.TextSearch);
-            Assert.Single(search.Filters["storeid"]);
-            Assert.Single(search.Filters["status"]);
-            Assert.Equal("abc", search.Filters["storeid"].First());
-            Assert.Equal("abed", search.Filters["status"].First());
+            Assert.Single(search.Filters["storeid"], "abc");
+            Assert.Single(search.Filters["status"], "abed");
 
             filter = "status:abed, status:abed2";
             search = new SearchString(filter);
@@ -992,6 +1064,48 @@ namespace BTCPayServer.Tests
             search = new SearchString(filter);
             Assert.Equal("2019-04-25 01:00 AM", search.Filters["startdate"].First());
             Assert.Equal("hekki", search.TextSearch);
+            
+            // modify search
+            filter = $"status:settled,exceptionstatus:paidLate,unusual:true, fulltext searchterm, storeid:{storeId},startdate:2019-04-25 01:00:00";
+            search = new SearchString(filter);
+            Assert.Equal(filter, search.ToString());
+            Assert.Equal("fulltext searchterm", search.TextSearch);
+            Assert.Single(search.Filters["storeid"], storeId);
+            Assert.Single(search.Filters["status"], "settled");
+            Assert.Single(search.Filters["exceptionstatus"], "paidLate");
+            Assert.Single(search.Filters["unusual"], "true");
+            
+            // toggle off bool with same value
+            var modified = new SearchString(search.Toggle("unusual", "true"));
+            Assert.Null(modified.GetFilterBool("unusual"));
+            
+            // add to array
+            modified = new SearchString(modified.Toggle("status", "processing"));
+            var statusArray = modified.GetFilterArray("status");
+            Assert.Equal(2, statusArray.Length);
+            Assert.Contains("processing", statusArray);
+            Assert.Contains("settled", statusArray);
+            
+            // toggle off array with same value
+            modified = new SearchString(modified.Toggle("status", "settled"));
+            statusArray = modified.GetFilterArray("status");
+            Assert.Single(statusArray, "processing");
+            
+            // toggle off array with null value
+            modified = new SearchString(modified.Toggle("status", null));
+            Assert.Null(modified.GetFilterArray("status"));
+            
+            // toggle off date with null value
+            modified = new SearchString(modified.Toggle("startdate", "-7d"));
+            Assert.Single(modified.GetFilterArray("startdate"), "-7d");
+            modified = new SearchString(modified.Toggle("startdate", null));
+            Assert.Null(modified.GetFilterArray("startdate"));
+            
+            // toggle off date with same value
+            modified = new SearchString(modified.Toggle("enddate", "-7d"));
+            Assert.Single(modified.GetFilterArray("enddate"), "-7d");
+            modified = new SearchString(modified.Toggle("enddate", "-7d"));
+            Assert.Null(modified.GetFilterArray("enddate"));
         }
 
         [Fact]
@@ -1269,6 +1383,24 @@ namespace BTCPayServer.Tests
             Assert.Equal(cache.States[0].Rates[0].Pair, cache2.States[0].Rates[0].Pair);
         }
 
+        [Fact]
+        public void CanParseStoreRoleId()
+        {
+            var id = StoreRoleId.Parse("test::lol");
+            Assert.Equal("test", id.StoreId);
+            Assert.Equal("lol", id.Role);
+            Assert.Equal("test::lol", id.ToString());
+            Assert.Equal("test::lol", id.Id);
+            Assert.False(id.IsServerRole);
+
+            id = StoreRoleId.Parse("lol");
+            Assert.Null(id.StoreId);
+            Assert.Equal("lol", id.Role);
+            Assert.Equal("lol", id.ToString());
+            Assert.Equal("lol", id.Id);
+            Assert.True(id.IsServerRole);
+        }
+
         [Fact]
         public void KitchenSinkTest()
         {
@@ -1466,14 +1598,14 @@ namespace BTCPayServer.Tests
             Assert.Equal(1m / 0.000061m, rule2.BidAsk.Bid);
 
             // testing rounding 
-            rule2 = rules.GetRuleFor(CurrencyPair.Parse("Sats_EUR"));
+            rule2 = rules.GetRuleFor(CurrencyPair.Parse("SATS_EUR"));
             rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_EUR"), new BidAsk(1.23m, 2.34m));
             Assert.True(rule2.Reevaluate());
             Assert.Equal("0.00000001 * (1.23, 2.34)", rule2.ToString(true));
             Assert.Equal(0.0000000234m, rule2.BidAsk.Ask);
             Assert.Equal(0.0000000123m, rule2.BidAsk.Bid);
 
-            rule2 = rules.GetRuleFor(CurrencyPair.Parse("EUR_Sats"));
+            rule2 = rules.GetRuleFor(CurrencyPair.Parse("EUR_SATS"));
             rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_EUR"), new BidAsk(1.23m, 2.34m));
             Assert.True(rule2.Reevaluate());
             Assert.Equal("1 / (0.00000001 * (1.23, 2.34))", rule2.ToString(true));
@@ -1715,7 +1847,7 @@ namespace BTCPayServer.Tests
             var networkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
             var paymentMethodHandlerDictionary = new PaymentMethodHandlerDictionary(new IPaymentMethodHandler[]
             {
-                new BitcoinLikePaymentHandler(null, networkProvider, null, null, null),
+                new BitcoinLikePaymentHandler(null, networkProvider, null, null, null, null),
                 new LightningLikePaymentHandler(null, null, networkProvider, null, null, null),
             });
             var networkBTC = networkProvider.GetNetwork("BTC");
@@ -1860,7 +1992,7 @@ namespace BTCPayServer.Tests
             })
             .ToHashSet();
 #pragma warning restore CS0618 // Type or member is obsolete
-            Assert.Equal(1, formats.Count);
+            Assert.Single(formats);
         }
 
         [Fact]

BTCPayServer.Tests/FormTests.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using BTCPayServer.Abstractions.Form;
 using BTCPayServer.Forms;
@@ -42,9 +40,10 @@ public class FormTests : UnitTestBase
                 }
             }
         };
-        var service = new FormDataService(null, null);
+        var providers = new FormComponentProviders(new List<IFormComponentProvider>());
+        var service = new FormDataService(null, providers);
         Assert.False(service.IsFormSchemaValid(form.ToString(), out _, out _));
-        form = new Form()
+        form = new Form
         {
             Fields = new List<Field>
             {
@@ -117,7 +116,7 @@ public class FormTests : UnitTestBase
                     break;
             }
         }
-        
+
         form = new Form()
         {
             Fields = new List<Field>
@@ -144,7 +143,7 @@ public class FormTests : UnitTestBase
             {"invoice_item3", new StringValues("updated")},
             {"invoice_test", new StringValues("updated")}
         }));
-        
+
         foreach (var f in form.GetAllFields())
         {
             var field = f.Field;
@@ -161,12 +160,12 @@ public class FormTests : UnitTestBase
             }
         }
 
-        var obj = form.GetValues();
+        var obj = service.GetValues(form);
         Assert.Equal("original", obj["invoice"]["test"].Value<string>());
         Assert.Equal("updated", obj["invoice_item3"].Value<string>());
         Clear(form);
         form.SetValues(obj);
-        obj = form.GetValues();
+        obj = service.GetValues(form);
         Assert.Equal("original", obj["invoice"]["test"].Value<string>());
         Assert.Equal("updated", obj["invoice_item3"].Value<string>());
 
@@ -184,10 +183,10 @@ public class FormTests : UnitTestBase
             }
         };
         form.SetValues(obj);
-        obj = form.GetValues();
+        obj = service.GetValues(form);
         Assert.Null(obj["test"].Value<string>());
-        form.SetValues(new JObject{ ["test"] = "hello" });
-        obj = form.GetValues();
+        form.SetValues(new JObject { ["test"] = "hello" });
+        obj = service.GetValues(form);
         Assert.Equal("hello", obj["test"].Value<string>());
     }
 

BTCPayServer.Tests/GreenfieldAPITests.cs

@@ -15,12 +15,16 @@ using BTCPayServer.Lightning;
 using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
+using BTCPayServer.PayoutProcessors;
+using BTCPayServer.PayoutProcessors.OnChain;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Custodian.Client.MockCustodian;
 using BTCPayServer.Services.Notifications;
 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;
@@ -212,18 +216,20 @@ namespace BTCPayServer.Tests
             var store = await unrestricted.CreateStore(new CreateStoreRequest() { Name = "Pouet lol" });
 
             // Grant right to another user
-            newUserAPIKey = await unrestricted.CreateAPIKey(newUser.Id, new CreateApiKeyRequest()
+            newUserAPIKey = await unrestricted.CreateAPIKey(newUser.Email, new CreateApiKeyRequest()
             {
                 Label = "Hello world",
                 Permissions = new Permission[] { Permission.Create(Policies.CanViewInvoices, store.Id) },
             });
 
+            await AssertAPIError("user-not-found", () => unrestricted.CreateAPIKey("fewiofwuefo", new CreateApiKeyRequest()));
+
             // Despite the grant, the user shouldn't be able to get the invoices!
             newUserClient = acc.CreateClientFromAPIKey(newUserAPIKey.ApiKey);
             await Assert.ThrowsAsync<GreenfieldAPIException>(() => newUserClient.GetInvoices(store.Id));
 
             // if user is a guest or owner, then it should be ok
-            await unrestricted.AddStoreUser(store.Id, new StoreUserData() { UserId = newUser.Id, Role = "Guest" });
+            await unrestricted.AddStoreUser(store.Id, new StoreUserData() { UserId = newUser.Id});
             await newUserClient.GetInvoices(store.Id);
         }
 
@@ -300,7 +306,8 @@ namespace BTCPayServer.Tests
             {
                 await client.GetApp("some random ID lol");
             });
-            await AssertHttpError(404, async () => {
+            await AssertHttpError(404, async () =>
+            {
                 await client.GetPosApp("some random ID lol");
             });
 
@@ -449,7 +456,7 @@ namespace BTCPayServer.Tests
             // Test creating a crowdfund app
             var app = await client.CreateCrowdfundApp(
                 user.StoreId,
-                new CreateCrowdfundAppRequest() 
+                new CreateCrowdfundAppRequest()
                 {
                     AppName = "test app from API",
                     Title = "test app title"
@@ -460,10 +467,12 @@ namespace BTCPayServer.Tests
             Assert.Equal("Crowdfund", app.AppType);
 
             // Make sure we return a 404 if we try to get an app that doesn't exist
-            await AssertHttpError(404, async () => {
+            await AssertHttpError(404, async () =>
+            {
                 await client.GetApp("some random ID lol");
             });
-            await AssertHttpError(404, async () => {
+            await AssertHttpError(404, async () =>
+            {
                 await client.GetCrowdfundApp("some random ID lol");
             });
 
@@ -486,7 +495,8 @@ namespace BTCPayServer.Tests
 
             // Test deleting the newly created app
             await client.DeleteApp(retrievedApp.Id);
-            await AssertHttpError(404, async () => {
+            await AssertHttpError(404, async () =>
+            {
                 await client.GetApp(retrievedApp.Id);
             });
         }
@@ -510,8 +520,8 @@ namespace BTCPayServer.Tests
                 }
             );
             var crowdfundApp = await client.CreateCrowdfundApp(user.StoreId, new CreateCrowdfundAppRequest() { AppName = "test app from API" });
-           
-           // Create another store and one app on it so we can get all apps from all stores for the user below
+
+            // Create another store and one app on it so we can get all apps from all stores for the user below
             var newStore = await client.CreateStore(new CreateStoreRequest() { Name = "A" });
             var newApp = await client.CreateCrowdfundApp(newStore.Id, new CreateCrowdfundAppRequest() { AppName = "new app" });
 
@@ -542,7 +552,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(crowdfundApp.Name, apps[1].Name);
             Assert.Equal(crowdfundApp.StoreId, apps[1].StoreId);
             Assert.Equal(crowdfundApp.AppType, apps[1].AppType);
-            
+
             Assert.Equal(newApp.Name, apps[2].Name);
             Assert.Equal(newApp.StoreId, apps[2].StoreId);
             Assert.Equal(newApp.AppType, apps[2].AppType);
@@ -1064,7 +1074,23 @@ namespace BTCPayServer.Tests
             var lnrURLs = await unauthenticated.GetPullPaymentLNURL(test4.Id);
             Assert.IsType<string>(lnrURLs.LNURLBech32);
             Assert.IsType<string>(lnrURLs.LNURLUri);
+            Assert.Equal(12.303228134m, test4.Amount);
+            Assert.Equal("BTC", test4.Currency);
             
+            // Test with SATS denomination values
+            var testSats = await client.CreatePullPayment(storeId, new Client.Models.CreatePullPaymentRequest()
+            {
+                Name = "Test SATS",
+                Amount = 21000,
+                Currency = "SATS",
+                PaymentMethods = new[] { "BTC", "BTC-LightningNetwork", "BTC_LightningLike" }
+            });
+            lnrURLs = await unauthenticated.GetPullPaymentLNURL(testSats.Id);
+            Assert.IsType<string>(lnrURLs.LNURLBech32);
+            Assert.IsType<string>(lnrURLs.LNURLUri);
+            Assert.Equal(21000, testSats.Amount);
+            Assert.Equal("SATS", testSats.Currency);
+
             //permission test around auto approved pps and payouts
             var nonApproved = await acc.CreateClient(Policies.CanCreateNonApprovedPullPayments);
             var approved = await acc.CreateClient(Policies.CanCreatePullPayments);
@@ -1089,7 +1115,7 @@ namespace BTCPayServer.Tests
                     Destination = new Key().GetAddress(ScriptPubKeyType.TaprootBIP86, Network.RegTest).ToString()
                 });
             });
-            
+
             var pullPayment = await approved.CreatePullPayment(acc.StoreId, new CreatePullPaymentRequest()
             {
                 Amount = 100,
@@ -1098,7 +1124,7 @@ namespace BTCPayServer.Tests
                 PaymentMethods = new[] { "BTC" },
                 AutoApproveClaims = true
             });
-            
+
             var p = await approved.CreatePayout(acc.StoreId, new CreatePayoutThroughStoreRequest()
             {
                 Amount = 100,
@@ -1254,7 +1280,10 @@ namespace BTCPayServer.Tests
             //update store
             Assert.Empty(newStore.PaymentMethodCriteria);
             await client.GenerateOnChainWallet(newStore.Id, "BTC", new GenerateOnChainWalletRequest());
-            var updatedStore = await client.UpdateStore(newStore.Id, new UpdateStoreRequest() { Name = "B", PaymentMethodCriteria = new List<PaymentMethodCriteriaData>()
+            var updatedStore = await client.UpdateStore(newStore.Id, new UpdateStoreRequest()
+            {
+                Name = "B",
+                PaymentMethodCriteria = new List<PaymentMethodCriteriaData>()
             {
                 new()
                 {
@@ -1263,7 +1292,8 @@ namespace BTCPayServer.Tests
                     PaymentMethod = "BTC",
                     CurrencyCode = "USD"
                 }
-             }});
+             }
+            });
             Assert.Equal("B", updatedStore.Name);
             var s = (await client.GetStore(newStore.Id));
             Assert.Equal("B", s.Name);
@@ -1273,9 +1303,9 @@ namespace BTCPayServer.Tests
             Assert.True(pmc.Above);
             Assert.Equal("BTC", pmc.PaymentMethod);
             Assert.Equal("USD", pmc.CurrencyCode);
-            updatedStore = await client.UpdateStore(newStore.Id, new UpdateStoreRequest() { Name = "B"});
+            updatedStore = await client.UpdateStore(newStore.Id, new UpdateStoreRequest() { Name = "B" });
             Assert.Empty(newStore.PaymentMethodCriteria);
-            
+
             //list stores
             var stores = await client.GetStores();
             var storeIds = stores.Select(data => data.Id);
@@ -1303,15 +1333,22 @@ namespace BTCPayServer.Tests
                 await user.CreateClient(Permission.Create(Policies.CanViewStoreSettings, user.StoreId).ToString());
             Assert.Single(await scopedClient.GetStores());
 
-            var noauth = await user.CreateClient(Array.Empty<string>());
-            await AssertAPIError("missing-permission", () => noauth.GetStores());
-
             // We strip the user's Owner right, so the key should not work
             using var ctx = tester.PayTester.GetService<Data.ApplicationDbContextFactory>().CreateContext();
             var storeEntity = await ctx.UserStore.SingleAsync(u => u.ApplicationUserId == user.UserId && u.StoreDataId == newStore.Id);
-            storeEntity.Role = "Guest";
+            var roleId  = (await tester.PayTester.GetService<StoreRepository>().GetStoreRoles(null)).Single(r => r.Role == "Guest").Id;
+            storeEntity.StoreRoleId = roleId;
             await ctx.SaveChangesAsync();
             await AssertHttpError(403, async () => await client.UpdateStore(newStore.Id, new UpdateStoreRequest() { Name = "B" }));
+
+            client = await user.CreateClient(Policies.Unrestricted);
+            stores = await client.GetStores();
+            foreach (var s2 in stores)
+            {
+                await tester.PayTester.StoreRepository.DeleteStore(s2.Id);
+            }
+            tester.DeleteStore = false;
+            Assert.Empty(await client.GetStores());
         }
 
         private async Task<GreenfieldValidationException> AssertValidationError(string[] fields, Func<Task> act)
@@ -1411,7 +1448,7 @@ namespace BTCPayServer.Tests
                 Assert.False(hook.AutomaticRedelivery);
                 Assert.Equal(fakeServer.ServerUri.AbsoluteUri, hook.Url);
             }
-            using var tester = CreateServerTester();
+            using var tester = CreateServerTester(newDb: true);
             using var fakeServer = new FakeServer();
             await fakeServer.Start();
             await tester.StartAsync();
@@ -1458,6 +1495,7 @@ namespace BTCPayServer.Tests
             var newDeliveryId = await clientProfile.RedeliverWebhook(user.StoreId, hook.Id, delivery.Id);
             req = await fakeServer.GetNextRequest();
             req.Response.StatusCode = 404;
+            Assert.StartsWith("BTCPayServer", Assert.Single(req.Request.Headers.UserAgent));
             await TestUtils.EventuallyAsync(async () =>
             {
                 // Releasing semaphore several times may help making this test less flaky
@@ -1487,6 +1525,14 @@ namespace BTCPayServer.Tests
             clientProfile = await user.CreateClient(Policies.CanModifyStoreSettings, Policies.CanCreateInvoice);
             await clientProfile.GetWebhookDeliveryRequest(user.StoreId, hook.Id, newDeliveryId);
 
+
+            TestLogs.LogInformation("Can prune deliveries");
+            var cleanup = tester.PayTester.GetService<HostedServices.CleanupWebhookDeliveriesTask>();
+            cleanup.BatchSize = 1;
+            cleanup.PruneAfter = TimeSpan.Zero;
+            await cleanup.Do(default);
+            await AssertHttpError(409, () => clientProfile.RedeliverWebhook(user.StoreId, hook.Id, delivery.Id));
+
             TestLogs.LogInformation("Testing corner cases");
             Assert.Null(await clientProfile.GetWebhookDeliveryRequest(user.StoreId, "lol", newDeliveryId));
             Assert.Null(await clientProfile.GetWebhookDeliveryRequest(user.StoreId, hook.Id, "lol"));
@@ -1930,6 +1976,82 @@ namespace BTCPayServer.Tests
                 CustomCurrency = "BTC"
             });
             Assert.True(pp.AutoApproveClaims);
+            
+            // test subtract percentage
+            validationError = await AssertValidationError(new[] { "SubtractPercentage" }, async () =>
+            {
+                await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
+                {
+                    PaymentMethod = method.PaymentMethod,
+                    RefundVariant = RefundVariant.RateThen,
+                    SubtractPercentage = 101
+                });
+            });
+            Assert.Contains("SubtractPercentage: Percentage must be a numeric value between 0 and 100", validationError.Message);
+
+            // should auto-approve
+            pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
+            {
+                PaymentMethod = method.PaymentMethod,
+                RefundVariant = RefundVariant.RateThen,
+                SubtractPercentage = 6.15m
+            });
+            Assert.Equal("BTC", pp.Currency);
+            Assert.True(pp.AutoApproveClaims);
+            Assert.Equal(0.9385m, pp.Amount);
+            
+            // test RefundVariant.OverpaidAmount
+            validationError = await AssertValidationError(new[] { "RefundVariant" }, async () =>
+            {
+                await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
+                {
+                    PaymentMethod = method.PaymentMethod,
+                    RefundVariant = RefundVariant.OverpaidAmount
+                });
+            });
+            Assert.Contains("Invoice is not overpaid", validationError.Message);
+            
+            // should auto-approve
+            invoice = await client.CreateInvoice(user.StoreId, new CreateInvoiceRequest { Amount = 5000.0m, Currency = "USD" });
+            methods = await client.GetInvoicePaymentMethods(user.StoreId, invoice.Id);
+            method = methods.First();
+
+            await tester.WaitForEvent<NewOnChainTransactionEvent>(async () =>
+            {
+                await tester.ExplorerNode.SendToAddressAsync(
+                    BitcoinAddress.Create(method.Destination, tester.NetworkProvider.BTC.NBitcoinNetwork),
+                    Money.Coins(method.Due * 2)
+                );
+            });
+
+            await tester.ExplorerNode.GenerateAsync(5);
+
+            await TestUtils.EventuallyAsync(async () =>
+            {
+                invoice = await client.GetInvoice(user.StoreId, invoice.Id);    
+                Assert.True(invoice.Status == InvoiceStatus.Settled);           
+                Assert.True(invoice.AdditionalStatus == InvoiceExceptionStatus.PaidOver);
+            });
+            
+            pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
+            {
+                PaymentMethod = method.PaymentMethod,
+                RefundVariant = RefundVariant.OverpaidAmount
+            });
+            Assert.Equal("BTC", pp.Currency);
+            Assert.True(pp.AutoApproveClaims);
+            Assert.Equal(method.Due, pp.Amount);
+            
+            // once more with subtract percentage
+            pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
+            {
+                PaymentMethod = method.PaymentMethod,
+                RefundVariant = RefundVariant.OverpaidAmount,
+                SubtractPercentage = 21m
+            });
+            Assert.Equal("BTC", pp.Currency);
+            Assert.True(pp.AutoApproveClaims);
+            Assert.Equal(0.79m, pp.Amount);
         }
 
         [Fact(Timeout = TestTimeout)]
@@ -2237,7 +2359,7 @@ namespace BTCPayServer.Tests
             Assert.Single(paymentMethods);
             Assert.True(paymentMethods.First().Activated);
 
-            var invoiceWithdefaultPaymentMethodLN = await client.CreateInvoice(user.StoreId,
+            var invoiceWithDefaultPaymentMethodLN = await client.CreateInvoice(user.StoreId,
                 new CreateInvoiceRequest()
                 {
                     Currency = "USD",
@@ -2248,9 +2370,9 @@ namespace BTCPayServer.Tests
                         DefaultPaymentMethod = "BTC_LightningLike"
                     }
                 });
-            Assert.Equal("BTC_LightningLike", invoiceWithdefaultPaymentMethodLN.Checkout.DefaultPaymentMethod);
+            Assert.Equal("BTC_LightningLike", invoiceWithDefaultPaymentMethodLN.Checkout.DefaultPaymentMethod);
 
-            var invoiceWithdefaultPaymentMethodOnChain = await client.CreateInvoice(user.StoreId,
+            var invoiceWithDefaultPaymentMethodOnChain = await client.CreateInvoice(user.StoreId,
                 new CreateInvoiceRequest()
                 {
                     Currency = "USD",
@@ -2261,13 +2383,35 @@ namespace BTCPayServer.Tests
                         DefaultPaymentMethod = "BTC"
                     }
                 });
-            Assert.Equal("BTC", invoiceWithdefaultPaymentMethodOnChain.Checkout.DefaultPaymentMethod);
-
+            Assert.Equal("BTC", invoiceWithDefaultPaymentMethodOnChain.Checkout.DefaultPaymentMethod);
+            
+            // reset lazy payment methods
             store = await client.GetStore(user.StoreId);
             store.LazyPaymentMethods = false;
             store = await client.UpdateStore(store.Id,
                 JObject.FromObject(store).ToObject<UpdateStoreRequest>());
+            Assert.False(store.LazyPaymentMethods);
+            
+            // use store default payment method
+            store = await client.GetStore(user.StoreId);
+            Assert.Null(store.DefaultPaymentMethod);
+            var storeDefaultPaymentMethod = "BTC-LightningNetwork";
+            store.DefaultPaymentMethod = storeDefaultPaymentMethod;
+            store = await client.UpdateStore(store.Id,
+                JObject.FromObject(store).ToObject<UpdateStoreRequest>());
+            Assert.Equal(storeDefaultPaymentMethod, store.DefaultPaymentMethod);
 
+            var invoiceWithStoreDefaultPaymentMethod = await client.CreateInvoice(user.StoreId,
+                new CreateInvoiceRequest()
+                {
+                    Currency = "USD",
+                    Amount = 100,
+                    Checkout = new CreateInvoiceRequest.CheckoutOptions()
+                    {
+                        PaymentMethods = new[] { "BTC", "BTC-LightningNetwork", "BTC_LightningLike" }
+                    }
+                });
+            Assert.Equal(storeDefaultPaymentMethod, invoiceWithStoreDefaultPaymentMethod.Checkout.DefaultPaymentMethod);
 
             //let's see the overdue amount 
             invoice = await client.CreateInvoice(user.StoreId,
@@ -2323,28 +2467,11 @@ namespace BTCPayServer.Tests
             Assert.NotNull(merchantInvoice.Id);
             Assert.NotNull(merchantInvoice.PaymentHash);
             Assert.Equal(merchantInvoice.Id, merchantInvoice.PaymentHash);
-            
-            // The default client is using charge, so we should not be able to query channels
-            var chargeClient = await user.CreateClient(Policies.CanUseInternalLightningNode);
-            
-            var info = await chargeClient.GetLightningNodeInfo("BTC");
-            Assert.Single(info.NodeURIs);
-            Assert.NotEqual(0, info.BlockHeight);
-            Assert.NotNull(info.Alias);
-            Assert.NotNull(info.Color);
-            Assert.NotNull(info.Version);
-            Assert.NotNull(info.PeersCount);
-            Assert.NotNull(info.ActiveChannelsCount);
-            Assert.NotNull(info.InactiveChannelsCount);
-            Assert.NotNull(info.PendingChannelsCount);
 
-            var gex = await AssertAPIError("lightning-node-unavailable", () => chargeClient.ConnectToLightningNode("BTC", new ConnectToNodeRequest(NodeInfo.Parse($"{new Key().PubKey.ToHex()}@localhost:3827"))));
-            Assert.Contains("NotSupported", gex.Message);
-
-            await AssertAPIError("lightning-node-unavailable", () => chargeClient.GetLightningNodeChannels("BTC"));
+            var client = await user.CreateClient(Policies.CanUseInternalLightningNode);
             // Not permission for the store!
-            await AssertAPIError("missing-permission", () => chargeClient.GetLightningNodeChannels(user.StoreId, "BTC"));
-            var invoiceData = await chargeClient.CreateLightningInvoice("BTC", new CreateLightningInvoiceRequest()
+            await AssertAPIError("missing-permission", () => client.GetLightningNodeChannels(user.StoreId, "BTC"));
+            var invoiceData = await client.CreateLightningInvoice("BTC", new CreateLightningInvoiceRequest()
             {
                 Amount = LightMoney.Satoshis(1000),
                 Description = "lol",
@@ -2352,17 +2479,17 @@ namespace BTCPayServer.Tests
                 PrivateRouteHints = false
             });
             var chargeInvoice = invoiceData;
-            Assert.NotNull(await chargeClient.GetLightningInvoice("BTC", invoiceData.Id));
+            Assert.NotNull(await client.GetLightningInvoice("BTC", invoiceData.Id));
 
             // check list for internal node
-            var invoices = await chargeClient.GetLightningInvoices("BTC");
-            var pendingInvoices = await chargeClient.GetLightningInvoices("BTC", true);
+            var invoices = await client.GetLightningInvoices("BTC");
+            var pendingInvoices = await client.GetLightningInvoices("BTC", true);
             Assert.NotEmpty(invoices);
             Assert.Contains(invoices, i => i.Id == invoiceData.Id);
             Assert.NotEmpty(pendingInvoices);
             Assert.Contains(pendingInvoices, i => i.Id == invoiceData.Id);
 
-            var client = await user.CreateClient($"{Policies.CanUseLightningNodeInStore}:{user.StoreId}");
+            client = await user.CreateClient($"{Policies.CanUseLightningNodeInStore}:{user.StoreId}");
             // Not permission for the server
             await AssertAPIError("missing-permission", () => client.GetLightningNodeChannels("BTC"));
 
@@ -2395,7 +2522,7 @@ namespace BTCPayServer.Tests
             Assert.NotNull(payResponse.FeeAmount);
             Assert.NotNull(payResponse.TotalAmount);
             Assert.NotNull(payResponse.PaymentHash);
-            
+
             // check the get invoice response
             var merchInvoice = await merchantClient.GetLightningInvoice(merchant.StoreId, "BTC", merchantInvoice.Id);
             Assert.NotNull(merchInvoice);
@@ -2434,14 +2561,14 @@ namespace BTCPayServer.Tests
 
             // Amount received might be bigger because of internal implementation shit from lightning
             Assert.True(LightMoney.Satoshis(1000) <= invoice.AmountReceived);
-            
+
             // check payments list for store node
             var payments = await client.GetLightningPayments(user.StoreId, "BTC");
             Assert.NotEmpty(payments);
             Assert.Contains(payments, i => i.BOLT11 == merchantInvoice.BOLT11);
 
             // Node info
-            info = await client.GetLightningNodeInfo(user.StoreId, "BTC");
+            var info = await client.GetLightningNodeInfo(user.StoreId, "BTC");
             Assert.Single(info.NodeURIs);
             Assert.NotEqual(0, info.BlockHeight);
 
@@ -2480,9 +2607,14 @@ namespace BTCPayServer.Tests
             var user = tester.NewAccount();
             await user.GrantAccessAsync(true);
             user.RegisterLightningNode("BTC", LightningConnectionType.CLightning);
-            
+
             var client = await user.CreateClient(Policies.Unrestricted);
-            var invoice = await client.CreateInvoice(user.StoreId,
+            var invoices = new Task<Client.Models.InvoiceData>[5];
+
+            // Create invoices
+            for (int i = 0; i < invoices.Length; i++)
+            {
+                invoices[i] = client.CreateInvoice(user.StoreId,
                 new CreateInvoiceRequest
                 {
                     Currency = "USD",
@@ -2493,18 +2625,35 @@ namespace BTCPayServer.Tests
                         DefaultPaymentMethod = "BTC_LightningLike"
                     }
                 });
-            var pm = Assert.Single(await client.GetInvoicePaymentMethods(user.StoreId, invoice.Id));
-            Assert.False(pm.AdditionalData.HasValues);
-            
-            var resp = await tester.CustomerLightningD.Pay(pm.Destination);
-            Assert.Equal(PayResult.Ok, resp.Result);
-            Assert.NotNull(resp.Details.PaymentHash);
-            Assert.NotNull(resp.Details.Preimage);
-            
-            pm = Assert.Single(await client.GetInvoicePaymentMethods(user.StoreId, invoice.Id));
-            Assert.True(pm.AdditionalData.HasValues);
-            Assert.Equal(resp.Details.PaymentHash.ToString(), pm.AdditionalData.GetValue("paymentHash"));
-            Assert.Equal(resp.Details.Preimage.ToString(), pm.AdditionalData.GetValue("preimage"));
+            }
+
+            var pm = new InvoicePaymentMethodDataModel[invoices.Length];
+            for (int i = 0; i < invoices.Length; i++)
+            {
+                pm[i] = Assert.Single(await client.GetInvoicePaymentMethods(user.StoreId, (await invoices[i]).Id));
+                Assert.True(pm[i].AdditionalData.HasValues);
+            }
+
+            // Pay them all at once
+            Task<PayResponse>[] payResponses = new Task<PayResponse>[invoices.Length];
+            for (int i = 0; i < invoices.Length; i++)
+            {
+                payResponses[i] = tester.CustomerLightningD.Pay(pm[i].Destination);
+            }
+
+            // Checking the results
+            for (int i = 0; i < invoices.Length; i++)
+            {
+                var resp = await payResponses[i];
+                Assert.Equal(PayResult.Ok, resp.Result);
+                Assert.NotNull(resp.Details.PaymentHash);
+                Assert.NotNull(resp.Details.Preimage);
+
+                pm[i] = Assert.Single(await client.GetInvoicePaymentMethods(user.StoreId, (await invoices[i]).Id));
+                Assert.True(pm[i].AdditionalData.HasValues);
+                Assert.Equal(resp.Details.PaymentHash.ToString(), pm[i].AdditionalData.GetValue("paymentHash"));
+                Assert.Equal(resp.Details.Preimage.ToString(), pm[i].AdditionalData.GetValue("preimage"));
+            }
         }
 
         [Fact(Timeout = 60 * 20 * 1000)]
@@ -3185,7 +3334,7 @@ namespace BTCPayServer.Tests
 
         }
 
-        [Fact(Timeout =TestTimeout)]
+        [Fact(Timeout = TestTimeout)]
         [Trait("Integration", "Integration")]
         public async Task StoreLightningAddressesAPITests()
         {
@@ -3197,14 +3346,14 @@ namespace BTCPayServer.Tests
             var store = await adminClient.GetStore(admin.StoreId);
 
             Assert.Empty(await adminClient.GetStorePaymentMethods(store.Id));
-            var store2 = (await adminClient.CreateStore(new CreateStoreRequest() {Name = "test2"})).Id;
+            var store2 = (await adminClient.CreateStore(new CreateStoreRequest() { Name = "test2" })).Id;
             var address1 = Guid.NewGuid().ToString("n").Substring(0, 8);
             var address2 = Guid.NewGuid().ToString("n").Substring(0, 8);
-            
-            Assert.Empty(await  adminClient.GetStoreLightningAddresses(store.Id));
-            Assert.Empty(await  adminClient.GetStoreLightningAddresses(store2));
+
+            Assert.Empty(await adminClient.GetStoreLightningAddresses(store.Id));
+            Assert.Empty(await adminClient.GetStoreLightningAddresses(store2));
             await adminClient.AddOrUpdateStoreLightningAddress(store.Id, address1, new LightningAddressData());
-           
+
             await adminClient.AddOrUpdateStoreLightningAddress(store.Id, address1, new LightningAddressData()
             {
                 Max = 1
@@ -3213,8 +3362,8 @@ namespace BTCPayServer.Tests
             {
                 await adminClient.AddOrUpdateStoreLightningAddress(store2, address1, new LightningAddressData());
             });
-            Assert.Equal(1,Assert.Single(await adminClient.GetStoreLightningAddresses(store.Id)).Max);
-            Assert.Empty(await  adminClient.GetStoreLightningAddresses(store2));
+            Assert.Equal(1, Assert.Single(await adminClient.GetStoreLightningAddresses(store.Id)).Max);
+            Assert.Empty(await adminClient.GetStoreLightningAddresses(store2));
 
             await adminClient.AddOrUpdateStoreLightningAddress(store2, address2, new LightningAddressData());
 
@@ -3225,8 +3374,8 @@ namespace BTCPayServer.Tests
                 await adminClient.RemoveStoreLightningAddress(store2, address1);
             });
             await adminClient.RemoveStoreLightningAddress(store2, address2);
-            
-            Assert.Empty(await  adminClient.GetStoreLightningAddresses(store2));
+
+            Assert.Empty(await adminClient.GetStoreLightningAddresses(store2));
         }
 
         [Fact(Timeout = 60 * 2 * 1000)]
@@ -3242,11 +3391,16 @@ namespace BTCPayServer.Tests
 
             var client = await user.CreateClient(Policies.CanModifyStoreSettings, Policies.CanModifyServerSettings);
 
+            var roles = await client.GetServerRoles();
+            Assert.Equal(2,roles.Count);
+#pragma warning disable CS0618
+            var ownerRole = roles.Single(data => data.Role == StoreRoles.Owner);
+            var guestRole = roles.Single(data => data.Role == StoreRoles.Guest);
+#pragma warning restore CS0618
             var users = await client.GetStoreUsers(user.StoreId);
             var storeuser = Assert.Single(users);
             Assert.Equal(user.UserId, storeuser.UserId);
-            Assert.Equal(StoreRoles.Owner, storeuser.Role);
-
+            Assert.Equal(ownerRole.Id, storeuser.Role);
             var user2 = tester.NewAccount();
             await user2.GrantAccessAsync(false);
 
@@ -3257,7 +3411,7 @@ namespace BTCPayServer.Tests
             await AssertPermissionError(Policies.CanModifyStoreSettings, async () => await user2Client.AddStoreUser(user.StoreId, new StoreUserData()));
             await AssertPermissionError(Policies.CanModifyStoreSettings, async () => await user2Client.RemoveStoreUser(user.StoreId, user.UserId));
 
-            await client.AddStoreUser(user.StoreId, new StoreUserData() { Role = StoreRoles.Guest, UserId = user2.UserId });
+            await client.AddStoreUser(user.StoreId, new StoreUserData() { Role = guestRole.Id, UserId = user2.UserId });
 
             //test no access to api when only a guest
             await AssertPermissionError(Policies.CanModifyStoreSettings, async () => await user2Client.GetStoreUsers(user.StoreId));
@@ -3271,10 +3425,10 @@ namespace BTCPayServer.Tests
                 await user2Client.GetStore(user.StoreId));
 
 
-            await client.AddStoreUser(user.StoreId, new StoreUserData() { Role = StoreRoles.Owner, UserId = user2.UserId });
+            await client.AddStoreUser(user.StoreId, new StoreUserData() { Role = ownerRole.Id, UserId = user2.UserId });
             await AssertAPIError("duplicate-store-user-role", async () =>
                  await client.AddStoreUser(user.StoreId,
-                     new StoreUserData() { Role = StoreRoles.Owner, UserId = user2.UserId }));
+                     new StoreUserData() { Role = ownerRole.Id, UserId = user2.UserId }));
             await user2Client.RemoveStoreUser(user.StoreId, user.UserId);
 
 
@@ -3392,8 +3546,8 @@ namespace BTCPayServer.Tests
                 });
             Assert.Empty(await adminClient.GetStoreLightningAutomatedPayoutProcessors(admin.StoreId, "BTC_LightningNetwork"));
             await adminClient.UpdateStoreLightningAutomatedPayoutProcessors(admin.StoreId, "BTC_LightningNetwork",
-                new LightningAutomatedPayoutSettings() { IntervalSeconds = TimeSpan.FromSeconds(2) });
-            Assert.Equal(2, Assert.Single(await adminClient.GetStoreLightningAutomatedPayoutProcessors(admin.StoreId, "BTC_LightningNetwork")).IntervalSeconds.TotalSeconds);
+                new LightningAutomatedPayoutSettings() { IntervalSeconds = TimeSpan.FromSeconds(600) });
+            Assert.Equal(600, Assert.Single(await adminClient.GetStoreLightningAutomatedPayoutProcessors(admin.StoreId, "BTC_LightningNetwork")).IntervalSeconds.TotalSeconds);
             await TestUtils.EventuallyAsync(async () =>
             {
                 var payoutC =
@@ -3478,8 +3632,8 @@ namespace BTCPayServer.Tests
             Assert.Empty(await adminClient.GetPayoutProcessors(admin.StoreId));
 
             await adminClient.UpdateStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC",
-                new OnChainAutomatedPayoutSettings() { IntervalSeconds = TimeSpan.FromSeconds(100000) });
-            Assert.Equal(100000, Assert.Single(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC")).IntervalSeconds.TotalSeconds);
+                new OnChainAutomatedPayoutSettings() { IntervalSeconds = TimeSpan.FromSeconds(3600) });
+            Assert.Equal(3600, Assert.Single(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC")).IntervalSeconds.TotalSeconds);
 
             var tpGen = Assert.Single(await adminClient.GetPayoutProcessors(admin.StoreId));
             Assert.Equal("BTC", Assert.Single(tpGen.PaymentMethods));
@@ -3492,8 +3646,10 @@ namespace BTCPayServer.Tests
             Assert.Empty(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC"));
             Assert.Empty(await adminClient.GetPayoutProcessors(admin.StoreId));
 
+            // Send just enough money to cover the smallest of the payouts.
+            var fee = (await tester.PayTester.GetService<IFeeProviderFactory>().CreateFeeProvider(tester.DefaultNetwork).GetFeeRateAsync(100)).GetFee(150);
             await tester.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create((await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
-                tester.ExplorerClient.Network.NBitcoinNetwork), Money.Coins(0.000012m));
+                tester.ExplorerClient.Network.NBitcoinNetwork), Money.Coins(0.00001m) + fee);
             await tester.ExplorerNode.GenerateAsync(1);
             await TestUtils.EventuallyAsync(async () =>
             {
@@ -3503,8 +3659,9 @@ namespace BTCPayServer.Tests
                 Assert.Equal(3, payouts.Length);
             });
             await adminClient.UpdateStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC",
-                new OnChainAutomatedPayoutSettings() { IntervalSeconds = TimeSpan.FromSeconds(5) });
-            Assert.Equal(5, Assert.Single(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC")).IntervalSeconds.TotalSeconds);
+                new OnChainAutomatedPayoutSettings() { IntervalSeconds = TimeSpan.FromSeconds(600), FeeBlockTarget = 1000 });
+            Assert.Equal(600, Assert.Single(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC")).IntervalSeconds.TotalSeconds);
+
             await TestUtils.EventuallyAsync(async () =>
             {
                 Assert.Equal(2, (await adminClient.ShowOnChainWalletTransactions(admin.StoreId, "BTC")).Count());
@@ -3512,8 +3669,10 @@ namespace BTCPayServer.Tests
                 Assert.Single(payouts.Where(data => data.State == PayoutState.InProgress));
             });
 
-            await tester.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create((await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
-                tester.ExplorerClient.Network.NBitcoinNetwork), Money.Coins(0.01m));
+            var txid = await tester.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create((await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
+                tester.ExplorerClient.Network.NBitcoinNetwork), Money.Coins(0.01m) + fee);
+            await tester.WaitForEvent<NewOnChainTransactionEvent>(null, correctEvent: ev => ev.NewTransactionEvent.TransactionData.TransactionHash == txid);
+            await tester.PayTester.GetService<PayoutProcessorService>().Restart(new PayoutProcessorService.PayoutProcessorQuery(admin.StoreId, "BTC"));
             await TestUtils.EventuallyAsync(async () =>
             {
                 Assert.Equal(4, (await adminClient.ShowOnChainWalletTransactions(admin.StoreId, "BTC")).Count());
@@ -3698,7 +3857,7 @@ namespace BTCPayServer.Tests
 
             Assert.Equal(0.9m,
                 Assert.Single(await clientBasic.GetStoreRates(user.StoreId, new[] { "BTC_XYZ" })).Rate);
-            
+
             config = await clientBasic.GetStoreRateConfiguration(user.StoreId);
             Assert.NotNull(config);
             Assert.NotNull(config.EffectiveScript);
@@ -3933,7 +4092,6 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
             var depositClient = await admin.CreateClient(Policies.CanDepositToCustodianAccounts);
             var tradeClient = await admin.CreateClient(Policies.CanTradeCustodianAccount);
 
-
             var store = await adminClient.GetStore(admin.StoreId);
             var storeId = store.Id;
 
@@ -3973,28 +4131,28 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
 
 
             // Test: GetDepositAddress, unauth
-            await AssertHttpError(401, async () => await unauthClient.GetDepositAddress(storeId, accountId, MockCustodian.DepositPaymentMethod));
+            await AssertHttpError(401, async () => await unauthClient.GetCustodianAccountDepositAddress(storeId, accountId, MockCustodian.DepositPaymentMethod));
 
             // Test: GetDepositAddress, auth, but wrong permission
-            await AssertHttpError(403, async () => await managerClient.GetDepositAddress(storeId, accountId, MockCustodian.DepositPaymentMethod));
+            await AssertHttpError(403, async () => await managerClient.GetCustodianAccountDepositAddress(storeId, accountId, MockCustodian.DepositPaymentMethod));
 
             // Test: GetDepositAddress, wrong payment method
-            await AssertHttpError(400, async () => await depositClient.GetDepositAddress(storeId, accountId, "WRONG-PaymentMethod"));
+            await AssertApiError(400, "unsupported-payment-method", async () => await depositClient.GetCustodianAccountDepositAddress(storeId, accountId, "WRONG-PaymentMethod"));
 
             // Test: GetDepositAddress, wrong store ID
-            await AssertHttpError(403, async () => await depositClient.GetDepositAddress("WRONG-STORE", accountId, MockCustodian.DepositPaymentMethod));
+            await AssertHttpError(403, async () => await depositClient.GetCustodianAccountDepositAddress("WRONG-STORE", accountId, MockCustodian.DepositPaymentMethod));
 
             // Test: GetDepositAddress, wrong account ID
-            await AssertHttpError(404, async () => await depositClient.GetDepositAddress(storeId, "WRONG-ACCOUNT-ID", MockCustodian.DepositPaymentMethod));
+            await AssertHttpError(404, async () => await depositClient.GetCustodianAccountDepositAddress(storeId, "WRONG-ACCOUNT-ID", MockCustodian.DepositPaymentMethod));
 
             // Test: GetDepositAddress, correct payment method
-            var depositAddress = await depositClient.GetDepositAddress(storeId, accountId, MockCustodian.DepositPaymentMethod);
+            var depositAddress = await depositClient.GetCustodianAccountDepositAddress(storeId, accountId, MockCustodian.DepositPaymentMethod);
             Assert.NotNull(depositAddress);
             Assert.Equal(MockCustodian.DepositAddress, depositAddress.Address);
 
 
             // Test: Trade, unauth
-            var tradeRequest = new TradeRequestData { FromAsset = MockCustodian.TradeFromAsset, ToAsset = MockCustodian.TradeToAsset, Qty = MockCustodian.TradeQtyBought.ToString(CultureInfo.InvariantCulture) };
+            var tradeRequest = new TradeRequestData { FromAsset = MockCustodian.TradeFromAsset, ToAsset = MockCustodian.TradeToAsset, Qty = new TradeQuantity(MockCustodian.TradeQtyBought, TradeQuantity.ValueType.Exact) };
             await AssertHttpError(401, async () => await unauthClient.MarketTradeCustodianAccountAsset(storeId, accountId, tradeRequest));
 
             // Test: Trade, auth, but wrong permission
@@ -4021,17 +4179,13 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
             Assert.Equal(LedgerEntryData.LedgerEntryType.Fee, newTradeResult.LedgerEntries[2].Type);
 
             // Test: GetTradeQuote, SATS
-            var satsTradeRequest = new TradeRequestData { FromAsset = MockCustodian.TradeFromAsset, ToAsset = "SATS", Qty = MockCustodian.TradeQtyBought.ToString(CultureInfo.InvariantCulture) };
+            var satsTradeRequest = new TradeRequestData { FromAsset = MockCustodian.TradeFromAsset, ToAsset = "SATS", Qty = new TradeQuantity(MockCustodian.TradeQtyBought, TradeQuantity.ValueType.Exact) };
             await AssertApiError(400, "use-asset-synonym", async () => await tradeClient.MarketTradeCustodianAccountAsset(storeId, accountId, satsTradeRequest));
 
             // TODO Test: Trade with percentage qty
 
-            // Test: Trade with wrong decimal format (example: JavaScript scientific format)
-            var wrongQtyTradeRequest = new TradeRequestData { FromAsset = MockCustodian.TradeFromAsset, ToAsset = MockCustodian.TradeToAsset, Qty = "6.1e-7" };
-            await AssertApiError(400, "bad-qty-format", async () => await tradeClient.MarketTradeCustodianAccountAsset(storeId, accountId, wrongQtyTradeRequest));
-
             // Test: Trade, wrong assets method
-            var wrongAssetsTradeRequest = new TradeRequestData { FromAsset = "WRONG", ToAsset = MockCustodian.TradeToAsset, Qty = MockCustodian.TradeQtyBought.ToString(CultureInfo.InvariantCulture) };
+            var wrongAssetsTradeRequest = new TradeRequestData { FromAsset = "WRONG", ToAsset = MockCustodian.TradeToAsset, Qty = new TradeQuantity(MockCustodian.TradeQtyBought, TradeQuantity.ValueType.Exact) };
             await AssertHttpError(WrongTradingPairException.HttpCode, async () => await tradeClient.MarketTradeCustodianAccountAsset(storeId, accountId, wrongAssetsTradeRequest));
 
             // Test: wrong account ID
@@ -4041,18 +4195,18 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
             await AssertHttpError(403, async () => await tradeClient.MarketTradeCustodianAccountAsset("WRONG-STORE-ID", accountId, tradeRequest));
 
             // Test: Trade, correct assets, wrong amount
-            var insufficientFundsTradeRequest = new TradeRequestData { FromAsset = MockCustodian.TradeFromAsset, ToAsset = MockCustodian.TradeToAsset, Qty = "0.01" };
+            var insufficientFundsTradeRequest = new TradeRequestData { FromAsset = MockCustodian.TradeFromAsset, ToAsset = MockCustodian.TradeToAsset, Qty = new TradeQuantity(0.01m, TradeQuantity.ValueType.Exact) };
             await AssertApiError(400, "insufficient-funds", async () => await tradeClient.MarketTradeCustodianAccountAsset(storeId, accountId, insufficientFundsTradeRequest));
 
 
             // Test: GetTradeQuote, unauth
-            await AssertHttpError(401, async () => await unauthClient.GetTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset));
+            await AssertHttpError(401, async () => await unauthClient.GetCustodianAccountTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset));
 
             // Test: GetTradeQuote, auth, but wrong permission
-            await AssertHttpError(403, async () => await managerClient.GetTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset));
+            await AssertHttpError(403, async () => await managerClient.GetCustodianAccountTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset));
 
             // Test: GetTradeQuote, auth, correct permission
-            var tradeQuote = await tradeClient.GetTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset);
+            var tradeQuote = await tradeClient.GetCustodianAccountTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset);
             Assert.NotNull(tradeQuote);
             Assert.Equal(MockCustodian.TradeFromAsset, tradeQuote.FromAsset);
             Assert.Equal(MockCustodian.TradeToAsset, tradeQuote.ToAsset);
@@ -4060,30 +4214,30 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
             Assert.Equal(MockCustodian.BtcPriceInEuro, tradeQuote.Ask);
 
             // Test: GetTradeQuote, SATS
-            await AssertApiError(400, "use-asset-synonym", async () => await tradeClient.GetTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, "SATS"));
+            await AssertApiError(400, "use-asset-synonym", async () => await tradeClient.GetCustodianAccountTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, "SATS"));
 
             // Test: GetTradeQuote, wrong asset
-            await AssertHttpError(404, async () => await tradeClient.GetTradeQuote(storeId, accountId, "WRONG-ASSET", MockCustodian.TradeToAsset));
-            await AssertHttpError(404, async () => await tradeClient.GetTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, "WRONG-ASSET"));
+            await AssertHttpError(404, async () => await tradeClient.GetCustodianAccountTradeQuote(storeId, accountId, "WRONG-ASSET", MockCustodian.TradeToAsset));
+            await AssertHttpError(404, async () => await tradeClient.GetCustodianAccountTradeQuote(storeId, accountId, MockCustodian.TradeFromAsset, "WRONG-ASSET"));
 
             // Test: wrong account ID
-            await AssertHttpError(404, async () => await tradeClient.GetTradeQuote(storeId, "WRONG-ACCOUNT-ID", MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset));
+            await AssertHttpError(404, async () => await tradeClient.GetCustodianAccountTradeQuote(storeId, "WRONG-ACCOUNT-ID", MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset));
 
             // Test: wrong store ID
-            await AssertHttpError(403, async () => await tradeClient.GetTradeQuote("WRONG-STORE-ID", accountId, MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset));
+            await AssertHttpError(403, async () => await tradeClient.GetCustodianAccountTradeQuote("WRONG-STORE-ID", accountId, MockCustodian.TradeFromAsset, MockCustodian.TradeToAsset));
 
 
 
 
 
             // Test: GetTradeInfo, unauth
-            await AssertHttpError(401, async () => await unauthClient.GetTradeInfo(storeId, accountId, MockCustodian.TradeId));
+            await AssertHttpError(401, async () => await unauthClient.GetCustodianAccountTradeInfo(storeId, accountId, MockCustodian.TradeId));
 
             // Test: GetTradeInfo, auth, but wrong permission
-            await AssertHttpError(403, async () => await managerClient.GetTradeInfo(storeId, accountId, MockCustodian.TradeId));
+            await AssertHttpError(403, async () => await managerClient.GetCustodianAccountTradeInfo(storeId, accountId, MockCustodian.TradeId));
 
             // Test: GetTradeInfo, auth, correct permission
-            var tradeResult = await tradeClient.GetTradeInfo(storeId, accountId, MockCustodian.TradeId);
+            var tradeResult = await tradeClient.GetCustodianAccountTradeInfo(storeId, accountId, MockCustodian.TradeId);
             Assert.NotNull(tradeResult);
             Assert.Equal(accountId, tradeResult.AccountId);
             Assert.Equal(mockCustodian.Code, tradeResult.CustodianCode);
@@ -4103,66 +4257,93 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
             Assert.Equal(LedgerEntryData.LedgerEntryType.Fee, tradeResult.LedgerEntries[2].Type);
 
             // Test: GetTradeInfo, wrong trade ID
-            await AssertHttpError(404, async () => await tradeClient.GetTradeInfo(storeId, accountId, "WRONG-TRADE-ID"));
+            await AssertHttpError(404, async () => await tradeClient.GetCustodianAccountTradeInfo(storeId, accountId, "WRONG-TRADE-ID"));
 
             // Test: wrong account ID
-            await AssertHttpError(404, async () => await tradeClient.GetTradeInfo(storeId, "WRONG-ACCOUNT-ID", MockCustodian.TradeId));
+            await AssertHttpError(404, async () => await tradeClient.GetCustodianAccountTradeInfo(storeId, "WRONG-ACCOUNT-ID", MockCustodian.TradeId));
 
             // Test: wrong store ID
-            await AssertHttpError(403, async () => await tradeClient.GetTradeInfo("WRONG-STORE-ID", accountId, MockCustodian.TradeId));
+            await AssertHttpError(403, async () => await tradeClient.GetCustodianAccountTradeInfo("WRONG-STORE-ID", accountId, MockCustodian.TradeId));
 
+            var qty = new TradeQuantity(MockCustodian.WithdrawalAmount, TradeQuantity.ValueType.Exact);
+            // Test: SimulateWithdrawal, unauth
+            var simulateWithdrawalRequest = new WithdrawRequestData(MockCustodian.WithdrawalPaymentMethod, qty);
+            await AssertHttpError(401, async () => await unauthClient.SimulateCustodianAccountWithdrawal(storeId, accountId, simulateWithdrawalRequest));
+
+            // Test: SimulateWithdrawal, auth, but wrong permission
+            await AssertHttpError(403, async () => await managerClient.SimulateCustodianAccountWithdrawal(storeId, accountId, simulateWithdrawalRequest));
+
+            // Test: SimulateWithdrawal, correct payment method, correct amount
+            var simulateWithdrawResponse = await withdrawalClient.SimulateCustodianAccountWithdrawal(storeId, accountId, simulateWithdrawalRequest);
+            AssertMockWithdrawal(simulateWithdrawResponse, custodianAccountData);
+
+            // Test: SimulateWithdrawal, wrong payment method
+            var wrongPaymentMethodSimulateWithdrawalRequest = new WithdrawRequestData("WRONG-PAYMENT-METHOD", qty);
+            await AssertApiError(400, "unsupported-payment-method", async () => await withdrawalClient.SimulateCustodianAccountWithdrawal(storeId, accountId, wrongPaymentMethodSimulateWithdrawalRequest));
+
+            // Test: SimulateWithdrawal, wrong account ID
+            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.
+            await AssertHttpError(403, async () => await withdrawalClient.SimulateCustodianAccountWithdrawal("WRONG-STORE-ID", accountId, simulateWithdrawalRequest));
+
+            // Test: SimulateWithdrawal, correct payment method, wrong amount
+            var wrongAmountSimulateWithdrawalRequest = new WithdrawRequestData(MockCustodian.WithdrawalPaymentMethod, TradeQuantity.Parse("0.666"));
+            await AssertHttpError(400, async () => await withdrawalClient.SimulateCustodianAccountWithdrawal(storeId, accountId, wrongAmountSimulateWithdrawalRequest));
 
             // Test: CreateWithdrawal, unauth
-            var createWithdrawalRequest = new WithdrawRequestData(MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalAmount);
-            await AssertHttpError(401, async () => await unauthClient.CreateWithdrawal(storeId, accountId, createWithdrawalRequest));
+            var createWithdrawalRequest = new WithdrawRequestData(MockCustodian.WithdrawalPaymentMethod, qty);
+            var createWithdrawalRequestPercentage = new WithdrawRequestData(MockCustodian.WithdrawalPaymentMethod, qty);
+            await AssertHttpError(401, async () => await unauthClient.CreateCustodianAccountWithdrawal(storeId, accountId, createWithdrawalRequest));
 
             // Test: CreateWithdrawal, auth, but wrong permission
-            await AssertHttpError(403, async () => await managerClient.CreateWithdrawal(storeId, accountId, createWithdrawalRequest));
+            await AssertHttpError(403, async () => await managerClient.CreateCustodianAccountWithdrawal(storeId, accountId, createWithdrawalRequest));
 
             // Test: CreateWithdrawal, correct payment method, correct amount
-            var withdrawResponse = await withdrawalClient.CreateWithdrawal(storeId, accountId, createWithdrawalRequest);
+            var withdrawResponse = await withdrawalClient.CreateCustodianAccountWithdrawal(storeId, accountId, createWithdrawalRequest);
             AssertMockWithdrawal(withdrawResponse, custodianAccountData);
 
+            // Test: CreateWithdrawal, correct payment method, correct amount, but as a percentage
+            var withdrawWithPercentageResponse = await withdrawalClient.CreateCustodianAccountWithdrawal(storeId, accountId, createWithdrawalRequestPercentage);
+            AssertMockWithdrawal(withdrawWithPercentageResponse, custodianAccountData);
 
             // Test: CreateWithdrawal, wrong payment method
-            var wrongPaymentMethodCreateWithdrawalRequest = new WithdrawRequestData("WRONG-PAYMENT-METHOD", MockCustodian.WithdrawalAmount);
-            await AssertHttpError(403, async () => await withdrawalClient.CreateWithdrawal(storeId, accountId, wrongPaymentMethodCreateWithdrawalRequest));
+            var wrongPaymentMethodCreateWithdrawalRequest = new WithdrawRequestData("WRONG-PAYMENT-METHOD", qty);
+            await AssertApiError(400, "unsupported-payment-method", async () => await withdrawalClient.CreateCustodianAccountWithdrawal(storeId, accountId, wrongPaymentMethodCreateWithdrawalRequest));
 
             // Test: CreateWithdrawal, wrong account ID
-            await AssertHttpError(404, async () => await withdrawalClient.CreateWithdrawal(storeId, "WRONG-ACCOUNT-ID", createWithdrawalRequest));
+            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.
-            await AssertHttpError(403, async () => await withdrawalClient.CreateWithdrawal("WRONG-STORE-ID", accountId, createWithdrawalRequest));
+            await AssertHttpError(403, async () => await withdrawalClient.CreateCustodianAccountWithdrawal("WRONG-STORE-ID", accountId, createWithdrawalRequest));
 
             // Test: CreateWithdrawal, correct payment method, wrong amount
-            var wrongAmountCreateWithdrawalRequest = new WithdrawRequestData(MockCustodian.WithdrawalPaymentMethod, new decimal(0.666));
-            await AssertHttpError(400, async () => await withdrawalClient.CreateWithdrawal(storeId, accountId, wrongAmountCreateWithdrawalRequest));
-
+            var wrongAmountCreateWithdrawalRequest = new WithdrawRequestData(MockCustodian.WithdrawalPaymentMethod, TradeQuantity.Parse("0.666"));
+            await AssertHttpError(400, async () => await withdrawalClient.CreateCustodianAccountWithdrawal(storeId, accountId, wrongAmountCreateWithdrawalRequest));
 
             // Test: GetWithdrawalInfo, unauth
-            await AssertHttpError(401, async () => await unauthClient.GetWithdrawalInfo(storeId, accountId, MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId));
+            await AssertHttpError(401, async () => await unauthClient.GetCustodianAccountWithdrawalInfo(storeId, accountId, MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId));
 
             // Test: GetWithdrawalInfo, auth, but wrong permission
-            await AssertHttpError(403, async () => await managerClient.GetWithdrawalInfo(storeId, accountId, MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId));
+            await AssertHttpError(403, async () => await managerClient.GetCustodianAccountWithdrawalInfo(storeId, accountId, MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId));
 
             // Test: GetWithdrawalInfo, auth, correct permission
-            var withdrawalInfo = await withdrawalClient.GetWithdrawalInfo(storeId, accountId, MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId);
+            var withdrawalInfo = await withdrawalClient.GetCustodianAccountWithdrawalInfo(storeId, accountId, MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId);
             AssertMockWithdrawal(withdrawalInfo, custodianAccountData);
 
             // Test: GetWithdrawalInfo, wrong withdrawal ID
-            await AssertHttpError(404, async () => await withdrawalClient.GetWithdrawalInfo(storeId, accountId, MockCustodian.WithdrawalPaymentMethod, "WRONG-WITHDRAWAL-ID"));
+            await AssertHttpError(404, async () => await withdrawalClient.GetCustodianAccountWithdrawalInfo(storeId, accountId, MockCustodian.WithdrawalPaymentMethod, "WRONG-WITHDRAWAL-ID"));
 
             // Test: wrong account ID
-            await AssertHttpError(404, async () => await withdrawalClient.GetWithdrawalInfo(storeId, "WRONG-ACCOUNT-ID", MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId));
+            await AssertHttpError(404, async () => await withdrawalClient.GetCustodianAccountWithdrawalInfo(storeId, "WRONG-ACCOUNT-ID", MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId));
 
             // Test: wrong store ID
             // TODO shouldn't this be 404? I cannot change this without bigger impact, as it would affect all API endpoints that are store centered
-            await AssertHttpError(403, async () => await withdrawalClient.GetWithdrawalInfo("WRONG-STORE-ID", accountId, MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId));
-
+            await AssertHttpError(403, async () => await withdrawalClient.GetCustodianAccountWithdrawalInfo("WRONG-STORE-ID", accountId, MockCustodian.WithdrawalPaymentMethod, MockCustodian.WithdrawalId));
 
             // TODO assert API error codes, not just status codes by using AssertCustodianApiError()
-
             // TODO also test withdrawals for the various "Status" (Queued, Complete, Failed)
             // TODO create a mock custodian with only ICustodian
             // TODO create a mock custodian with only ICustodian + ICanWithdraw
@@ -4170,12 +4351,11 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
             // TODO create a mock custodian with only ICustodian + ICanDeposit
         }
 
-        private void AssertMockWithdrawal(WithdrawalResponseData withdrawResponse, CustodianAccountData account)
+        private void AssertMockWithdrawal(WithdrawalBaseResponseData withdrawResponse, CustodianAccountData account)
         {
             Assert.NotNull(withdrawResponse);
             Assert.Equal(MockCustodian.WithdrawalAsset, withdrawResponse.Asset);
             Assert.Equal(MockCustodian.WithdrawalPaymentMethod, withdrawResponse.PaymentMethod);
-            Assert.Equal(MockCustodian.WithdrawalStatus, withdrawResponse.Status);
             Assert.Equal(account.Id, withdrawResponse.AccountId);
             Assert.Equal(account.CustodianCode, withdrawResponse.CustodianCode);
 
@@ -4189,10 +4369,20 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
             Assert.Equal(MockCustodian.WithdrawalFee, withdrawResponse.LedgerEntries[1].Qty);
             Assert.Equal(LedgerEntryData.LedgerEntryType.Fee, withdrawResponse.LedgerEntries[1].Type);
 
-            Assert.Equal(MockCustodian.WithdrawalTargetAddress, withdrawResponse.TargetAddress);
-            Assert.Equal(MockCustodian.WithdrawalTransactionId, withdrawResponse.TransactionId);
-            Assert.Equal(MockCustodian.WithdrawalId, withdrawResponse.WithdrawalId);
-            Assert.NotEqual(default, withdrawResponse.CreatedTime);
+            if (withdrawResponse is WithdrawalResponseData withdrawalResponseData)
+            {
+                Assert.Equal(MockCustodian.WithdrawalStatus, withdrawalResponseData.Status);
+                Assert.Equal(MockCustodian.WithdrawalTargetAddress, withdrawalResponseData.TargetAddress);
+                Assert.Equal(MockCustodian.WithdrawalTransactionId, withdrawalResponseData.TransactionId);
+                Assert.Equal(MockCustodian.WithdrawalId, withdrawalResponseData.WithdrawalId);
+                Assert.NotEqual(default, withdrawalResponseData.CreatedTime);
+            }
+
+            if (withdrawResponse is WithdrawalSimulationResponseData withdrawalSimulationResponseData)
+            {
+                Assert.Equal(MockCustodian.WithdrawalMinAmount, withdrawalSimulationResponseData.MinQty);
+                Assert.Equal(MockCustodian.WithdrawalMaxAmount, withdrawalSimulationResponseData.MaxQty);
+            }
         }
     }
 }

BTCPayServer.Tests/MockCustodian/MockCustodian.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Custodians;
@@ -24,6 +25,9 @@ public class MockCustodian : ICustodian, ICanDeposit, ICanTrade, ICanWithdraw
     public const string WithdrawalAsset = "BTC";
     public const string WithdrawalId = "WITHDRAWAL-ID-001";
     public static readonly decimal WithdrawalAmount = new decimal(0.5);
+    public static readonly string WithdrawalAmountPercentage = "12.5%";
+    public static readonly decimal WithdrawalMinAmount = new decimal(0.001);
+    public static readonly decimal WithdrawalMaxAmount = new decimal(0.6);
     public static readonly decimal WithdrawalFee = new decimal(0.0005);
     public const string WithdrawalTransactionId = "yyy";
     public const string WithdrawalTargetAddress = "bc1qyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy";
@@ -52,7 +56,7 @@ public class MockCustodian : ICustodian, ICanDeposit, ICanTrade, ICanWithdraw
         return Task.FromResult(r);
     }
 
-    public Task<Form> GetConfigForm(JObject config, string locale, CancellationToken cancellationToken = default)
+    public Task<Form> GetConfigForm(JObject config, CancellationToken cancellationToken = default)
     {
         return null;
     }
@@ -136,13 +140,37 @@ public class MockCustodian : ICustodian, ICanDeposit, ICanTrade, ICanWithdraw
         return r;
     }
 
-    public Task<WithdrawResult> WithdrawAsync(string paymentMethod, decimal amount, JObject config, CancellationToken cancellationToken)
+    private SimulateWithdrawalResult CreateWithdrawSimulationResult()
+    {
+        var ledgerEntries = new List<LedgerEntryData>();
+        ledgerEntries.Add(new LedgerEntryData(WithdrawalAsset, WithdrawalAmount - WithdrawalFee, LedgerEntryData.LedgerEntryType.Withdrawal));
+        ledgerEntries.Add(new LedgerEntryData(WithdrawalAsset, WithdrawalFee, LedgerEntryData.LedgerEntryType.Fee));
+        var r = new SimulateWithdrawalResult(WithdrawalPaymentMethod, WithdrawalAsset, ledgerEntries, WithdrawalMinAmount, WithdrawalMaxAmount);
+        return r;
+    }
+
+    public Task<WithdrawResult> WithdrawToStoreWalletAsync(string paymentMethod, decimal amount, JObject config, CancellationToken cancellationToken)
+    {
+        if (paymentMethod == WithdrawalPaymentMethod)
+        {
+            if (amount.ToString(CultureInfo.InvariantCulture).Equals("" + WithdrawalAmount, StringComparison.InvariantCulture) || WithdrawalAmountPercentage.Equals(amount))
+            {
+                return Task.FromResult(CreateWithdrawResult());
+            }
+
+            throw new InsufficientFundsException($"{Name} only supports withdrawals of {WithdrawalAmount} or {WithdrawalAmountPercentage}");
+        }
+
+        throw new CannotWithdrawException(this, paymentMethod, $"Only {WithdrawalPaymentMethod} can be withdrawn from {Name}");
+    }
+
+    public Task<SimulateWithdrawalResult> SimulateWithdrawalAsync(string paymentMethod, decimal amount, JObject config, CancellationToken cancellationToken)
     {
         if (paymentMethod == WithdrawalPaymentMethod)
         {
             if (amount == WithdrawalAmount)
             {
-                return Task.FromResult(CreateWithdrawResult());
+                return Task.FromResult(CreateWithdrawSimulationResult());
             }
 
             throw new InsufficientFundsException($"{Name} only supports withdrawals of {WithdrawalAmount}");

BTCPayServer.Tests/POSTests.cs

@@ -1,11 +1,12 @@
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Data;
+using BTCPayServer.Hosting;
 using BTCPayServer.Models.AppViewModels;
+using BTCPayServer.Plugins.PointOfSale;
 using BTCPayServer.Plugins.PointOfSale.Controllers;
 using BTCPayServer.Plugins.PointOfSale.Models;
 using BTCPayServer.Services.Apps;
-using BTCPayServer.Tests.Logging;
 using Microsoft.AspNetCore.Mvc;
 using Xunit;
 using Xunit.Abstractions;
@@ -20,6 +21,74 @@ namespace BTCPayServer.Tests
         {
         }
 
+        [Fact]
+        [Trait("Fast", "Fast")]
+        public void CanParseOldYmlCorrectly()
+        {
+              var testOriginalDefaultYmlTemplate = @"
+green tea:
+  price: 1
+  title: Green Tea
+  description:  Lovely, fresh and tender, Meng Ding Gan Lu ('sweet dew') is grown in the lush Meng Ding Mountains of the southwestern province of Sichuan where it has been cultivated for over a thousand years.
+  image: ~/img/pos-sample/green-tea.jpg
+
+black tea:
+  price: 1
+  title: Black Tea
+  description: Tian Jian Tian Jian means 'heavenly tippy tea' in Chinese, and it describes the finest grade of dark tea. Our Tian Jian dark tea is from Hunan province which is famous for making some of the best dark teas available.
+  image: ~/img/pos-sample/black-tea.jpg
+
+rooibos:
+  price: 1.2
+  title: Rooibos
+  description: Rooibos is a dramatic red tea made from a South African herb that contains polyphenols and flavonoids. Often called 'African redbush tea', Rooibos herbal tea delights the senses and delivers potential health benefits with each caffeine-free sip.
+  image: ~/img/pos-sample/rooibos.jpg
+
+pu erh:
+  price: 2
+  title: Pu Erh
+  description: This loose pur-erh tea is produced in Yunnan Province, China. The process in a relatively high humidity environment has mellowed the elemental character of the tea when compared to young Pu-erh.
+  image: ~/img/pos-sample/pu-erh.jpg
+
+herbal tea:
+  price: 1.8
+  title: Herbal Tea
+  description: Chamomile tea is made from the flower heads of the chamomile plant. The medicinal use of chamomile dates back to the ancient Egyptians, Romans and Greeks. Pay us what you want!
+  image: ~/img/pos-sample/herbal-tea.jpg
+  custom: true
+
+fruit tea:
+  price: 1.5
+  title: Fruit Tea
+  description: The Tibetan Himalayas, the land is majestic and beautiful—a spiritual place where, despite the perilous environment, many journey seeking enlightenment. Pay us what you want!
+  image: ~/img/pos-sample/fruit-tea.jpg
+  inventory: 5
+  custom: true
+";
+        var parsedDefault =     MigrationStartupTask.ParsePOSYML(testOriginalDefaultYmlTemplate);
+        Assert.Equal(6, parsedDefault.Length);
+        Assert.Equal( "Green Tea" ,parsedDefault[0].Title);
+        Assert.Equal( "green tea" ,parsedDefault[0].Id);
+        Assert.Equal( "Lovely, fresh and tender, Meng Ding Gan Lu ('sweet dew') is grown in the lush Meng Ding Mountains of the southwestern province of Sichuan where it has been cultivated for over a thousand years." ,parsedDefault[0].Description);
+        Assert.Null( parsedDefault[0].BuyButtonText);
+        Assert.Equal( "~/img/pos-sample/green-tea.jpg" ,parsedDefault[0].Image);
+        Assert.Equal( 1 ,parsedDefault[0].Price);
+        Assert.Equal( ViewPointOfSaleViewModel.ItemPriceType.Fixed ,parsedDefault[0].PriceType);
+        Assert.Null( parsedDefault[0].AdditionalData);
+        Assert.Null( parsedDefault[0].PaymentMethods);
+        
+        
+        Assert.Equal( "Herbal Tea" ,parsedDefault[4].Title);
+        Assert.Equal( "herbal tea" ,parsedDefault[4].Id);
+        Assert.Equal( "Chamomile tea is made from the flower heads of the chamomile plant. The medicinal use of chamomile dates back to the ancient Egyptians, Romans and Greeks. Pay us what you want!" ,parsedDefault[4].Description);
+        Assert.Null( parsedDefault[4].BuyButtonText);
+        Assert.Equal( "~/img/pos-sample/herbal-tea.jpg" ,parsedDefault[4].Image);
+        Assert.Equal( 1.8m ,parsedDefault[4].Price);
+        Assert.Equal( ViewPointOfSaleViewModel.ItemPriceType.Minimum ,parsedDefault[4].PriceType);
+        Assert.Null( parsedDefault[4].AdditionalData);
+        Assert.Null( parsedDefault[4].PaymentMethods);
+        }
+        
         [Fact(Timeout = LongRunningTestTimeout)]
         [Trait("Integration", "Integration")]
         public async Task CanUsePoSApp1()
@@ -32,10 +101,11 @@ namespace BTCPayServer.Tests
             var apps = user.GetController<UIAppsController>();
             var pos = user.GetController<UIPointOfSaleController>();
             var vm = Assert.IsType<CreateAppViewModel>(Assert.IsType<ViewResult>(apps.CreateApp(user.StoreId)).Model);
-            var appType = AppType.PointOfSale.ToString();
+            var appType = PointOfSaleAppType.AppType;
             vm.AppName = "test";
             vm.SelectedAppType = appType;
-            Assert.IsType<RedirectToActionResult>(apps.CreateApp(user.StoreId, vm).Result);
+            var redirect = Assert.IsType<RedirectResult>(apps.CreateApp(user.StoreId, vm).Result);
+            Assert.EndsWith("/settings/pos", redirect.Url);
             var appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
             var app = appList.Apps[0];
             var appData = new AppData { Id = app.Id, StoreDataId = app.StoreId, Name = app.AppName, AppType = appType };
@@ -53,6 +123,7 @@ donation:
   price: 1.02
   custom: true
 ";
+            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>();
@@ -64,10 +135,10 @@ donation:
             Assert.Equal("donation", vmview.Items[1].Title);
             // orange is available
             Assert.IsType<RedirectToActionResult>(publicApps
-                .ViewPointOfSale(app.Id, PosViewType.Cart, 0, null, null, null, null, "orange").Result);
+                .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "orange").Result);
             // apple is not found
             Assert.IsType<NotFoundResult>(publicApps
-                .ViewPointOfSale(app.Id, PosViewType.Cart, 0, null, null, null, null, "apple").Result);
+                .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "apple").Result);
         }
     }
 }

BTCPayServer.Tests/PayJoinTests.cs

@@ -221,7 +221,7 @@ namespace BTCPayServer.Tests
                     var receiverCoin = await receiverUser.ReceiveUTXO(Money.Satoshis(810), network);
 
                     string errorCode = receiverAddressType == senderAddressType ? null : "unavailable|any UTXO available";
-                    var invoice = receiverUser.BitPay.CreateInvoice(new Invoice() { Price = 50000, Currency = "sats", FullNotifications = true });
+                    var invoice = receiverUser.BitPay.CreateInvoice(new Invoice() { Price = 50000, Currency = "SATS", FullNotifications = true });
                     if (unsupportedFormats.Contains(receiverAddressType))
                     {
                         Assert.Null(TestAccount.GetPayjoinBitcoinUrl(invoice, cashCow.Network));
@@ -249,6 +249,7 @@ namespace BTCPayServer.Tests
             await s.StartAsync();
             s.RegisterNewUser(true);
             var receiver = s.CreateNewStore();
+            s.EnableCheckout(CheckoutType.V1);
             var receiverSeed = s.GenerateWallet("BTC", "", true, true, ScriptPubKeyType.Segwit);
             var receiverWalletId = new WalletId(receiver.storeId, "BTC");
 
@@ -303,6 +304,7 @@ namespace BTCPayServer.Tests
             {
                 var cryptoCode = "BTC";
                 var receiver = s.CreateNewStore();
+                s.EnableCheckout(CheckoutType.V1);
                 var receiverSeed = s.GenerateWallet(cryptoCode, "", true, true, format);
                 var receiverWalletId = new WalletId(receiver.storeId, cryptoCode);
 

BTCPayServer.Tests/SeleniumTester.cs

@@ -1,10 +1,12 @@
 using System;
+using System.ComponentModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Abstractions.Models;
+using BTCPayServer.Client.Models;
 using BTCPayServer.Lightning;
 using BTCPayServer.Lightning.CLightning;
 using BTCPayServer.Views.Manage;
@@ -63,7 +65,6 @@ namespace BTCPayServer.Tests
                 var containerIp = File.ReadAllText("/etc/hosts").Split('\n', StringSplitOptions.RemoveEmptyEntries).Last()
                     .Split('\t', StringSplitOptions.RemoveEmptyEntries)[0].Trim();
                 TestLogs.LogInformation($"Selenium: Container's IP {containerIp}");
-                ServerUri = new Uri(Server.PayTester.ServerUri.AbsoluteUri.Replace($"http://{Server.PayTester.HostName}", $"http://{containerIp}", StringComparison.OrdinalIgnoreCase), UriKind.Absolute);
             }
             else
             {
@@ -75,8 +76,8 @@ namespace BTCPayServer.Tests
                 Driver = new ChromeDriver(cds, options,
                     // A bit less than test timeout
                     TimeSpan.FromSeconds(50));
-                ServerUri = Server.PayTester.ServerUri;
             }
+            ServerUri = Server.PayTester.ServerUri;
             Driver.Manage().Window.Maximize();
 
             TestLogs.LogInformation($"Selenium: Using {Driver.GetType()}");
@@ -86,7 +87,7 @@ namespace BTCPayServer.Tests
             Driver.AssertNoError();
         }
 
-        public void PayInvoice(bool mine = false, decimal? amount= null)
+        public void PayInvoice(bool mine = false, decimal? amount = null)
         {
 
             if (amount is not null)
@@ -94,6 +95,7 @@ namespace BTCPayServer.Tests
                 Driver.FindElement(By.Id("test-payment-amount")).Clear();
                 Driver.FindElement(By.Id("test-payment-amount")).SendKeys(amount.ToString());
             }
+            Driver.WaitUntilAvailable(By.Id("FakePayment"));
             Driver.FindElement(By.Id("FakePayment")).Click();
             if (mine)
             {
@@ -178,7 +180,7 @@ namespace BTCPayServer.Tests
             {
                 Driver.FindElement(By.Id("StoreSelectorToggle")).Click();
             }
-            Driver.WaitForElement(By.Id("StoreSelectorCreate")).Click();
+            GoToUrl("/stores/create");
             var name = "Store" + RandomUtils.GetUInt64();
             TestLogs.LogInformation($"Created store {name}");
             Driver.WaitForElement(By.Id("Name")).SendKeys(name);
@@ -193,16 +195,22 @@ namespace BTCPayServer.Tests
                 StoreId = storeId;
             return (name, storeId);
         }
-
-        public void EnableCheckoutV2(bool bip21 = false)
+        public void EnableCheckout(CheckoutType checkoutType, bool bip21 = false)
         {
             GoToStore(StoreNavPages.CheckoutAppearance);
-            Driver.SetCheckbox(By.Id("UseNewCheckout"), true);
-            Driver.WaitForElement(By.Id("OnChainWithLnInvoiceFallback"));
-            Driver.SetCheckbox(By.Id("OnChainWithLnInvoiceFallback"), bip21);
+            if (checkoutType == CheckoutType.V2)
+            {
+                Driver.SetCheckbox(By.Id("UseClassicCheckout"), false);
+                Driver.WaitForElement(By.Id("OnChainWithLnInvoiceFallback"));
+                Driver.SetCheckbox(By.Id("OnChainWithLnInvoiceFallback"), bip21);
+            }
+            else
+            {
+                Driver.SetCheckbox(By.Id("UseClassicCheckout"), true);
+            }
             Driver.FindElement(By.Id("Save")).SendKeys(Keys.Enter);
             Assert.Contains("Store successfully updated", FindAlertMessage().Text);
-            Assert.True(Driver.FindElement(By.Id("UseNewCheckout")).Selected);
+            Assert.True(Driver.FindElement(By.Id("UseClassicCheckout")).Selected);
         }
 
         public Mnemonic GenerateWallet(string cryptoCode = "BTC", string seed = "", bool? importkeys = null, bool isHotWallet = false, ScriptPubKeyType format = ScriptPubKeyType.Segwit)
@@ -305,8 +313,6 @@ namespace BTCPayServer.Tests
 
             var connectionString = connectionType switch
             {
-                LightningConnectionType.Charge =>
-                    $"type=charge;server={Server.MerchantCharge.Client.Uri.AbsoluteUri};allowinsecure=true",
                 LightningConnectionType.CLightning =>
                     $"type=clightning;server={((CLightningClient)Server.MerchantLightningD).Address.AbsoluteUri}",
                 LightningConnectionType.LndREST =>

BTCPayServer.Tests/ServerTester.cs

@@ -92,7 +92,7 @@ namespace BTCPayServer.Tests
 #endif
         public void ActivateLightning()
         {
-            ActivateLightning(LightningConnectionType.Charge);
+            ActivateLightning(LightningConnectionType.CLightning);
         }
         public void ActivateLightning(LightningConnectionType internalNode)
         {
@@ -109,14 +109,7 @@ namespace BTCPayServer.Tests
             string connectionString = null;
             if (connectionType is null)
                 return LightningSupportedPaymentMethod.InternalNode;
-            if (connectionType == LightningConnectionType.Charge)
-            {
-                if (isMerchant)
-                    connectionString = $"type=charge;server={MerchantCharge.Client.Uri.AbsoluteUri};allowinsecure=true";
-                else
-                    throw new NotSupportedException();
-            }
-            else if (connectionType == LightningConnectionType.CLightning)
+            if (connectionType == LightningConnectionType.CLightning)
             {
                 if (isMerchant)
                     connectionString = "type=clightning;server=" +
@@ -177,7 +170,7 @@ namespace BTCPayServer.Tests
 
         public async Task<PayResponse> SendLightningPaymentAsync(Invoice invoice)
         {
-            var bolt11 = invoice.CryptoInfo.Where(o => o.PaymentUrls.BOLT11 != null).First().PaymentUrls.BOLT11;
+            var bolt11 = invoice.CryptoInfo.Where(o => o.PaymentUrls?.BOLT11 != null).First().PaymentUrls.BOLT11;
             bolt11 = bolt11.Replace("lightning:", "", StringComparison.OrdinalIgnoreCase);
             return await CustomerLightningD.Pay(bolt11);
         }
@@ -194,7 +187,8 @@ namespace BTCPayServer.Tests
                     tcs.TrySetResult(evt);
                 }
             });
-            await action.Invoke();
+            if (action != null)
+                await action.Invoke();
             var result = await tcs.Task;
             sub.Dispose();
             return result;
@@ -246,15 +240,20 @@ namespace BTCPayServer.Tests
         }
 
         public List<string> Stores { get; internal set; } = new List<string>();
+        public bool DeleteStore { get; set; } = true;
+        public BTCPayNetworkBase DefaultNetwork => NetworkProvider.DefaultNetwork;
 
         public void Dispose()
         {
             foreach (var r in this.Resources)
                 r.Dispose();
             TestLogs.LogInformation("Disposing the BTCPayTester...");
-            foreach (var store in Stores)
+            if (DeleteStore)
             {
-                Xunit.Assert.True(PayTester.StoreRepository.DeleteStore(store).GetAwaiter().GetResult());
+                foreach (var store in Stores)
+                {
+                    Xunit.Assert.True(PayTester.StoreRepository.DeleteStore(store).GetAwaiter().GetResult());
+                }
             }
             if (PayTester != null)
                 PayTester.Dispose();

BTCPayServer.Tests/TestAccount.cs

@@ -214,14 +214,21 @@ namespace BTCPayServer.Tests
             get => GenerateWalletResponseV.DerivationScheme;
         }
 
+        public void SetLNUrl(string cryptoCode, bool activated)
+        {
+            var lnSettingsVm = GetController<UIStoresController>().LightningSettings(StoreId, cryptoCode).AssertViewModel<LightningSettingsViewModel>();
+            lnSettingsVm.LNURLEnabled = activated;
+            Assert.IsType<RedirectToActionResult>(GetController<UIStoresController>().LightningSettings(lnSettingsVm).Result);
+        }
+
         private async Task RegisterAsync(bool isAdmin = false)
         {
             var account = parent.PayTester.GetController<UIAccountController>();
             RegisterDetails = new RegisterViewModel()
             {
                 Email = Utils.GenerateEmail(),
-                ConfirmPassword = "Kitten0@",
-                Password = "Kitten0@",
+                ConfirmPassword = Password,
+                Password = Password,
                 IsAdmin = isAdmin
             };
             await account.Register(RegisterDetails);
@@ -240,6 +247,7 @@ namespace BTCPayServer.Tests
             Email = RegisterDetails.Email;
             IsAdmin = account.RegisteredAdmin;
         }
+        public string Password { get; set; } = "Kitten0@";
 
         public RegisterViewModel RegisterDetails { get; set; }
 
@@ -269,7 +277,7 @@ namespace BTCPayServer.Tests
 
         public bool IsAdmin { get; internal set; }
 
-        public void RegisterLightningNode(string cryptoCode, LightningConnectionType connectionType, bool isMerchant = true)
+        public void RegisterLightningNode(string cryptoCode, LightningConnectionType? connectionType = null, bool isMerchant = true)
         {
             RegisterLightningNodeAsync(cryptoCode, connectionType, isMerchant).GetAwaiter().GetResult();
         }
@@ -462,7 +470,10 @@ namespace BTCPayServer.Tests
                     var req = await _server.GetNextRequest(cancellation);
                     var bytes = await req.Request.Body.ReadBytesAsync((int)req.Request.Headers.ContentLength);
                     var callback = Encoding.UTF8.GetString(bytes);
-                    _webhookEvents.Add(JsonConvert.DeserializeObject<WebhookInvoiceEvent>(callback));
+                    lock (_webhookEvents)
+                    {
+                        _webhookEvents.Add(JsonConvert.DeserializeObject<WebhookInvoiceEvent>(callback));
+                    }
                     req.Response.StatusCode = 200;
                     _server.Done();
                 }
@@ -479,18 +490,21 @@ namespace BTCPayServer.Tests
         {
             int retry = 0;
 retry:
-            foreach (var evt in WebhookEvents)
+            lock (WebhookEvents)
             {
-                if (evt.Type == eventType)
+                foreach (var evt in WebhookEvents)
                 {
-                    var typedEvt = evt.ReadAs<TEvent>();
-                    try
-                    {
-                        assert(typedEvt);
-                        return typedEvt;
-                    }
-                    catch (XunitException)
+                    if (evt.Type == eventType)
                     {
+                        var typedEvt = evt.ReadAs<TEvent>();
+                        try
+                        {
+                            assert(typedEvt);
+                            return typedEvt;
+                        }
+                        catch (XunitException)
+                        {
+                        }
                     }
                 }
             }
@@ -532,12 +546,12 @@ retry:
         public async Task AddGuest(string userId)
         {
             var repo = this.parent.PayTester.GetService<StoreRepository>();
-            await repo.AddStoreUser(StoreId, userId, "Guest");
+            await repo.AddStoreUser(StoreId, userId, StoreRoleId.Guest);
         }
         public async Task AddOwner(string userId)
         {
             var repo = this.parent.PayTester.GetService<StoreRepository>();
-            await repo.AddStoreUser(StoreId, userId, "Owner");
+            await repo.AddStoreUser(StoreId, userId, StoreRoleId.Owner);
         }
     }
 }

BTCPayServer.Tests/TestUtils.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer.Tests
 #if DEBUG && !SHORT_TIMEOUT
         public const int TestTimeout = 600_000;
 #else
-        public const int TestTimeout = 60_000;
+        public const int TestTimeout = 90_000;
 #endif
         public static DirectoryInfo TryGetSolutionDirectoryInfo(string currentPath = null)
         {
@@ -112,7 +112,14 @@ namespace BTCPayServer.Tests
                 }
                 catch (XunitException) when (!cts.Token.IsCancellationRequested)
                 {
-                    await Task.Delay(500, cts.Token);
+                    bool timeout =false;
+                    try
+                    {
+                        await Task.Delay(500, cts.Token);
+                    }
+                    catch { timeout = true; }
+                    if (timeout)
+                        throw;
                 }
             }
         }

BTCPayServer.Tests/ThirdPartyTests.cs

@@ -306,6 +306,8 @@ retry:
             foreach ((CurrencyPair key, Task<RateResult> value) in result)
             {
                 var rateResult = value.GetAwaiter().GetResult();
+                if (key.ToString() == "BTG_USD")
+                    continue; // shitcoin not supported by bitfinex anymore
                 TestLogs.LogInformation($"Testing {key}");
                 if (brokenShitcoins.Contains(key.ToString()))
                     continue;
@@ -353,6 +355,21 @@ retry:
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "tom-select", "tom-select.complete.min.js").Trim();
             expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/tom-select@2.2.2/dist/js/tom-select.complete.min.js")).Content.ReadAsStringAsync()).Trim();
             Assert.Equal(expected, actual);
+
+            actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "dom-confetti", "dom-confetti.min.js").Trim();
+            version = Regex.Match(actual, "Original file: /npm/dom-confetti@([0-9]+.[0-9]+.[0-9]+)/lib/main.js").Groups[1].Value;
+            expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/dom-confetti@{version}/lib/main.min.js")).Content.ReadAsStringAsync()).Trim();
+            Assert.Equal(expected, actual);
+
+            actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vue-sortable", "sortable.min.js").Trim();
+            version = Regex.Match(actual, "Sortable ([0-9]+.[0-9]+.[0-9]+) ").Groups[1].Value;
+            expected = (await (await client.GetAsync($"https://unpkg.com/sortablejs@{version}/Sortable.min.js")).Content.ReadAsStringAsync()).Trim();
+            Assert.Equal(expected, actual);
+
+            actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "bootstrap-vue", "bootstrap-vue.min.js").Trim();
+            version = Regex.Match(actual, "BootstrapVue ([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
+            expected = (await (await client.GetAsync($"https://cdnjs.cloudflare.com/ajax/libs/bootstrap-vue/{version}/bootstrap-vue.min.js")).Content.ReadAsStringAsync()).Trim();
+            Assert.Equal(expected, actual);
         }
 
         string GetFileContent(params string[] path)

BTCPayServer.Tests/UnitTest1.cs

@@ -35,8 +35,11 @@ using BTCPayServer.Payments;
 using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Payments.PayJoin.Sender;
+using BTCPayServer.Plugins.PayButton;
+using BTCPayServer.Plugins.PointOfSale;
 using BTCPayServer.Plugins.PointOfSale.Controllers;
 using BTCPayServer.Security.Bitpay;
+using BTCPayServer.Security.Greenfield;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
@@ -464,14 +467,6 @@ namespace BTCPayServer.Tests
             await ProcessLightningPayment(LightningConnectionType.CLightning);
         }
 
-        [Fact(Timeout = 60 * 2 * 1000)]
-        [Trait("Integration", "Integration")]
-        [Trait("Lightning", "Lightning")]
-        public async Task CanSendLightningPaymentCharge()
-        {
-            await ProcessLightningPayment(LightningConnectionType.Charge);
-        }
-
         [Fact(Timeout = 60 * 2 * 1000)]
         [Trait("Integration", "Integration")]
         [Trait("Lightning", "Lightning")]
@@ -724,7 +719,7 @@ namespace BTCPayServer.Tests
                 btcDerivationScheme.GetDerivation(new KeyPath("0/90")).ScriptPubKey, Money.Coins(1.0m));
             tester.ExplorerNode.Generate(1);
             var transactions = Assert.IsType<ListTransactionsViewModel>(Assert
-                .IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                .IsType<ViewResult>(walletController.WalletTransactions(walletId, loadTransactions: true).Result).Model);
             Assert.Empty(transactions.Transactions);
 
             Assert.IsType<RedirectToActionResult>(walletController.WalletRescan(walletId, rescan).Result);
@@ -753,7 +748,7 @@ namespace BTCPayServer.Tests
             Assert.NotNull(rescan.TimeOfScan);
             Assert.Equal(1, rescan.LastSuccess.Found);
             transactions = Assert.IsType<ListTransactionsViewModel>(Assert
-                .IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                .IsType<ViewResult>(walletController.WalletTransactions(walletId, loadTransactions: true).Result).Model);
             var tx = Assert.Single(transactions.Transactions);
             Assert.Equal(tx.Id, txId.ToString());
 
@@ -768,7 +763,7 @@ namespace BTCPayServer.Tests
                 await walletController.ModifyTransaction(walletId, tx.Id, addcomment: "hello"));
 
             transactions = Assert.IsType<ListTransactionsViewModel>(Assert
-                .IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                .IsType<ViewResult>(walletController.WalletTransactions(walletId, loadTransactions: true).Result).Model);
             tx = Assert.Single(transactions.Transactions);
 
             Assert.Equal("hello", tx.Comment);
@@ -780,7 +775,7 @@ namespace BTCPayServer.Tests
                 await walletController.ModifyTransaction(walletId, tx.Id, removelabel: "test2"));
 
             transactions = Assert.IsType<ListTransactionsViewModel>(Assert
-                .IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                .IsType<ViewResult>(walletController.WalletTransactions(walletId, loadTransactions: true).Result).Model);
             tx = Assert.Single(transactions.Transactions);
 
             Assert.Equal("hello", tx.Comment);
@@ -1607,7 +1602,7 @@ namespace BTCPayServer.Tests
             // Check correct casing: Addresses in payment URI need to be …
             // - lowercase in link version
             // - uppercase in QR version
-            
+
             // Standard for all uppercase characters in QR codes is still not implemented in all wallets
             // But we're proceeding with BECH32 being uppercase
             Assert.Equal($"bitcoin:{paymentMethodUnified.BtcAddress}", paymentMethodUnified.InvoiceBitcoinUrl.Split('?')[0]);
@@ -1632,7 +1627,8 @@ namespace BTCPayServer.Tests
             var user = tester.NewAccount();
             var cryptoCode = "BTC";
             user.GrantAccess(true);
-            user.RegisterLightningNode(cryptoCode, LightningConnectionType.Charge);
+            user.RegisterLightningNode(cryptoCode);
+            user.SetLNUrl(cryptoCode, false);
             var vm = user.GetController<UIStoresController>().CheckoutAppearance().AssertViewModel<CheckoutAppearanceViewModel>();
             var criteria = Assert.Single(vm.PaymentMethodCriteria);
             Assert.Equal(new PaymentMethodId(cryptoCode, LightningPaymentType.Instance).ToString(), criteria.PaymentMethod);
@@ -1647,16 +1643,12 @@ namespace BTCPayServer.Tests
                     Price = 1.5m,
                     Currency = "USD"
                 }, Facade.Merchant);
-
             Assert.Single(invoice.CryptoInfo);
             Assert.Equal(PaymentTypes.LightningLike.ToString(), invoice.CryptoInfo[0].PaymentType);
 
             // Activating LNUrl, we should still have only 1 payment criteria that can be set.
-            user.RegisterLightningNode(cryptoCode, LightningConnectionType.Charge);
-            var lnSettingsVm = user.GetController<UIStoresController>().LightningSettings(user.StoreId, cryptoCode).AssertViewModel<LightningSettingsViewModel>();
-            lnSettingsVm.LNURLEnabled = true;
-            lnSettingsVm.LNURLStandardInvoiceEnabled = true;
-            Assert.IsType<RedirectToActionResult>(user.GetController<UIStoresController>().LightningSettings(lnSettingsVm).Result);
+            user.RegisterLightningNode(cryptoCode);
+            user.SetLNUrl(cryptoCode, true);
             vm = user.GetController<UIStoresController>().CheckoutAppearance().AssertViewModel<CheckoutAppearanceViewModel>();
             criteria = Assert.Single(vm.PaymentMethodCriteria);
             Assert.Equal(new PaymentMethodId(cryptoCode, LightningPaymentType.Instance).ToString(), criteria.PaymentMethod);
@@ -1953,14 +1945,13 @@ namespace BTCPayServer.Tests
             var apps = user.GetController<UIAppsController>();
             var apps2 = user2.GetController<UIAppsController>();
             var pos = user.GetController<UIPointOfSaleController>();
-            var vm = Assert.IsType<CreateAppViewModel>(Assert.IsType<ViewResult>(apps.CreateApp(user.StoreId)).Model);
-            var appType = AppType.PointOfSale.ToString();
-            Assert.NotNull(vm.SelectedAppType);
+            var appType = PointOfSaleAppType.AppType;
+            var vm = Assert.IsType<CreateAppViewModel>(Assert.IsType<ViewResult>(apps.CreateApp(user.StoreId, appType)).Model);
+            Assert.Equal(appType, vm.SelectedAppType);
             Assert.Null(vm.AppName);
             vm.AppName = "test";
-            vm.SelectedAppType = appType;
-            var redirectToAction = Assert.IsType<RedirectToActionResult>(apps.CreateApp(user.StoreId, vm).Result);
-            Assert.Equal(nameof(pos.UpdatePointOfSale), redirectToAction.ActionName);
+            var redirect = Assert.IsType<RedirectResult>(apps.CreateApp(user.StoreId, vm).Result);
+            Assert.EndsWith("/settings/pos", redirect.Url);
             var appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
             var appList2 =
                 Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps2.ListApps(user2.StoreId).Result).Model);
@@ -1972,11 +1963,12 @@ namespace BTCPayServer.Tests
             Assert.Empty(appList2.Apps);
             Assert.Equal("test", appList.Apps[0].AppName);
             Assert.Equal(apps.CreatedAppId, appList.Apps[0].Id);
-            Assert.True(app.IsOwner);
+            
+            Assert.True(app.Role.ToPermissionSet(app.StoreId).Contains(Policies.CanModifyStoreSettings, app.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));
-            redirectToAction = Assert.IsType<RedirectToActionResult>(apps.DeleteAppPost(appList.Apps[0].Id).Result);
+            var redirectToAction = Assert.IsType<RedirectToActionResult>(apps.DeleteAppPost(appList.Apps[0].Id).Result);
             Assert.Equal(nameof(stores.Dashboard), redirectToAction.ActionName);
             appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
             Assert.Empty(appList.Apps);
@@ -1993,6 +1985,7 @@ namespace BTCPayServer.Tests
             var user = tester.NewAccount();
             user.GrantAccess(true);
             user.RegisterDerivationScheme("BTC");
+            var btcpayClient = await user.CreateClient();
 
             DateTimeOffset expiration = DateTimeOffset.UtcNow + TimeSpan.FromMinutes(21);
 
@@ -2073,6 +2066,20 @@ namespace BTCPayServer.Tests
 
             var zeroInvoicePM = await greenfield.GetInvoicePaymentMethods(user.StoreId, zeroInvoice.Id);
             Assert.Empty(zeroInvoicePM);
+
+            var invoice6 = await btcpayClient.CreateInvoice(user.StoreId,
+                new CreateInvoiceRequest()
+                {
+                    Amount = GreenfieldConstants.MaxAmount,
+                    Currency = "USD"
+                });
+            var repo = tester.PayTester.GetService<InvoiceRepository>();
+            var entity = (await repo.GetInvoice(invoice6.Id));
+            Assert.Equal((decimal)ulong.MaxValue, entity.Price);
+            entity.GetPaymentMethods().First().Calculate();
+            // Shouldn't be possible as we clamp the value, but existing invoice may have that
+            entity.Price = decimal.MaxValue;
+            entity.GetPaymentMethods().First().Calculate();
         }
 
         [Fact(Timeout = LongRunningTestTimeout)]
@@ -2156,7 +2163,7 @@ namespace BTCPayServer.Tests
                 txFee = localInvoice.BtcDue - invoice.BtcDue;
                 Assert.Equal("paidPartial", localInvoice.ExceptionStatus.ToString());
                 Assert.Equal(1, localInvoice.CryptoInfo[0].TxCount);
-                Assert.NotEqual(localInvoice.BitcoinAddress, invoice.BitcoinAddress); //New address
+                Assert.Equal(localInvoice.BitcoinAddress, invoice.BitcoinAddress); //Same address
                 Assert.True(IsMapped(invoice, ctx));
                 Assert.True(IsMapped(localInvoice, ctx));
 
@@ -2444,6 +2451,31 @@ namespace BTCPayServer.Tests
             Assert.False(fn.Seen);
         }
 
+        [Fact(Timeout = LongRunningTestTimeout)]
+        [Trait("Integration", "Integration")]
+        public async Task CanFixMappedDomainAppType()
+        {
+            using var tester = CreateServerTester(newDb: true);
+            await tester.StartAsync();
+            var f = tester.PayTester.GetService<ApplicationDbContextFactory>();
+            using (var ctx = f.CreateContext())
+            {
+                var setting = new SettingData() { Id = "BTCPayServer.Services.PoliciesSettings" };
+                setting.Value = JObject.Parse("{\"RootAppId\": null, \"RootAppType\": 1, \"Experimental\": false, \"PluginSource\": null, \"LockSubscription\": false, \"DisableSSHService\": false, \"PluginPreReleases\": false, \"BlockExplorerLinks\": [],\"DomainToAppMapping\": [{\"AppId\": \"87kj5yKay8mB4UUZcJhZH5TqDKMD3CznjwLjiu1oYZXe\", \"Domain\": \"donate.nicolas-dorier.com\", \"AppType\": 0}], \"CheckForNewVersions\": false, \"AllowHotWalletForAll\": false, \"RequiresConfirmedEmail\": false, \"DiscourageSearchEngines\": false, \"DisableInstantNotifications\": false, \"DisableNonAdminCreateUserApi\": false, \"AllowHotWalletRPCImportForAll\": false, \"AllowLightningInternalNodeForAll\": false, \"DisableStoresToUseServerEmailSettings\": false}").ToString();
+                ctx.Settings.Add(setting);
+                await ctx.SaveChangesAsync();
+            }
+            await RestartMigration(tester);
+            using (var ctx = f.CreateContext())
+            {
+                var setting = await ctx.Settings.FirstOrDefaultAsync(c => c.Id == "BTCPayServer.Services.PoliciesSettings");
+                var o = JObject.Parse(setting.Value);
+                Assert.Equal("Crowdfund", o["RootAppType"].Value<string>());
+                o = (JObject)((JArray)o["DomainToAppMapping"])[0];
+                Assert.Equal("PointOfSale", o["AppType"].Value<string>());
+            }
+        }
+
         [Fact(Timeout = LongRunningTestTimeout)]
         [Trait("Integration", "Integration")]
         public async Task CanDoLightningInternalNodeMigration()

BTCPayServer.Tests/UtilitiesTests.cs

@@ -1,13 +1,28 @@
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
+using Amazon.Auth.AccessControlPolicy;
+using Amazon.Runtime.Internal;
 using BTCPayServer.Client;
+using BTCPayServer.Client.Models;
 using BTCPayServer.Controllers;
+using ExchangeSharp;
+using NBitcoin;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Chrome;
+using OpenQA.Selenium.DevTools.V100.Network;
+using OpenQA.Selenium.Support.UI;
 using Xunit;
+using Xunit.Abstractions;
+using static BTCPayServer.Tests.TransifexClient;
 
 namespace BTCPayServer.Tests
 {
@@ -16,6 +31,12 @@ namespace BTCPayServer.Tests
     /// </summary>
     public class UtilitiesTests
     {
+        public ITestOutputHelper Logs { get; }
+
+        public UtilitiesTests(ITestOutputHelper logs)
+        {
+            Logs = logs;
+        }
         internal static string GetSecuritySchemeDescription()
         {
             var description =
@@ -39,6 +60,190 @@ namespace BTCPayServer.Tests
                     string.Join("\n", storePolicies.Select(pair => $"* `{pair.Key}`: {pair.Value.Title}")));
             return description;
         }
+
+        //        /// <summary>
+        //        /// This will take the translations from v1 or v2
+        //        /// and upload them to transifex if not found
+        //        /// </summary>
+        //        [FactWithSecret("TransifexAPIToken")]
+        //        [Trait("Utilities", "Utilities")]
+        //#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+        //        public async Task UpdateTransifex()
+        //        {
+        //            // DO NOT RUN IT, THIS WILL ERASE THE CURRENT TRANSIFEX TRANSLATIONS
+
+        //            var client = GetTransifexClient();
+        //            var translations = JsonTranslation.GetTranslations(TranslationFolder.CheckoutV2);
+        //            var enTranslations = translations["en"];
+        //            translations.Remove("en");
+
+        //            foreach (var t in translations)
+        //            {
+        //                foreach (var w in t.Value.Words.ToArray())
+        //                {
+        //                    if (t.Value.Words[w.Key] == null)
+        //                        t.Value.Words[w.Key] = enTranslations.Words[w.Key];
+        //                }
+        //                t.Value.Words.Remove("code");
+        //                t.Value.Words.Remove("NOTICE_WARN");
+        //            }
+        //            await client.UpdateTranslations(translations);
+        //        }
+
+        //#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+
+        ///// <summary>
+        ///// This utility will copy translations made on checkout v1 to checkout v2
+        ///// </summary>
+        //[Fact]
+        //[Trait("Utilities", "Utilities")]
+        //public void SetTranslationV1ToV2()
+        //{
+        //    var mappings = new Dictionary<string, string>();
+        //    foreach (var kv in JsonTranslation.GetTranslations(TranslationFolder.CheckoutV1))
+        //    {
+        //        var v1File = kv.Value;
+        //        var v2File = JsonTranslation.GetTranslation(TranslationFolder.CheckoutV2, v1File.Lang);
+        //        if (mappings.Count == 0)
+        //        {
+        //            foreach (var prop1 in v1File.Words)
+        //                foreach (var prop2 in v2File.Words)
+        //                {
+        //                    if (Normalize(prop1.Key) == Normalize(prop2.Key))
+        //                        mappings.Add(prop1.Key, prop2.Key);
+        //                }
+        //            mappings.Add("Copied", "copy_confirm");
+        //            mappings.Add("ConversionTab_BodyDesc", "conversion_body");
+        //            mappings.Add("Return to StoreName", "return_to_store");
+        //        }
+        //        foreach (var m in mappings)
+        //        {
+        //            var orig = v1File.Words[m.Key];
+        //            v2File.Words[m.Value] = orig;
+        //        }
+        //        v2File.Words["currentLanguage"] = v1File.Words["currentLanguage"];
+        //        v2File.Save();
+        //    }
+        //}
+
+        //private string Normalize(string name)
+        //{
+        //    return name.Replace("_", "").ToLowerInvariant();
+        //}
+
+        /// <summary>
+        /// This utility will use selenium to pilot your browser to
+        /// automatically translate a language.
+        /// 
+        /// Step 1: Close all Chrome instances
+        /// Step2: Edit "v1" variable if want to translate checkout v1 or v2
+        ///   - Windows: "chrome.exe --remote-debugging-port=9222 https://chat.openai.com/"
+        ///   - Linux: "google-chrome --remote-debugging-port=9222 https://chat.openai.com/"
+        /// Step 3: Run this.
+        /// </summary>
+        /// <returns></returns>
+        [Trait("Utilities", "Utilities")]
+        [FactWithSecret("TransifexAPIToken")]
+        public async Task AutoTranslateChatGPT()
+        {
+            var file = TranslationFolder.CheckoutV2;
+
+            using var driver = new ChromeDriver(new ChromeOptions()
+            {
+                DebuggerAddress = "127.0.0.1:9222"
+            });
+
+            var englishTranslations = JsonTranslation.GetTranslation(file, "en");
+
+            TransifexClient client = GetTransifexClient();
+            var langs = await client.GetLangs(englishTranslations.TransifexProject, englishTranslations.TransifexResource);
+            foreach (var lang in langs)
+            {
+                if (lang == "en")
+                    continue;
+                var jsonLangCode = GetLangCodeTransifexToJson(lang);
+                var v1LangFile = JsonTranslation.GetTranslation(TranslationFolder.CheckoutV1, jsonLangCode);
+
+                if (!v1LangFile.Exists())
+                    continue;
+                var languageCurrent = v1LangFile.Words["currentLanguage"];
+                if (v1LangFile.ShouldSkip())
+                {
+                    Logs.WriteLine("Skipped " + jsonLangCode);
+                    continue;
+                }
+
+                var langFile = JsonTranslation.GetTranslation(file, jsonLangCode);
+                bool askedPrompt = false;
+                foreach (var translation in langFile.Words)
+                {
+                    if (translation.Key == "NOTICE_WARN" ||
+                        translation.Key == "currentLanguage" ||
+                        translation.Key == "code")
+                        continue;
+
+                    var english = englishTranslations.Words[translation.Key];
+                    if (translation.Value != null)
+                        continue; // Already translated
+
+                    //TODO: A better way to avoid rate limits is to use this format:
+                    //I am translating a checkout crypto payment page, and I want you to translate it from English (en-US) to French (fr-FR).
+                    //##
+                    //English: This invoice will expire in
+                    //French:
+                    //##
+                    //English: Scan the QR code, or tap to copy the address.
+                    //French:
+                    //##
+                    //English: Your payment has been received and is now processing.
+                    //French:
+
+                    if (!askedPrompt)
+                    {
+                        driver.FindElement(By.XPath("//a[contains(text(), \"New chat\")]")).Click();
+                        Thread.Sleep(200);
+                        var input = driver.FindElement(By.XPath("//textarea[@data-id]"));
+                        input.SendKeys($"I am translating a checkout crypto payment page, and I want you to translate it from English (en-US) to {languageCurrent} ({jsonLangCode}).");
+                        input.SendKeys(Keys.LeftShift + Keys.Enter);
+                        input.SendKeys("Reply only with the translation of the sentences I will give you and nothing more." + Keys.Enter);
+                        WaitCanWritePrompt(driver);
+                        askedPrompt = true;
+                    }
+                    english = english.Replace('\n', ' ');
+                    driver.FindElement(By.XPath("//textarea[@data-id]")).SendKeys(english + Keys.Enter);
+                    WaitCanWritePrompt(driver);
+                    var elements = driver.FindElements(By.XPath("//div[contains(@class,'markdown') and contains(@class,'prose')]//p"));
+                    var result = elements.Last().Text;
+                    langFile.Words[translation.Key] = result;
+                }
+                langFile.Save();
+            }
+        }
+
+        private static TransifexClient GetTransifexClient()
+        {
+            return new TransifexClient(FactWithSecretAttribute.GetFromSecrets("TransifexAPIToken"));
+        }
+
+        private void WaitCanWritePrompt(IWebDriver driver)
+        {
+
+retry:
+            Thread.Sleep(200);
+            try
+            {
+                driver.FindElement(By.XPath("//*[contains(text(), \"Regenerate response\")]"));
+            }
+            catch
+            {
+                goto retry;
+            }
+            Thread.Sleep(200);
+        }
+
+        /// <summary>
+        /// This utility will make sure that permission documentation is properly written in swagger.template.json
+        /// </summary>
         [Trait("Utilities", "Utilities")]
         [Fact]
         public void UpdateSwagger()
@@ -50,7 +255,7 @@ namespace BTCPayServer.Tests
         }
 
         /// <summary>
-        /// Download transifex transactions and put them in BTCPayServer\wwwroot\locales
+        /// Download transifex transactions and put them in BTCPayServer\wwwroot\locales and BTCPayServer\wwwroot\locales\checkout
         /// </summary>
         [FactWithSecret("TransifexAPIToken")]
         [Trait("Utilities", "Utilities")]
@@ -58,77 +263,74 @@ namespace BTCPayServer.Tests
         {
             // 1. Generate an API Token on https://www.transifex.com/user/settings/api/
             // 2. Run "dotnet user-secrets set TransifexAPIToken <youapitoken>"
-            var client = new TransifexClient(FactWithSecretAttribute.GetFromSecrets("TransifexAPIToken"));
+            await PullTransifexTranslationsCore(TranslationFolder.CheckoutV1);
+            await PullTransifexTranslationsCore(TranslationFolder.CheckoutV2);
 
-            var proj = "o:btcpayserver:p:btcpayserver";
-            var resource = $"{proj}:r:enjson";
-            var json = await client.GetTransifexAsync($"https://rest.api.transifex.com/resource_language_stats?filter[project]={proj}&filter[resource]={resource}");
-            var langs = json["data"].Select(o => o["id"].Value<string>().Split(':').Last()).ToArray();
-            json = await client.GetTransifexAsync($"https://rest.api.transifex.com/resource_strings?filter[resource]={resource}");
-            var hashToKeys = json["data"]
-                .ToDictionary(
-                o => o["id"].Value<string>().Split(':').Last(),
-                o => o["attributes"]["key"].Value<string>().Replace("\\.", "."));
+        }
 
-            var translations = new ConcurrentDictionary<string, JObject>();
-            translations.TryAdd("en",
-                new JObject(
-                    json["data"]
-                    .Select(o => new JProperty(
-                        o["attributes"]["key"].Value<string>().Replace("\\.", "."),
-                        o["attributes"]["strings"]["other"].Value<string>())))
-                );
+        private async Task PullTransifexTranslationsCore(TranslationFolder folder)
+        {
+            var enTranslation = JsonTranslation.GetTranslation(folder, "en");
+            var client = GetTransifexClient();
+            var langs = await client.GetLangs(enTranslation.TransifexProject, enTranslation.TransifexResource);
+            var resourceStrings = await client.GetResourceStrings(enTranslation.TransifexResource);
 
-            var langsDir = Path.Combine(TestUtils.TryGetSolutionDirectoryInfo().FullName, "BTCPayServer", "wwwroot", "locales");
+            enTranslation.Words.Clear();
+            enTranslation.Translate(resourceStrings.SourceTranslations);
+            enTranslation.Save();
 
             Task.WaitAll(langs.Select(async l =>
             {
                 if (l == "en")
                     return;
-                retry:
-                var j = await client.GetTransifexAsync($"https://rest.api.transifex.com/resource_translations?filter[resource]={resource}&filter[language]=l:{l}");
+retry:
                 try
                 {
-                    var jobj = new JObject(
-                        j["data"].Select(o => (Key: hashToKeys[o["id"].Value<string>().Split(':')[^3]], Strings: o["attributes"]["strings"]))
-                        .Select(o =>
-                        new JProperty(
-                            o.Key,
-                            o.Strings.Type == JTokenType.Null ? translations["en"][o.Key].Value<string>() : o.Strings["other"].Value<string>()
-                            )));
-                    if (l == "ne_NP")
-                        l = "np_NP";
-                    if (l == "zh_CN")
-                        l = "zh-SP";
-                    if (l == "kk")
-                        l = "kk-KZ";
-
-                    var langCode = l.Replace("_", "-");
-                    jobj["code"] = langCode;
-
-                    if ((string)jobj["currentLanguage"] == "English")
-                        return; // Not translated
-                    if ((string)jobj["currentLanguage"] == "disable")
-                        return; // Not translated
-
-                    if (jobj["InvoiceExpired_Body_3"].Value<string>() == translations["en"]["InvoiceExpired_Body_3"].Value<string>())
+                    var langCode = GetLangCodeTransifexToJson(l);
+                    var langTranslations = await client.GetTranslations(resourceStrings, l);
+                    var translation = JsonTranslation.GetTranslation(folder, langCode);
+                    if (translation.ShouldSkip())
                     {
-                        jobj["InvoiceExpired_Body_3"] = string.Empty;
+                        Logs.WriteLine("Skipping " + langCode);
+                        return;
                     }
-                    translations.TryAdd(langCode, jobj);
+
+                    if (translation.Words.ContainsKey("InvoiceExpired_Body_3") && translation.Words["InvoiceExpired_Body_3"] == enTranslation.Words["InvoiceExpired_Body_3"])
+                    {
+                        translation.Words["InvoiceExpired_Body_3"] = string.Empty;
+                    }
+                    translation.Translate(langTranslations);
+                    translation.Save();
                 }
                 catch
                 {
+                    await Task.Delay(1000);
                     goto retry;
                 }
             }).ToArray());
+        }
 
-            foreach (var t in translations)
-            {
-                t.Value.AddFirst(new JProperty("NOTICE_WARN", "THIS CODE HAS BEEN AUTOMATICALLY GENERATED FROM TRANSIFEX, IF YOU WISH TO HELP TRANSLATION COME ON THE SLACK http://slack.btcpayserver.org TO REQUEST PERMISSION TO https://www.transifex.com/btcpayserver/btcpayserver/"));
-                var content = t.Value.ToString(Newtonsoft.Json.Formatting.Indented);
-                File.WriteAllText(Path.Combine(langsDir, $"{t.Key}.json"), content);
-            }
+        internal static string GetLangCodeTransifexToJson(string l)
+        {
+            if (l == "ne_NP")
+                l = "np-NP";
+            if (l == "zh_CN")
+                l = "zh-SP";
+            if (l == "kk")
+                l = "kk-KZ";
+
+            return l.Replace("_", "-");
+        }
+        internal static string GetLangCodeJsonToTransifex(string l)
+        {
+            if (l == "np-NP")
+                l = "ne_NP";
+            if (l == "zh-SP")
+                l = "zh_CN";
+            if (l == "kk-KZ")
+                l = "kk";
+
+            return l.Replace("-", "_");
         }
     }
 
@@ -148,9 +350,254 @@ namespace BTCPayServer.Tests
             var message = new HttpRequestMessage(HttpMethod.Get, uri);
             message.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", APIToken);
             message.Headers.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/vnd.api+json"));
-            var response = await Client.SendAsync(message);
+            using var response = await Client.SendAsync(message);
             var str = await response.Content.ReadAsStringAsync();
             return JObject.Parse(str);
         }
+
+        public async Task UpdateTranslations(Dictionary<string, JsonTranslation> translations)
+        {
+            var resourceStrings = await GetResourceStrings(translations.First().Value.TransifexResource);
+            List<JObject> patches = new List<JObject>();
+            List<JObject[]> batches = new List<JObject[]>();
+            foreach (var translation in translations.Values)
+            {
+                foreach (var word in translation.Words)
+                {
+                    if (word.Key == "NOTICE_WARN")
+                        continue;
+                    patches.Add(new JObject()
+                    {
+                        ["id"] = $"{translation.TransifexResource}:s:{resourceStrings.KeyToHashMapping[word.Key]}:l:{UtilitiesTests.GetLangCodeJsonToTransifex(translation.Lang)}",
+                        ["type"] = "resource_translations",
+                        ["attributes"] = new JObject()
+                        {
+                            ["strings"] = word.Value is null ? null : new JObject()
+                            {
+                                ["other"] = word.Value
+                            }
+                        }
+                    });
+                    if (patches.Count >= 150)
+                    {
+                        batches.Add(patches.ToArray());
+                        patches = new List<JObject>();
+                    }
+                }
+                if (patches.Count > 0)
+                {
+                    batches.Add(patches.ToArray());
+                    patches = new List<JObject>();
+                }
+            }
+
+            if (patches.Count > 0)
+            {
+                batches.Add(patches.ToArray());
+                patches = new List<JObject>();
+            }
+            await Task.WhenAll(batches.Select(async batch =>
+            {
+                var message = new HttpRequestMessage(HttpMethod.Get, "https://rest.api.transifex.com/resource_translations");
+                message.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", APIToken);
+                message.Method = HttpMethod.Patch;
+                var content = new StringContent(new JObject()
+                {
+                    ["data"] = new JArray(batch.OfType<object>().ToArray())
+                }.ToString(), Encoding.UTF8);
+                content.Headers.Remove("Content-Type");
+                content.Headers.TryAddWithoutValidation("Content-Type", "application/vnd.api+json;profile=\"bulk\"");
+                message.Content = content;
+                using var response = await Client.SendAsync(message);
+                var str = await response.Content.ReadAsStringAsync();
+            }).ToArray());
+        }
+
+        public async Task<Dictionary<string, string>> GetTranslations(ResourceStrings resourceStrings, string lang)
+        {
+            var j = await GetTransifexAsync($"https://rest.api.transifex.com/resource_translations?filter[resource]={resourceStrings.ResourceId}&filter[language]=l:{lang}");
+            if (j["data"] is null)
+            {
+                return resourceStrings.SourceTranslations.ToDictionary(kv => kv.Key, kv => null as string);
+            }
+            return
+                    j["data"].Select(o => (Key: resourceStrings.GetKey(o["id"].Value<string>()), Strings: o["attributes"]["strings"]))
+                    .ToDictionary(
+                        o => o.Key,
+                        o => o.Strings.Type == JTokenType.Null ? null : o.Strings["other"].Value<string>());
+        }
+
+        public async Task<string[]> GetLangs(string projectId, string resourceId)
+        {
+            var json = await GetTransifexAsync($"https://rest.api.transifex.com/resource_language_stats?filter[project]={projectId}&filter[resource]={resourceId}");
+            return json["data"].Select(o => o["id"].Value<string>().Split(':').Last()).ToArray();
+        }
+
+
+        public async Task<ResourceStrings> GetResourceStrings(string resourceId)
+        {
+            var res = new ResourceStrings();
+            res.ResourceId = resourceId;
+            var json = await GetTransifexAsync($"https://rest.api.transifex.com/resource_strings?filter[resource]={resourceId}");
+            res.HashToKeyMapping =
+                json["data"]
+                .ToDictionary(
+                o => o["id"].Value<string>().Split(':').Last(),
+                o => o["attributes"]["key"].Value<string>().Replace("\\.", "."));
+            res.KeyToHashMapping = res.HashToKeyMapping.ToDictionary(o => o.Value, o => o.Key);
+            res.SourceTranslations =
+                json["data"]
+                .ToDictionary(
+                    o => o["attributes"]["key"].Value<string>().Replace("\\.", "."),
+                    o => o["attributes"]["strings"]["other"].Value<string>());
+            return res;
+        }
+    }
+
+    public class ResourceStrings
+    {
+        public string ResourceId { get; set; }
+        public Dictionary<string, string> HashToKeyMapping { get; set; }
+        public Dictionary<string, string> SourceTranslations { get; set; }
+        public Dictionary<string, string> KeyToHashMapping { get; internal set; }
+
+        public string GetKey(string hash)
+        {
+            if (HashToKeyMapping.TryGetValue(hash, out var v))
+                return v;
+            hash = hash.Split(':')[^3];
+            if (HashToKeyMapping.TryGetValue(hash, out v))
+                return v;
+            throw new InvalidOperationException();
+        }
+    }
+
+    public enum TranslationFolder
+    {
+        CheckoutV1,
+        CheckoutV2
+    }
+    public class JsonTranslation
+    {
+
+        public static Dictionary<string, JsonTranslation> GetTranslations(TranslationFolder folder)
+        {
+            var res = new Dictionary<string, JsonTranslation>();
+            var source = GetTranslation(null, folder, "en");
+            foreach (var f in Directory.GetFiles(GetFolder(folder)))
+            {
+                var lang = Path.GetFileNameWithoutExtension(f);
+                res.Add(lang, GetTranslation(source, folder, lang));
+            }
+            return res;
+        }
+        public static JsonTranslation GetTranslation(TranslationFolder folder, string lang)
+        {
+            var source = GetTranslation(null, folder, "en");
+            return GetTranslation(source, folder, lang);
+        }
+        private static JsonTranslation GetTranslation(JsonTranslation sourceTranslation, TranslationFolder folder, string lang)
+        {
+            var fullPath = Path.Combine(GetFolder(folder), $"{lang}.json");
+            var proj = "o:btcpayserver:p:btcpayserver";
+            string resource;
+            if (folder == TranslationFolder.CheckoutV1)
+            {
+                resource = $"{proj}:r:enjson";
+            }
+            else // file == v2
+            {
+                resource = $"{proj}:r:checkout-v2";
+            }
+            var words = new Dictionary<string, string>();
+            if (File.Exists(fullPath))
+            {
+                var obj = JObject.Parse(File.ReadAllText(fullPath));
+                foreach (var prop in obj.Properties())
+                    words.Add(prop.Name, prop.Value.Value<string>());
+            }
+            if (sourceTranslation != null)
+            {
+                foreach (var w in sourceTranslation.Words)
+                {
+                    if (!words.ContainsKey(w.Key))
+                        words.Add(w.Key, null);
+                }
+            }
+            return new JsonTranslation()
+            {
+                FullPath = fullPath,
+                Lang = lang,
+                Words = words,
+                TransifexProject = proj,
+                TransifexResource = resource
+            };
+        }
+
+        private static string GetFolder(TranslationFolder file)
+        {
+            if (file == TranslationFolder.CheckoutV1)
+                return Path.Combine(TestUtils.TryGetSolutionDirectoryInfo().FullName, "BTCPayServer", "wwwroot", "locales");
+            else
+                return Path.Combine(TestUtils.TryGetSolutionDirectoryInfo().FullName, "BTCPayServer", "wwwroot", "locales", "checkout");
+        }
+
+        public string Lang { get; set; }
+        public Dictionary<string, string> Words { get; set; }
+
+
+        public string FullPath { get; set; }
+        public string TransifexProject { get; set; }
+        public string TransifexResource { get; private set; }
+
+        public void Save()
+        {
+            JObject obj = new JObject
+            {
+                { "NOTICE_WARN", "THIS CODE HAS BEEN AUTOMATICALLY GENERATED FROM TRANSIFEX, IF YOU WISH TO HELP TRANSLATION COME ON THE SLACK https://chat.btcpayserver.org/ TO REQUEST PERMISSION TO https://www.transifex.com/btcpayserver/btcpayserver/" },
+                { "code", Lang },
+                { "currentLanguage", Words["currentLanguage"] }
+            };
+            foreach (var kv in Words)
+            {
+                if (obj[kv.Key] is not null)
+                    continue;
+                if (kv.Value is null)
+                    continue;
+                obj.Add(kv.Key, kv.Value);
+            }
+            try
+            {
+                File.WriteAllText(FullPath, obj.ToString(Newtonsoft.Json.Formatting.Indented));
+            }
+            catch (FileNotFoundException)
+            {
+                File.Create(FullPath).Close();
+                File.WriteAllText(FullPath, obj.ToString(Newtonsoft.Json.Formatting.Indented));
+            }
+        }
+
+        public void Translate(Dictionary<string, string> sourceTranslations)
+        {
+            foreach (var o in sourceTranslations)
+                if (o.Value != null)
+                    Words.AddOrReplace(o.Key, o.Value);
+        }
+
+        public bool ShouldSkip()
+        {
+            if (!Words.ContainsKey("currentLanguage"))
+                return true;
+            if (Words["currentLanguage"] == "English")
+                return true;
+            if (Words["currentLanguage"] == "disable")
+                return true;
+            return false;
+        }
+
+        public bool Exists()
+        {
+            return File.Exists(FullPath);
+        }
     }
 }

BTCPayServer.Tests/docker-compose.altcoins.yml

@@ -24,7 +24,6 @@ services:
       TESTS_AzureBlobStorageConnectionString: ${TESTS_AzureBlobStorageConnectionString:-none}
       TEST_MERCHANTLIGHTNINGD: "type=clightning;server=unix://etc/merchant_lightningd_datadir/lightning-rpc"
       TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=unix://etc/customer_lightningd_datadir/lightning-rpc"
-      TEST_MERCHANTCHARGE: "type=charge;server=http://lightning-charged:9112/;api-token=foiewnccewuify;allowinsecure=true"
       TEST_MERCHANTLND: "http://lnd:lnd@merchant_lnd:8080/"
       TESTS_INCONTAINER: "true"
       TESTS_SSHCONNECTION: "root@sshd:22"
@@ -38,6 +37,10 @@ services:
       - selenium
     extra_hosts:
       - "tests:127.0.0.1"
+    networks:
+      default:
+      custom:
+        ipv4_address: 172.23.0.18
     volumes:
       - "sshd_datadir:/root/.ssh"
       - "customer_lightningd_datadir:/etc/customer_lightningd_datadir"
@@ -52,7 +55,6 @@ services:
       - postgres
       - customer_lightningd
       - merchant_lightningd
-      - lightning-charged
       - customer_lnd
       - merchant_lnd
       - sshd
@@ -71,7 +73,7 @@ services:
         - "sshd_datadir:/root/.ssh"
 
   devlnd:
-    image: btcpayserver/bitcoin:24.0
+    image: btcpayserver/bitcoin:25.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_WALLETDIR: "/data/wallets"
@@ -85,12 +87,19 @@ services:
       - postgres
       - customer_lnd
       - merchant_lnd
+
   selenium:
     image: selenium/standalone-chrome:101.0
+    extra_hosts:
+      - "tests:172.23.0.18"
     expose:
       - "4444"
+    networks:
+      default:
+      custom:
+
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.3.58
+    image: nicolasdorier/nbxplorer:2.3.63
     restart: unless-stopped
     ports:
       - "32838:32838"
@@ -126,7 +135,7 @@ services:
 
   bitcoind:
     restart: unless-stopped
-    image: btcpayserver/bitcoin:24.0
+    image: btcpayserver/bitcoin:25.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_WALLETDIR: "/data/wallets"
@@ -154,7 +163,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v22.11-dev
+    image: btcpayserver/lightning:v23.05-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment:
@@ -180,30 +189,8 @@ services:
     depends_on:
       - bitcoind
 
-  lightning-charged:
-    image: shesek/lightning-charge:0.4.23-1-standalone
-    restart: unless-stopped
-    environment:
-      NETWORK: regtest
-      API_TOKEN: foiewnccewuify
-      BITCOIND_RPCCONNECT: bitcoind
-      LN_NET_PATH: /etc/lightning
-      LN_NET: /etc/lightning
-    volumes:
-      - "bitcoin_datadir:/etc/bitcoin"
-      - "lightning_charge_datadir:/data"
-      - "merchant_lightningd_datadir:/etc/lightning"
-    expose:
-      - "9112" # Charge
-      - "9735" # Lightning
-    ports:
-      - "54938:9112" # Charge
-    depends_on:
-      - bitcoind
-      - merchant_lightningd
-
   merchant_lightningd:
-    image: btcpayserver/lightning:v22.11-dev
+    image: btcpayserver/lightning:v23.05-dev
     stop_signal: SIGKILL
     environment:
       EXPOSE_TCP: "true"
@@ -237,7 +224,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.15.4-beta-1
+    image: btcpayserver/lnd:v0.16.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -272,7 +259,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.15.4-beta-1
+    image: btcpayserver/lnd:v0.16.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -404,3 +391,12 @@ volumes:
     torrcdir:
     tor_servicesdir:
     monero_data:
+
+networks:
+  default:
+    driver: bridge
+  custom:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.23.0.0/16

BTCPayServer.Tests/docker-compose.yml

@@ -22,7 +22,6 @@ services:
       TESTS_AzureBlobStorageConnectionString: ${TESTS_AzureBlobStorageConnectionString:-none}
       TEST_MERCHANTLIGHTNINGD: "type=clightning;server=unix://etc/merchant_lightningd_datadir/lightning-rpc"
       TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=unix://etc/customer_lightningd_datadir/lightning-rpc"
-      TEST_MERCHANTCHARGE: "type=charge;server=http://lightning-charged:9112/;api-token=foiewnccewuify;allowinsecure=true"
       TEST_MERCHANTLND: "http://lnd:lnd@merchant_lnd:8080/"
       TESTS_INCONTAINER: "true"
       TESTS_SSHCONNECTION: "root@sshd:22"
@@ -36,6 +35,10 @@ services:
       - selenium
     extra_hosts:
       - "tests:127.0.0.1"
+    networks:
+      default:
+      custom:
+        ipv4_address: 172.23.0.18
     volumes:
       - "sshd_datadir:/root/.ssh"
       - "customer_lightningd_datadir:/etc/customer_lightningd_datadir"
@@ -50,7 +53,6 @@ services:
       - postgres
       - customer_lightningd
       - merchant_lightningd
-      - lightning-charged
       - customer_lnd
       - merchant_lnd
       - sshd
@@ -68,26 +70,33 @@ services:
         - "sshd_datadir:/root/.ssh"
 
   devlnd:
-    image: btcpayserver/bitcoin:24.0
+    image: btcpayserver/bitcoin:25.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_WALLETDIR: "/data/wallets"
       BITCOIN_EXTRA_ARGS: |
         deprecatedrpc=signrawtransaction
         connect=bitcoind:39388
-        rpcallowip=0.0.0.0/0
         fallbackfee=0.0002
+        rpcallowip=0.0.0.0/0
     depends_on:
       - nbxplorer
       - postgres
       - customer_lnd
       - merchant_lnd
+
   selenium:
     image: selenium/standalone-chrome:101.0
+    extra_hosts:
+      - "tests:172.23.0.18"
     expose:
       - "4444"
+    networks:
+      default:
+      custom:
+
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.3.58
+    image: nicolasdorier/nbxplorer:2.3.63
     restart: unless-stopped
     ports:
       - "32838:32838"
@@ -110,10 +119,9 @@ services:
     depends_on:
       - bitcoind
 
-
   bitcoind:
     restart: unless-stopped
-    image: btcpayserver/bitcoin:24.0
+    image: btcpayserver/bitcoin:25.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_WALLETDIR: "/data/wallets"
@@ -141,7 +149,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v22.11-dev
+    image: btcpayserver/lightning:v23.05-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment:
@@ -167,30 +175,8 @@ services:
     depends_on:
       - bitcoind
 
-  lightning-charged:
-    image: shesek/lightning-charge:0.4.23-1-standalone
-    restart: unless-stopped
-    environment:
-      NETWORK: regtest
-      API_TOKEN: foiewnccewuify
-      BITCOIND_RPCCONNECT: bitcoind
-      LN_NET_PATH: /etc/lightning
-      LN_NET: /etc/lightning
-    volumes:
-      - "bitcoin_datadir:/etc/bitcoin"
-      - "lightning_charge_datadir:/data"
-      - "merchant_lightningd_datadir:/etc/lightning"
-    expose:
-      - "9112" # Charge
-      - "9735" # Lightning
-    ports:
-      - "54938:9112" # Charge
-    depends_on:
-      - bitcoind
-      - merchant_lightningd
-
   merchant_lightningd:
-    image: btcpayserver/lightning:v22.11-dev
+    image: btcpayserver/lightning:v23.05-dev
     stop_signal: SIGKILL
     environment:
       EXPOSE_TCP: "true"
@@ -225,7 +211,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.15.4-beta-1
+    image: btcpayserver/lnd:v0.16.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -262,7 +248,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.15.4-beta-1
+    image: btcpayserver/lnd:v0.16.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -323,3 +309,12 @@ volumes:
     tor_datadir:
     torrcdir:
     tor_servicesdir:
+
+networks:
+  default:
+    driver: bridge
+  custom:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.23.0.0/16

BTCPayServer/BTCPayServer.csproj

@@ -45,15 +45,16 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="YamlDotNet" Version="8.0.0" />
     <PackageReference Include="BIP78.Sender" Version="0.2.2" />
     <PackageReference Include="BTCPayServer.Hwi" Version="2.0.2" />
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.4.21" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.4.28" />
     <PackageReference Include="CsvHelper" Version="15.0.5" />
     <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="Fido2" Version="2.0.2" />
     <PackageReference Include="Fido2.AspNet" Version="2.0.2" />
     <PackageReference Include="HtmlSanitizer" Version="5.0.372" />
-    <PackageReference Include="LNURL" Version="0.0.28" />
+    <PackageReference Include="LNURL" Version="0.0.29" />
     <PackageReference Include="MailKit" Version="3.3.0" />
     <PackageReference Include="BTCPayServer.NETCore.Plugins.Mvc" Version="1.4.4" />
     <PackageReference Include="QRCoder" Version="1.4.3" />
@@ -75,7 +76,6 @@
     <PackageReference Include="TwentyTwenty.Storage.Azure" Version="2.12.1" />
     <PackageReference Include="TwentyTwenty.Storage.Google" Version="2.12.1" />
     <PackageReference Include="TwentyTwenty.Storage.Local" Version="2.12.1" />
-		<PackageReference Include="YamlDotNet" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.9" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />
   </ItemGroup>
@@ -111,9 +111,6 @@
 	  <None Include="wwwroot\vendor\font-awesome\scss\_screen-reader.scss" />
 	  <None Include="wwwroot\vendor\font-awesome\scss\_stacked.scss" />
 	  <None Include="wwwroot\vendor\font-awesome\scss\_variables.scss" />
-	  <None Include="wwwroot\vendor\jquery-easing\jquery.easing.compatibility.js" />
-	  <None Include="wwwroot\vendor\jquery-easing\jquery.easing.js" />
-	  <None Include="wwwroot\vendor\jquery-easing\jquery.easing.min.js" />
 	  <None Include="wwwroot\vendor\jquery\jquery.js" />
 	  <None Include="wwwroot\vendor\jquery\jquery.min.js" />
 	</ItemGroup>
@@ -134,11 +131,11 @@
 	  <ProjectReference Include="..\BTCPayServer.Data\BTCPayServer.Data.csproj" />
 	  <ProjectReference Include="..\BTCPayServer.Rating\BTCPayServer.Rating.csproj" />
 	  <ProjectReference Include="..\BTCPayServer.Common\BTCPayServer.Common.csproj" />
-	  <ProjectReference Include="..\Plugins\BTCPayServer.Plugins.Custodians.FakeCustodian\BTCPayServer.Plugins.Custodians.FakeCustodian.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
     <Watch Include="Views\**\*.*"></Watch>
+    <Watch Remove="Views\UIAccount\CheatPermissions.cshtml" />
     <Content Update="Views\UIApps\_ViewImports.cshtml">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <Pack>$(IncludeRazorContentInPack)</Pack>

BTCPayServer/BufferizedFormFile.cs

@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Http;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 
 namespace BTCPayServer
 {

BTCPayServer/ColorPalette.cs

@@ -19,7 +19,7 @@ namespace BTCPayServer
             var bg = ColorTranslator.FromHtml(bgColor);
             int bgDelta = Convert.ToInt32((bg.R * 0.299) + (bg.G * 0.587) + (bg.B * 0.114));
             Color color = (255 - bgDelta < nThreshold) ? Color.Black : Color.White;
-            return ColorTranslator.ToHtml(color);
+            return ColorTranslator.ToHtml(color).ToLowerInvariant();
         }
         // Borrowed from https://github.com/ManageIQ/guides/blob/master/labels.md
         public static readonly ColorPalette Default = new ColorPalette(new string[] {
@@ -59,5 +59,44 @@ namespace BTCPayServer
                     return Labels[num % Labels.Length];
             }
         }
+
+        /// https://gist.github.com/zihotki/09fc41d52981fb6f93a81ebf20b35cd5
+        /// <summary>
+        /// Creates color with corrected brightness.
+        /// </summary>
+        /// <param name="color">Color to correct.</param>
+        /// <param name="correctionFactor">The brightness correction factor. Must be between -1 and 1. 
+        /// Negative values produce darker colors.</param>
+        /// <returns>
+        /// Corrected <see cref="Color"/> structure.
+        /// </returns>
+        public Color AdjustBrightness(Color color, float correctionFactor)
+        {
+            float red = color.R;
+            float green = color.G;
+            float blue = color.B;
+
+            if (correctionFactor < 0)
+            {
+                correctionFactor = 1 + correctionFactor;
+                red *= correctionFactor;
+                green *= correctionFactor;
+                blue *= correctionFactor;
+            }
+            else
+            {
+                red = (255 - red) * correctionFactor + red;
+                green = (255 - green) * correctionFactor + green;
+                blue = (255 - blue) * correctionFactor + blue;
+            }
+
+            return Color.FromArgb(color.A, (int)red, (int)green, (int)blue);
+        }
+
+        public string AdjustBrightness(string html, float correctionFactor)
+        {
+            var color = AdjustBrightness(ColorTranslator.FromHtml(html), correctionFactor);
+            return ColorTranslator.ToHtml(color);
+        }
     }
 }

BTCPayServer/Components/AppSales/AppSales.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Security.AccessControl;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Models.AppViewModels;
@@ -6,6 +7,8 @@ using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
 namespace BTCPayServer.Components.AppSales;
 
@@ -24,17 +27,28 @@ public class AppSales : ViewComponent
         _appService = appService;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(AppSalesViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(string appId, string appType)
     {
-        if (vm.App == null)
-            throw new ArgumentNullException(nameof(vm.App));
+        var type = _appService.GetAppType(appType);
+        if (type is not IHasSaleStatsAppType salesAppType || type is not AppBaseType appBaseType)
+            return new HtmlContentViewComponentResult(new StringHtmlContent(string.Empty));
+        var vm = new AppSalesViewModel
+        {
+            Id = appId,
+            AppType = appType,
+            DataUrl = Url.Action("AppSales", "UIApps", new { appId }),
+            InitialRendering = HttpContext.GetAppData()?.Id != appId
+        };
         if (vm.InitialRendering)
             return View(vm);
 
-        var stats = await _appService.GetSalesStats(vm.App);
-
+        var app = HttpContext.GetAppData();
+        var stats = await _appService.GetSalesStats(app);
         vm.SalesCount = stats.SalesCount;
         vm.Series = stats.Series;
+        vm.AppType = app.AppType;
+        vm.AppUrl = await appBaseType.ConfigureLink(app);
+        vm.Name = app.Name;
 
         return View(vm);
     }

BTCPayServer/Components/AppSales/AppSalesViewModel.cs

@@ -1,14 +1,17 @@
 using System.Collections.Generic;
-using BTCPayServer.Data;
 using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.Components.AppSales;
 
 public class AppSalesViewModel
 {
-    public AppData App { get; set; }
-    public AppSalesPeriod Period { get; set; } = AppSalesPeriod.Week;
-    public int SalesCount { get; set; }
+    public string Id { get; set; }
+    public string Name { get; set; }
+    public string AppType { get; set; }
+    public AppSalesPeriod Period { get; set; }
+    public string AppUrl { get; set; }
+    public string DataUrl { get; set; }
+    public long SalesCount { get; set; }
     public IEnumerable<SalesStatsItem> Series { get; set; }
     public bool InitialRendering { get; set; }
 }

BTCPayServer/Components/AppSales/Default.cshtml

@@ -1,17 +1,18 @@
-@using BTCPayServer.Services.Apps
 @using BTCPayServer.Components.AppSales
+@using BTCPayServer.Abstractions.TagHelpers
+@using BTCPayServer.Plugins.Crowdfund
 @model BTCPayServer.Components.AppSales.AppSalesViewModel
-
 @{
-    var controller = $"UI{Model.App.AppType}";
-    var action = $"Update{Model.App.AppType}";
-    var label = Model.App.AppType == nameof(AppType.Crowdfund) ? "Contributions" : "Sales";
+    var label = Model.AppType == CrowdfundAppType.AppType ? "Contributions" : "Sales";
 }
 
-<div id="AppSales-@Model.App.Id" class="widget app-sales">
+<div id="AppSales-@Model.Id" class="widget app-sales">
     <header class="mb-3">
-        <h3>@Model.App.Name @label</h3>
-        <a asp-controller="@controller" asp-action="@action" asp-route-appId="@Model.App.Id">Manage</a>
+        <h3>@Model.Name @label</h3>
+        @if (!string.IsNullOrEmpty(Model.AppUrl))
+        {
+            <a href="@Model.AppUrl">Manage</a>
+        }
     </header>
     @if (Model.InitialRendering)
     {
@@ -20,15 +21,16 @@
                 <span class="visually-hidden">Loading...</span>
             </div>
         </div>
+        <script src="~/Components/AppSales/Default.cshtml.js" asp-append-version="true"></script>
         <script>
             (async () => {
-                const url = @Safe.Json(Url.Action("AppSales", "UIApps", new { appId = Model.App.Id }));
-                const appId = @Safe.Json(Model.App.Id);
+                const url = @Safe.Json(Model.DataUrl);
+                const appId = @Safe.Json(Model.Id);
                 const response = await fetch(url);
                 if (response.ok) {
                     document.getElementById(`AppSales-${appId}`).outerHTML = await response.text();
-                    const initScript = document.querySelector(`#AppSales-${appId} script`);
-                    if (initScript) eval(initScript.innerHTML);
+                    const data = document.querySelector(`#AppSales-${appId} template`);
+                    if (data) window.appSales.dataLoaded(JSON.parse(data.innerHTML));
                 }
             })();
         </script>
@@ -40,54 +42,15 @@
                 <span class="sales-count">@Model.SalesCount</span> Total @label
             </span>
             <div class="btn-group only-for-js" role="group" aria-label="Filter">
-                <input type="radio" class="btn-check" name="AppSalesPeriod-@Model.App.Id" id="AppSalesPeriodWeek-@Model.App.Id" value="@AppSalesPeriod.Week" @(Model.Period == AppSalesPeriod.Week ? "checked" : "")>
-                <label class="btn btn-link" for="AppSalesPeriodWeek-@Model.App.Id">1W</label>
-                <input type="radio" class="btn-check" name="AppSalesPeriod-@Model.App.Id" id="AppSalesPeriodMonth-@Model.App.Id" value="@AppSalesPeriod.Month" @(Model.Period == AppSalesPeriod.Month ? "checked" : "")>
-                <label class="btn btn-link" for="AppSalesPeriodMonth-@Model.App.Id">1M</label>
+                <input type="radio" class="btn-check" name="AppSalesPeriod-@Model.Id" id="AppSalesPeriodWeek-@Model.Id" value="@AppSalesPeriod.Week" @(Model.Period == AppSalesPeriod.Week ? "checked" : "")>
+                <label class="btn btn-link" for="AppSalesPeriodWeek-@Model.Id">1W</label>
+                <input type="radio" class="btn-check" name="AppSalesPeriod-@Model.Id" id="AppSalesPeriodMonth-@Model.Id" value="@AppSalesPeriod.Month" @(Model.Period == AppSalesPeriod.Month ? "checked" : "")>
+                <label class="btn btn-link" for="AppSalesPeriodMonth-@Model.Id">1M</label>
             </div>
         </header>
         <div class="ct-chart"></div>
-        <script>
-            (function () {
-                const id = @Safe.Json($"AppSales-{Model.App.Id}");
-                const appId = @Safe.Json(Model.App.Id);
-                const period = @Safe.Json(Model.Period.ToString());
-                const baseUrl = @Safe.Json(Url.Action("AppSales", "UIApps", new { appId = Model.App.Id }));
-                const data = { series: @Safe.Json(Model.Series), salesCount: @Safe.Json(Model.SalesCount) };
-                
-                const render = (data, period) => {
-                    const series = data.series.map(s => s.salesCount);
-                    const labels = data.series.map((s, i) => period === @Safe.Json(Model.Period.ToString()) ? s.label : (i % 5 === 0 ? s.label : ''));
-                    const min = Math.min(...series);
-                    const max = Math.max(...series);
-                    const low = min === max ? 0 : Math.max(min - ((max - min) / 5), 0);
-                    
-                    document.querySelectorAll(`#${id} .sales-count`).innerText = data.salesCount;
-                    
-                    new Chartist.Bar(`#${id} .ct-chart`, {
-                        labels,
-                        series: [series]
-                    }, {
-                        low,
-                    });
-                };
-                
-                render(data, period);
-            
-                const update = async period => {
-                    const url = `${baseUrl}/${period}`;
-                    const response = await fetch(url);
-                    if (response.ok) {
-                        const data = await response.json();
-                        render(data, period);
-                    }
-                };
-            
-                delegate('change', `#${id} [name="AppSalesPeriod-${appId}"]`, async e => {
-                    const type = e.target.value;
-                    await update(type);
-                });
-            })();
-        </script>
+        <template>
+            @Safe.Json(Model)
+        </template>
     }
 </div>

BTCPayServer/Components/AppSales/Default.cshtml.js

@@ -0,0 +1,45 @@
+if (!window.appSales) {
+    window.appSales =
+    {
+        dataLoaded: function (model) {
+            const id = "AppSales-" + model.id;
+            const appId = model.id;
+            const period = model.period;
+            const baseUrl = model.url;
+            const data = model;
+
+            const render = (data, period) => {
+                const series = data.series.map(s => s.salesCount);
+                const labels = data.series.map((s, i) => period === model.period ? s.label : (i % 5 === 0 ? s.label : ''));
+                const min = Math.min(...series);
+                const max = Math.max(...series);
+                const low = min === max ? 0 : Math.max(min - ((max - min) / 5), 0);
+
+                document.querySelectorAll(`#${id} .sales-count`).innerText = data.salesCount;
+
+                new Chartist.Bar(`#${id} .ct-chart`, {
+                    labels,
+                    series: [series]
+                }, {
+                    low,
+                });
+            };
+
+            render(data, period);
+
+            const update = async period => {
+                const url = `${baseUrl}/${period}`;
+                const response = await fetch(url);
+                if (response.ok) {
+                    const data = await response.json();
+                    render(data, period);
+                }
+            };
+
+            delegate('change', `#${id} [name="AppSalesPeriod-${appId}"]`, async e => {
+                const type = e.target.value;
+                await update(type);
+            });
+        }
+    };
+}

BTCPayServer/Components/AppTopItems/AppTopItems.cs

@@ -1,11 +1,14 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Components.AppSales;
 using BTCPayServer.Data;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
 namespace BTCPayServer.Components.AppTopItems;
 
@@ -18,18 +21,29 @@ public class AppTopItems : ViewComponent
         _appService = appService;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(AppTopItemsViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(string appId, string appType)
     {
-        if (vm.App == null)
-            throw new ArgumentNullException(nameof(vm.App));
+        var type = _appService.GetAppType(appType);
+        if (type is not IHasItemStatsAppType salesAppType || type is not AppBaseType appBaseType)
+            return new HtmlContentViewComponentResult(new StringHtmlContent(string.Empty));
+
+        var vm = new AppTopItemsViewModel
+        {
+            Id = appId,
+            AppType = appType,
+            DataUrl = Url.Action("AppTopItems", "UIApps", new { appId }),
+            InitialRendering = HttpContext.GetAppData()?.Id != appId
+        };
         if (vm.InitialRendering)
             return View(vm);
 
-        var entries = Enum.Parse<AppType>(vm.App.AppType) == AppType.Crowdfund
-            ? await _appService.GetPerkStats(vm.App)
-            : await _appService.GetItemStats(vm.App);
-
-        vm.Entries = entries.ToList();
+        var app = HttpContext.GetAppData();
+        var entries = await _appService.GetItemStats(app);
+        vm.SalesCount = entries.Select(e => e.SalesCount).ToList();
+        vm.Entries = entries.Take(5).ToList();
+        vm.AppType = app.AppType;
+        vm.AppUrl = await appBaseType.ConfigureLink(app);
+        vm.Name = app.Name;
 
         return View(vm);
     }

BTCPayServer/Components/AppTopItems/AppTopItemsViewModel.cs

@@ -1,12 +1,16 @@
 using System.Collections.Generic;
-using BTCPayServer.Data;
 using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.Components.AppTopItems;
 
 public class AppTopItemsViewModel
 {
-    public AppData App { get; set; }
+    public string Id { get; set; }
+    public string Name { get; set; }
+    public string AppType { get; set; }
+    public string AppUrl { get; set; }
+    public string DataUrl { get; set; }
     public List<ItemStats> Entries { get; set; }
+    public List<int> SalesCount { get; set; }
     public bool InitialRendering { get; set; }
 }

BTCPayServer/Components/AppTopItems/Default.cshtml

@@ -1,16 +1,16 @@
-@using BTCPayServer.Services.Apps
+@using BTCPayServer.Plugins.Crowdfund
 @model BTCPayServer.Components.AppTopItems.AppTopItemsViewModel
-
 @{
-    var controller = $"UI{Model.App.AppType}";
-    var action = $"Update{Model.App.AppType}";
-    var label = Model.App.AppType == nameof(AppType.Crowdfund) ? "contribution" : "sale";
+    var label = Model.AppType == CrowdfundAppType.AppType ? "contribution" : "sale";
 }
 
-<div id="AppTopItems-@Model.App.Id" class="widget app-top-items">
+<div id="AppTopItems-@Model.Id" class="widget app-top-items">
     <header class="mb-3">
-        <h3>Top @(Model.App.AppType == nameof(AppType.Crowdfund) ? "Perks" : "Items")</h3>
-        <a asp-controller="@controller" asp-action="@action" asp-route-appId="@Model.App.Id">View All</a>
+        <h3>Top @(Model.AppType == CrowdfundAppType.AppType ? "Perks" : "Items")</h3>
+        @if (!string.IsNullOrEmpty(Model.AppUrl))
+        {
+            <a href="@Model.AppUrl">View All</a>
+        }
     </header>
     @if (Model.InitialRendering)
     {
@@ -19,37 +19,26 @@
                 <span class="visually-hidden">Loading...</span>
             </div>
         </div>
+        <script src="~/Components/AppTopItems/Default.cshtml.js" asp-append-version="true"></script>
         <script>
-            (async () => {
-                const url = @Safe.Json(Url.Action("AppTopItems", "UIApps", new { appId = Model.App.Id }));
-                const appId = @Safe.Json(Model.App.Id);
-                const response = await fetch(url);
-                if (response.ok) {
-                    document.getElementById(`AppTopItems-${appId}`).outerHTML = await response.text();
-                    const initScript = document.querySelector(`#AppTopItems-${appId} script`);
-                    if (initScript) eval(initScript.innerHTML);
-                }
-            })();
-        </script>
+		(async () => {
+			const url = @Safe.Json(Model.DataUrl);
+			const appId = @Safe.Json(Model.Id);
+			const response = await fetch(url);
+			if (response.ok) {
+				document.getElementById(`AppTopItems-${appId}`).outerHTML = await response.text();
+				const data = document.querySelector(`#AppSales-${appId} template`);
+				if (data) window.appSales.dataLoaded(JSON.parse(data.innerHTML));
+			}
+		})();
+	    </script>
     }
     else if (Model.Entries.Any())
     {
         <div class="ct-chart mb-3"></div>
-        <script>
-            (function () {
-                const id = @Safe.Json($"AppTopItems-{Model.App.Id}");
-                const series = @Safe.Json(Model.Entries.Select(i => i.SalesCount));
-                new Chartist.Bar(`#${id} .ct-chart`, { series }, {
-                    distributeSeries: true,
-                    horizontalBars: true,
-                    showLabel: false,
-                    stackBars: true,
-                    axisY: {
-                        offset: 0
-                    }
-                });
-            })();
-        </script>
+        <template>
+            @Safe.Json(Model)
+        </template>
         <div class="app-items">
             @for (var i = 0; i < Model.Entries.Count; i++)
             {
@@ -59,7 +48,7 @@
                         <span class="app-item-point ct-point"></span>
                         @entry.Title
                     </span>
-                    <span class="app-item-value">
+                    <span class="app-item-value" data-sensitive>
                         <span class="text-muted">@entry.SalesCount @($"{label}{(entry.SalesCount == 1 ? "" : "s")}"),</span>
                         @entry.TotalFormatted
                     </span>

BTCPayServer/Components/AppTopItems/Default.cshtml.js

@@ -0,0 +1,18 @@
+if (!window.appTopItems) {
+    window.appTopItems =
+    {
+        dataLoaded: function (model) {
+            const id = "AppTopItems-" + model.id;
+            const series = model.salesCount;
+            new Chartist.Bar(`#${id} .ct-chart`, { series }, {
+                distributeSeries: true,
+                horizontalBars: true,
+                showLabel: false,
+                stackBars: true,
+                axisY: {
+                    offset: 0
+                }
+            });
+        }
+    };
+}