Fix posdata with primitive array

fixes #4952

.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

.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/Configuration/DataDirectories.cs

@@ -1,3 +1,5 @@
+using System.IO;
+
 namespace BTCPayServer.Configuration
 {
     public class DataDirectories
@@ -7,5 +9,12 @@ namespace BTCPayServer.Configuration
         public string TempStorageDir { get; set; }
         public string StorageDir { get; set; }
         public string TempDir { get; set; }
+
+        public string ToDatadirFullPath(string path)
+        {
+            if (Path.IsPathRooted(path))
+                return path;
+            return Path.Combine(DataDir, path);
+        }
     }
 }

BTCPayServer.Abstractions/Contracts/INotificationHandler.cs

@@ -19,6 +19,8 @@ namespace BTCPayServer.Abstractions.Contracts
     public class NotificationViewModel
     {
         public string Id { get; set; }
+        public string Identifier { get; set; }
+        public string Type { get; set; }
         public DateTimeOffset Created { get; set; }
         public string Body { get; set; }
         public string ActionLink { get; set; }

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

@@ -12,7 +12,7 @@ public class Field
 {
     public static Field Create(string label, string name, string value, bool required, string helpText, string type = "text")
     {
-        return new Field()
+        return new Field
         {
             Label = label,
             Name = name,
@@ -26,14 +26,14 @@ public class Field
     // The name of the HTML5 node. Should be used as the key for the posted data.
     public string Name;
 
-    public bool Hidden;
+    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()
     {
-        return new Field() { Type = "fieldset" };
+        return new Field { Type = "fieldset" };
     }
 
     // The value field is what is currently in the DB or what the user entered, but possibly not saved yet due to validation errors.
@@ -55,7 +55,7 @@ public class Field
     public List<Field> Fields { get; set; } = new();
 
     // The field is considered "valid" if there are no validation errors
-    public List<string> ValidationErrors = new List<string>();
+    public List<string> ValidationErrors = new();
 
     public virtual bool IsValid()
     {

BTCPayServer.Abstractions/Form/Form.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json.Linq;
+using Npgsql.Internal.TypeHandlers.GeometricHandlers;
 
 namespace BTCPayServer.Abstractions.Form;
 
@@ -20,6 +22,7 @@ public class Form
         return JObject.FromObject(this, CamelCaseSerializerSettings.Serializer).ToString(Newtonsoft.Json.Formatting.Indented);
     }
 #nullable restore
+
     // Messages to be shown at the top of the form indicating user feedback like "Saved successfully" or "Please change X because of Y." or a warning, etc...
     public List<AlertMessage> TopMessages { get; set; } = new();
 
@@ -29,129 +32,110 @@ 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);
     }
 
-    public Field GetFieldByName(string name)
+    public Field GetFieldByFullName(string fullName)
     {
-        return GetFieldByName(name, Fields, null);
-    }
-
-    private static Field GetFieldByName(string name, List<Field> fields, string prefix)
-    {
-        prefix ??= string.Empty;
-        foreach (var field in fields)
+        foreach (var f in GetAllFields())
         {
-            var currentPrefix = prefix;
-            if (!string.IsNullOrEmpty(field.Name))
-            {
-
-                currentPrefix = $"{prefix}{field.Name}";
-                if (currentPrefix.Equals(name, StringComparison.InvariantCultureIgnoreCase))
-                {
-                    return field;
-                }
-
-                currentPrefix += "_";
-            }
-
-            var subFieldResult = GetFieldByName(name, field.Fields, currentPrefix);
-            if (subFieldResult is not null)
-            {
-                return subFieldResult;
-            }
-
+            if (f.FullName == fullName)
+                return f.Field;
         }
         return null;
     }
 
-    public List<string> GetAllNames()
+    public IEnumerable<(string FullName, List<string> Path, Field Field)> GetAllFields()
     {
-        return GetAllNames(Fields);
-    }
-
-    private static List<string> GetAllNames(List<Field> fields)
-    {
-        var names = new List<string>();
-
-        foreach (var field in fields)
+        HashSet<string> nameReturned = new();
+        foreach (var f in GetAllFieldsCore(new List<string>(), Fields))
         {
-            string prefix = string.Empty;
-            if (!string.IsNullOrEmpty(field.Name))
-            {
-                names.Add(field.Name);
-                prefix = $"{field.Name}_";
-            }
-
-            if (field.Fields.Any())
-            {
-                names.AddRange(GetAllNames(field.Fields).Select(s => $"{prefix}{s}"));
-            }
-        }
-
-        return names;
-    }
-
-    public void ApplyValuesFromOtherForm(Form form)
-    {
-        foreach (var fieldset in Fields)
-        {
-            foreach (var field in fieldset.Fields)
-            {
-                field.Value = form
-                    .GetFieldByName(
-                        $"{(string.IsNullOrEmpty(fieldset.Name) ? string.Empty : fieldset.Name + "_")}{field.Name}")
-                    ?.Value;
-            }
+            var fullName = string.Join('_', f.Path.Where(s => !string.IsNullOrEmpty(s)));
+            if (!nameReturned.Add(fullName))
+                continue;
+            yield return (fullName, f.Path, f.Field);
         }
     }
 
-    public void ApplyValuesFromForm(IFormCollection form)
+    public bool ValidateFieldNames(out List<string> errors)
     {
-        var names = GetAllNames();
-        foreach (var name in names)
+        errors = new List<string>();
+        HashSet<string> nameReturned = new();
+        foreach (var f in GetAllFieldsCore(new List<string>(), Fields))
         {
-            var field = GetFieldByName(name);
-            if (field is null || !form.TryGetValue(name, out var val))
+            var fullName = string.Join('_', f.Path.Where(s => !string.IsNullOrEmpty(s)));
+            if (!nameReturned.Add(fullName))
             {
+                errors.Add($"Form contains duplicate field names '{fullName}'");
                 continue;
             }
-
-            field.Value = val;
         }
+        return errors.Count == 0;
     }
 
-    public Dictionary<string, object> GetValues()
+    IEnumerable<(List<string> Path, Field Field)> GetAllFieldsCore(List<string> path, List<Field> fields)
     {
-        return GetValues(Fields);
-    }
-
-    private static Dictionary<string, object> GetValues(List<Field> fields)
-    {
-        var result = new Dictionary<string, object>();
-        foreach (Field field in fields)
+        foreach (var field in fields)
         {
-            var name = field.Name ?? string.Empty;
-            if (field.Fields.Any())
+            List<string> thisPath = new(path.Count + 1);
+            thisPath.AddRange(path);
+            if (!string.IsNullOrEmpty(field.Name))
             {
-                var values = GetValues(fields);
-                values.Remove(string.Empty, out var keylessValue);
+                thisPath.Add(field.Name);
+                yield return (thisPath, field);
+            }
 
-                result.TryAdd(name, values);
-
-                if (keylessValue is not Dictionary<string, object> dict)
-                    continue;
-                foreach (KeyValuePair<string, object> keyValuePair in dict)
+            foreach (var child in field.Fields)
+            {
+                if (field.Constant)
+                    child.Constant = true;
+                foreach (var descendant in GetAllFieldsCore(thisPath, field.Fields))
                 {
-                    result.TryAdd(keyValuePair.Key, keyValuePair.Value);
+                    yield return descendant;
                 }
             }
-            else
+        }
+    }
+
+    public void ApplyValuesFromForm(IEnumerable<KeyValuePair<string, StringValues>> form)
+    {
+        var values = form.GroupBy(f => f.Key, f => f.Value).ToDictionary(g => g.Key, g => g.First());
+        foreach (var f in GetAllFields())
+        {
+            if (f.Field.Constant || !values.TryGetValue(f.FullName, out var val))
+                continue;
+
+            f.Field.Value = val;
+        }
+    }
+
+    public void SetValues(JObject values)
+    {
+        var fields = GetAllFields().ToDictionary(k => k.FullName, k => k.Field);
+        SetValues(fields, new List<string>(), values);
+    }
+
+    private void SetValues(Dictionary<string, Field> fields, List<string> path, JObject values)
+    {
+        foreach (var prop in values.Properties())
+        {
+            List<string> propPath = new List<string>(path.Count + 1);
+            propPath.AddRange(path);
+            propPath.Add(prop.Name);
+            if (prop.Value.Type == JTokenType.Object)
             {
-                result.TryAdd(name, field.Value);
+                SetValues(fields, propPath, (JObject)prop.Value);
+            }
+            else if (prop.Value.Type == JTokenType.String)
+            {
+                var fullName = string.Join('_', propPath.Where(s => !string.IsNullOrEmpty(s)));
+                if (fields.TryGetValue(fullName, out var f) && !f.Constant)
+                    f.Value = prop.Value.Value<string>();
             }
         }
-
-        return result;
     }
+
+
 }

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/SVGUse.cs

@@ -23,10 +23,19 @@ public class SVGUse : UrlResolutionTagHelper2
     {
         _fileVersionProvider = fileVersionProvider;
     }
+
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
         var attr = output.Attributes["href"].Value.ToString();
-        attr = _fileVersionProvider.AddFileVersionToPath(ViewContext.HttpContext.Request.PathBase, attr);
+        var symbolIndex = attr!.IndexOf("#", StringComparison.InvariantCulture);
+        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))
+        {
+            var versioned = _fileVersionProvider.AddFileVersionToPath(ViewContext.HttpContext.Request.PathBase, filePath);
+            attr = attr.Replace(filePath, versioned);
+        }
         output.Attributes.SetAttribute("href", attr);
         base.Process(context, output);
     }

BTCPayServer.Client/BTCPayServerClient.APIKeys.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -22,6 +23,15 @@ namespace BTCPayServer.Client
             return await HandleResponse<ApiKeyData>(response);
         }
 
+        public virtual async Task<ApiKeyData> CreateAPIKey(string userId, CreateApiKeyRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{userId}/api-keys",
+            bodyPayload: request, method: HttpMethod.Post), token);
+            return await HandleResponse<ApiKeyData>(response);
+        }
+
         public virtual async Task RevokeCurrentAPIKeyInfo(CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/api-keys/current", null, HttpMethod.Delete), token);
@@ -35,5 +45,14 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/api-keys/{apikey}", null, HttpMethod.Delete), token);
             await HandleResponse(response);
         }
+        public virtual async Task RevokeAPIKey(string userId, string apikey, CancellationToken token = default)
+        {
+            if (apikey == null)
+                throw new ArgumentNullException(nameof(apikey));
+            if (userId is null)
+                throw new ArgumentNullException(nameof(userId));
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{userId}/api-keys/{apikey}", null, HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Apps.cs

@@ -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.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/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,7 @@ 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 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/NotificationData.cs

@@ -6,6 +6,8 @@ namespace BTCPayServer.Client.Models
     public class NotificationData
     {
         public string Id { get; set; }
+        public string Identifier { get; set; }
+        public string Type { get; set; }
         public string Body { get; set; }
         public bool Seen { get; set; }
         public Uri Link { get; set; }

BTCPayServer.Client/Models/PaymentMethodCriteriaData.cs

@@ -0,0 +1,13 @@
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Client.Models;
+
+public class PaymentMethodCriteriaData
+{
+    public string PaymentMethod { get; set; }
+    public string CurrencyCode { get; set; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
+    public decimal Amount { get; set; }
+    public bool Above { get; set; }
+}

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -63,6 +63,9 @@ namespace BTCPayServer.Client.Models
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public NetworkFeeMode NetworkFeeMode { get; set; } = NetworkFeeMode.Never;
 
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public List<PaymentMethodCriteriaData> PaymentMethodCriteria { get; set; }
+
         public bool PayJoinEnabled { get; set; }
 
         public InvoiceData.ReceiptOptions Receipt { 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/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

@@ -28,6 +28,7 @@ namespace BTCPayServer.Client
         public const string CanViewNotificationsForUser = "btcpay.user.canviewnotificationsforuser";
         public const string CanViewUsers = "btcpay.server.canviewusers";
         public const string CanCreateUser = "btcpay.server.cancreateuser";
+        public const string CanManageUsers = "btcpay.server.canmanageusers";
         public const string CanDeleteUser = "btcpay.user.candeleteuser";
         public const string CanManagePullPayments = "btcpay.store.canmanagepullpayments";
         public const string CanCreatePullPayments = "btcpay.store.cancreatepullpayments";
@@ -73,6 +74,7 @@ namespace BTCPayServer.Client
                 yield return CanDepositToCustodianAccounts;
                 yield return CanWithdrawFromCustodianAccounts;
                 yield return CanTradeCustodianAccount;
+                yield return CanManageUsers;
             }
         }
         public static bool IsValidPolicy(string policy)
@@ -96,6 +98,37 @@ 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
     {
@@ -103,7 +136,7 @@ namespace BTCPayServer.Client
         {
             Init();
         }
-        
+
         public static Permission Create(string policy, string scope = null)
         {
             if (TryCreatePermission(policy, scope, out var r))
@@ -119,7 +152,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;
@@ -172,7 +205,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)
@@ -197,7 +230,8 @@ 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));
         }
 
@@ -206,20 +240,28 @@ namespace BTCPayServer.Client
         private static void Init()
         {
             PolicyHasChild(Policies.CanModifyStoreSettings,
-                Policies.CanManageCustodianAccounts, Policies.CanManagePullPayments, Policies.CanModifyInvoices, Policies.CanViewStoreSettings, Policies.CanModifyStoreWebhooks, Policies.CanModifyPaymentRequests );
-            
-            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, Policies.CanUseInternalLightningNode );
-            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  );
-            
+                Policies.CanManageCustodianAccounts,
+                Policies.CanManagePullPayments,
+                Policies.CanModifyInvoices,
+                Policies.CanViewStoreSettings,
+                Policies.CanModifyStoreWebhooks,
+                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,
+                Policies.CanUseInternalLightningNode,
+                Policies.CanManageUsers);
+            PolicyHasChild(Policies.CanUseInternalLightningNode, Policies.CanCreateLightningInvoiceInternalNode, Policies.CanViewLightningInvoiceInternalNode);
+            PolicyHasChild(Policies.CanManageCustodianAccounts, Policies.CanViewCustodianAccounts);
+            PolicyHasChild(Policies.CanModifyInvoices, Policies.CanViewInvoices, Policies.CanCreateInvoice, Policies.CanCreateLightningInvoiceInStore);
+            PolicyHasChild(Policies.CanViewStoreSettings, Policies.CanViewInvoices, Policies.CanViewPaymentRequests);
         }
 
         private static void PolicyHasChild(string policy, params string[] subPolicies)
@@ -233,33 +275,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.Data/ApplicationDbContext.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using BTCPayServer.Data.Data;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
@@ -30,7 +30,12 @@ namespace BTCPayServer.Data
         {
             _designTime = designTime;
         }
-
+#nullable enable
+        public async Task<string?> GetMigrationState()
+        {
+            return (await Settings.FromSqlRaw("SELECT \"Id\", \"Value\" FROM \"Settings\" WHERE \"Id\"='MigrationData'").AsNoTracking().FirstOrDefaultAsync())?.Value;
+        }
+#nullable restore
         public DbSet<AddressInvoiceData> AddressInvoices { get; set; }
         public DbSet<APIKeyData> ApiKeys { get; set; }
         public DbSet<AppData> Apps { get; set; }
@@ -69,6 +74,7 @@ namespace BTCPayServer.Data
         public DbSet<WebhookData> Webhooks { get; set; }
         public DbSet<LightningAddressData> LightningAddresses { get; set; }
         public DbSet<PayoutProcessorData> PayoutProcessors { get; set; }
+        public DbSet<FormData> Forms { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -83,23 +89,23 @@ namespace BTCPayServer.Data
 
             // some of the data models don't have OnModelCreating for now, commenting them
 
-            ApplicationUser.OnModelCreating(builder);
+            ApplicationUser.OnModelCreating(builder, Database);
             AddressInvoiceData.OnModelCreating(builder);
-            APIKeyData.OnModelCreating(builder);
+            APIKeyData.OnModelCreating(builder, Database);
             AppData.OnModelCreating(builder);
-            CustodianAccountData.OnModelCreating(builder);
+            CustodianAccountData.OnModelCreating(builder, Database);
             //StoredFile.OnModelCreating(builder);
             InvoiceEventData.OnModelCreating(builder);
             InvoiceSearchData.OnModelCreating(builder);
             InvoiceWebhookDeliveryData.OnModelCreating(builder);
-            InvoiceData.OnModelCreating(builder);
-            NotificationData.OnModelCreating(builder);
+            InvoiceData.OnModelCreating(builder, Database);
+            NotificationData.OnModelCreating(builder, Database);
             //OffchainTransactionData.OnModelCreating(builder);
             BTCPayServer.Data.PairedSINData.OnModelCreating(builder);
             PairingCodeData.OnModelCreating(builder);
             //PayjoinLock.OnModelCreating(builder);
-            PaymentRequestData.OnModelCreating(builder);
-            PaymentData.OnModelCreating(builder);
+            PaymentRequestData.OnModelCreating(builder, Database);
+            PaymentData.OnModelCreating(builder, Database);
             PayoutData.OnModelCreating(builder);
             PendingInvoiceData.OnModelCreating(builder);
             //PlannedTransaction.OnModelCreating(builder);
@@ -110,7 +116,7 @@ namespace BTCPayServer.Data
             StoreWebhookData.OnModelCreating(builder);
             StoreData.OnModelCreating(builder, Database);
             U2FDevice.OnModelCreating(builder);
-            Fido2Credential.OnModelCreating(builder);
+            Fido2Credential.OnModelCreating(builder, Database);
             BTCPayServer.Data.UserStore.OnModelCreating(builder);
             //WalletData.OnModelCreating(builder);
             WalletObjectData.OnModelCreating(builder, Database);
@@ -118,10 +124,11 @@ 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);
-            LightningAddressData.OnModelCreating(builder);
-            PayoutProcessorData.OnModelCreating(builder);
-            //WebhookData.OnModelCreating(builder);
+            WebhookDeliveryData.OnModelCreating(builder, Database);
+            LightningAddressData.OnModelCreating(builder, Database);
+            PayoutProcessorData.OnModelCreating(builder, Database);
+            WebhookData.OnModelCreating(builder, Database);
+            FormData.OnModelCreating(builder, Database);
 
 
             if (Database.IsSqlite() && !_designTime)

BTCPayServer.Data/Data/APIKeyData.cs

@@ -1,9 +1,11 @@
+using System;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class APIKeyData
+    public class APIKeyData : IHasBlob<APIKeyBlob>
     {
         [MaxLength(50)]
         public string Id { get; set; }
@@ -16,13 +18,15 @@ namespace BTCPayServer.Data
 
         public APIKeyType Type { get; set; } = APIKeyType.Legacy;
 
+        [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
+        public string Blob2 { get; set; }
         public StoreData StoreData { get; set; }
         public ApplicationUser User { get; set; }
         public string Label { get; set; }
 
 
-        internal static void OnModelCreating(ModelBuilder builder)
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<APIKeyData>()
                    .HasOne(o => o.StoreData)
@@ -36,6 +40,13 @@ namespace BTCPayServer.Data
 
             builder.Entity<APIKeyData>()
                 .HasIndex(o => o.StoreId);
+
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<APIKeyData>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
     }
 

BTCPayServer.Data/Data/ApplicationUser.cs

@@ -2,11 +2,13 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Data
 {
     // Add profile data for application users by adding properties to the ApplicationUser class
-    public class ApplicationUser : IdentityUser
+    public class ApplicationUser : IdentityUser, IHasBlob<UserBlob>
     {
         public bool RequiresEmailConfirmation { get; set; }
         public List<StoredFile> StoredFiles { get; set; }
@@ -20,15 +22,28 @@ namespace BTCPayServer.Data
         public List<UserStore> UserStores { get; set; }
         public List<Fido2Credential> Fido2Credentials { get; set; }
 
+        [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
+        public string Blob2 { get; set; }
 
         public List<IdentityUserRole<string>> UserRoles { get; set; }
 
-        public static void OnModelCreating(ModelBuilder builder)
+        public static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<ApplicationUser>()
                 .HasMany<IdentityUserRole<string>>(user => user.UserRoles)
                 .WithOne().HasForeignKey(role => role.UserId);
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<ApplicationUser>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
     }
+
+    public class UserBlob
+    {
+        public bool ShowInvoiceStatusChangeHint { get; set; }
+    }
 }

BTCPayServer.Data/Data/CustodianAccountData.cs

@@ -1,11 +1,13 @@
+using System;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Data;
 
-public class CustodianAccountData
+public class CustodianAccountData : IHasBlob<JObject>
 {
     [Required]
     [MaxLength(50)]
@@ -24,19 +26,29 @@ public class CustodianAccountData
     public string Name { get; set; }
 
     [JsonIgnore]
+    [Obsolete("Use Blob2 instead")]
     public byte[] Blob { get; set; }
+    [JsonIgnore]
+    public string Blob2 { get; set; }
 
     [JsonIgnore]
     public StoreData StoreData { get; set; }
 
-    internal static void OnModelCreating(ModelBuilder builder)
+    internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
     {
         builder.Entity<CustodianAccountData>()
             .HasOne(o => o.StoreData)
             .WithMany(i => i.CustodianAccounts)
             .HasForeignKey(i => i.StoreId).OnDelete(DeleteBehavior.Cascade);
 
-        builder.Entity<APIKeyData>()
+        builder.Entity<CustodianAccountData>()
             .HasIndex(o => o.StoreId);
+
+        if (databaseFacade.IsNpgsql())
+        {
+            builder.Entity<CustodianAccountData>()
+                .Property(o => o.Blob2)
+                .HasColumnType("JSONB");
+        }
     }
 }

BTCPayServer.Data/Data/Fido2Credential.cs

@@ -2,10 +2,11 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class Fido2Credential
+    public class Fido2Credential : IHasBlobUntyped
     {
         public string Name { get; set; }
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -14,6 +15,7 @@ namespace BTCPayServer.Data
         public string ApplicationUserId { get; set; }
 
         public byte[] Blob { get; set; }
+        public string Blob2 { get; set; }
         public CredentialType Type { get; set; }
         public enum CredentialType
         {
@@ -22,12 +24,18 @@ namespace BTCPayServer.Data
             [Display(Name = "Lightning node (LNURL Auth)")]
             LNURLAuth
         }
-        public static void OnModelCreating(ModelBuilder builder)
+        public static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<Fido2Credential>()
                 .HasOne(o => o.ApplicationUser)
                 .WithMany(i => i.Fido2Credentials)
                 .HasForeignKey(i => i.ApplicationUserId).OnDelete(DeleteBehavior.Cascade);
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<Fido2Credential>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
 
         public ApplicationUser ApplicationUser { get; set; }

BTCPayServer.Data/Data/FormData.cs

@@ -2,11 +2,30 @@ using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace BTCPayServer.Data.Data;
+namespace BTCPayServer.Data;
 
 public class FormData
 {
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     public string Id { get; set; }
     public string Name { get; set; }
+    public string StoreId { get; set; }
+    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>()
+                .Property(o => o.Config)
+                .HasColumnType("JSONB");
+        }
+    }
 }

BTCPayServer.Data/Data/IHasBlob.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Data
+{
+    public interface IHasBlob<T>
+    {
+        [Obsolete("Use Blob2 instead")]
+        byte[] Blob { get; set; }
+        string Blob2 { get; set; }
+    }
+    public interface IHasBlob
+    {
+        [Obsolete("Use Blob2 instead")]
+        byte[] Blob { get; set; }
+        string Blob2 { get; set; }
+        public Type Type { get; set; }
+    }
+    public interface IHasBlobUntyped
+    {
+        [Obsolete("Use Blob2 instead")]
+        byte[] Blob { get; set; }
+        string Blob2 { get; set; }
+    }
+}

BTCPayServer.Data/Data/InvoiceData.cs

@@ -2,10 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class InvoiceData
+    public class InvoiceData : IHasBlobUntyped
     {
         public string Id { get; set; }
 
@@ -16,7 +17,9 @@ namespace BTCPayServer.Data
         public List<PaymentData> Payments { get; set; }
         public List<InvoiceEventData> Events { get; set; }
 
+        [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
+        public string Blob2 { get; set; }
         public string ItemCode { get; set; }
         public string OrderId { get; set; }
         public string Status { get; set; }
@@ -32,7 +35,7 @@ namespace BTCPayServer.Data
         public RefundData CurrentRefund { get; set; }
 
 
-        internal static void OnModelCreating(ModelBuilder builder)
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<InvoiceData>()
                 .HasOne(o => o.StoreData)
@@ -42,6 +45,13 @@ namespace BTCPayServer.Data
             builder.Entity<InvoiceData>()
                 .HasOne(o => o.CurrentRefund);
             builder.Entity<InvoiceData>().HasIndex(o => o.Created);
+
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<InvoiceData>()
+                        .Property(o => o.Blob2)
+                        .HasColumnType("JSONB");
+            }
         }
     }
 }

BTCPayServer.Data/Data/LightingAddressData.cs

@@ -1,17 +1,22 @@
+using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Data;
 
-public class LightningAddressData
+public class LightningAddressData : IHasBlob<LightningAddressDataBlob>
 {
     public string Username { get; set; }
     public string StoreDataId { get; set; }
+    [Obsolete("Use Blob2 instead")]
     public byte[] Blob { get; set; }
+    public string Blob2 { get; set; }
 
     public StoreData Store { get; set; }
 
 
-    internal static void OnModelCreating(ModelBuilder builder)
+    internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
     {
         builder.Entity<LightningAddressData>()
             .HasOne(o => o.Store)
@@ -20,6 +25,12 @@ public class LightningAddressData
             .IsRequired()
             .OnDelete(DeleteBehavior.Cascade);
         builder.Entity<LightningAddressData>().HasKey(o => o.Username);
+        if (databaseFacade.IsNpgsql())
+        {
+            builder.Entity<LightningAddressData>()
+                .Property(o => o.Blob2)
+                .HasColumnType("JSONB");
+        }
     }
 }
 
@@ -28,4 +39,6 @@ public class LightningAddressDataBlob
     public string CurrencyCode { get; set; }
     public decimal? Min { get; set; }
     public decimal? Max { get; set; }
+
+    public JObject InvoiceMetadata { get; set; }
 }

BTCPayServer.Data/Data/NotificationData.cs

@@ -1,10 +1,12 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace BTCPayServer.Data
 {
-    public class NotificationData
+    public class NotificationData : IHasBlobUntyped
     {
         [MaxLength(36)]
         public string Id { get; set; }
@@ -17,15 +19,23 @@ namespace BTCPayServer.Data
         [Required]
         public string NotificationType { get; set; }
         public bool Seen { get; set; }
+        [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
+        public string Blob2 { get; set; }
 
 
-        internal static void OnModelCreating(ModelBuilder builder)
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<NotificationData>()
                 .HasOne(o => o.ApplicationUser)
                 .WithMany(n => n.Notifications)
                 .HasForeignKey(k => k.ApplicationUserId).OnDelete(DeleteBehavior.Cascade);
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<NotificationData>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
     }
 }

BTCPayServer.Data/Data/PaymentData.cs

@@ -1,24 +1,34 @@
+using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class PaymentData
+    public class PaymentData : IHasBlobUntyped
     {
         public string Id { get; set; }
         public string InvoiceDataId { get; set; }
         public InvoiceData InvoiceData { get; set; }
-
+        [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
+        public string Blob2 { get; set; }
+        public string Type { get; set; }
         public bool Accounted { get; set; }
 
 
-        internal static void OnModelCreating(ModelBuilder builder)
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<PaymentData>()
                    .HasOne(o => o.InvoiceData)
                    .WithMany(i => i.Payments).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<PaymentData>()
                    .HasIndex(o => o.InvoiceDataId);
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<PaymentData>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
     }
 }

BTCPayServer.Data/Data/PaymentRequestData.cs

@@ -1,9 +1,10 @@
 using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class PaymentRequestData
+    public class PaymentRequestData : IHasBlobUntyped
     {
         public string Id { get; set; }
         public DateTimeOffset Created { get; set; }
@@ -14,10 +15,12 @@ namespace BTCPayServer.Data
 
         public Client.Models.PaymentRequestData.PaymentRequestStatus Status { get; set; }
 
+        [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
+        public string Blob2 { get; set; }
 
 
-        internal static void OnModelCreating(ModelBuilder builder)
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<PaymentRequestData>()
                 .HasOne(o => o.StoreData)
@@ -28,6 +31,13 @@ namespace BTCPayServer.Data
                 .HasDefaultValue(new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero));
             builder.Entity<PaymentRequestData>()
                 .HasIndex(o => o.Status);
+
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<PaymentRequestData>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
     }
 }

BTCPayServer.Data/Data/PayoutProcessorData.cs

@@ -1,9 +1,15 @@
+using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace BTCPayServer.Data.Data;
+namespace BTCPayServer.Data;
 
-public class PayoutProcessorData
+public class AutomatedPayoutBlob
+{
+    public TimeSpan Interval { get; set; } = TimeSpan.FromHours(1);
+}
+public class PayoutProcessorData : IHasBlobUntyped
 {
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     public string Id { get; set; }
@@ -12,14 +18,22 @@ public class PayoutProcessorData
     public string PaymentMethod { get; set; }
     public string Processor { get; set; }
 
+    [Obsolete("Use Blob2 instead")]
     public byte[] Blob { get; set; }
+    public string Blob2 { get; set; }
 
-    internal static void OnModelCreating(ModelBuilder builder)
+    internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
     {
-
         builder.Entity<PayoutProcessorData>()
             .HasOne(o => o.Store)
             .WithMany(data => data.PayoutProcessors).OnDelete(DeleteBehavior.Cascade);
+
+        if (databaseFacade.IsNpgsql())
+        {
+            builder.Entity<PayoutProcessorData>()
+                .Property(o => o.Blob2)
+                .HasColumnType("JSONB");
+        }
     }
 
     public override string ToString()

BTCPayServer.Data/Data/StoreData.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
-using BTCPayServer.Data.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using PayoutProcessorData = BTCPayServer.Data.Data.PayoutProcessorData;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using PayoutProcessorData = BTCPayServer.Data.PayoutProcessorData;
 
 namespace BTCPayServer.Data
 {
@@ -49,6 +51,7 @@ namespace BTCPayServer.Data
         public IEnumerable<PayoutData> Payouts { get; set; }
         public IEnumerable<CustodianAccountData> CustodianAccounts { get; set; }
         public IEnumerable<StoreSettingData> Settings { get; set; }
+        public IEnumerable<FormData> Forms { get; set; }
 
         internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
@@ -62,6 +65,16 @@ namespace BTCPayServer.Data
                     .Property(o => o.DerivationStrategies)
                     .HasColumnType("JSONB");
             }
+            else if (databaseFacade.IsMySql())
+            {
+                builder.Entity<StoreData>()
+                    .Property(o => o.StoreBlob)
+                    .HasConversion(new ValueConverter<string, byte[]>
+                    (
+                        convertToProviderExpression: (str) => Encoding.UTF8.GetBytes(str),
+                        convertFromProviderExpression: (bytes) => Encoding.UTF8.GetString(bytes)
+                    ));
+            }
         }
     }
 }

BTCPayServer.Data/Data/WalletObjectData.cs

@@ -12,6 +12,13 @@ namespace BTCPayServer.Data
     {
         public class Types
         {
+            public static readonly HashSet<string> AllTypes;
+            static Types()
+            {
+                AllTypes = typeof(Types).GetFields()
+                    .Where(f => f.FieldType == typeof(string))
+                    .Select(f => (string)f.GetValue(null)).ToHashSet(StringComparer.OrdinalIgnoreCase);
+            }
             public const string Label = "label";
             public const string Tx = "tx";
             public const string Payjoin = "payjoin";

BTCPayServer.Data/Data/WebhookData.cs

@@ -1,15 +1,29 @@
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class WebhookData
+    public class WebhookData : IHasBlobUntyped
     {
         [Key]
         [MaxLength(25)]
         public string Id { get; set; }
-        [Required]
+        [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
+        public string Blob2 { get; set; }
         public List<WebhookDeliveryData> Deliveries { get; set; }
+
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
+        {
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<WebhookData>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
+        }
     }
 }

BTCPayServer.Data/Data/WebhookDeliveryData.cs

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

BTCPayServer.Data/Migrations/20220311135252_AddPayoutProcessors.cs

@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore;
@@ -17,20 +17,21 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<string>(
                 name: "StoreDataId",
                 table: "Payouts",
-                type: "TEXT",
-                nullable: true);
+                nullable: true,
+                maxLength: maxLength);
 
             migrationBuilder.CreateTable(
                 name: "PayoutProcessors",
                 columns: table => new
                 {
-                    Id = table.Column<string>(type: "TEXT", nullable: false),
-                    StoreId = table.Column<string>(type: "TEXT", nullable: true),
-                    PaymentMethod = table.Column<string>(type: "TEXT", nullable: true),
-                    Processor = table.Column<string>(type: "TEXT", nullable: true),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
+                    StoreId = table.Column<string>(nullable: true, maxLength: maxLength),
+                    PaymentMethod = table.Column<string>(nullable: true),
+                    Processor = table.Column<string>(nullable: true),
                     Blob = table.Column<byte[]>(nullable: true)
                 },
                 constraints: table =>

BTCPayServer.Data/Migrations/20220414132313_AddLightningAddress.cs

@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore;
@@ -17,12 +17,13 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "LightningAddresses",
                 columns: table => new
                 {
-                    Username = table.Column<string>(type: "TEXT", nullable: false),
-                    StoreDataId = table.Column<string>(type: "TEXT", nullable: false),
+                    Username = table.Column<string>(nullable: false, maxLength: maxLength),
+                    StoreDataId = table.Column<string>(nullable: false, maxLength: maxLength),
                     Blob = table.Column<byte[]>( nullable: true)
                 },
                 constraints: table =>

BTCPayServer.Data/Migrations/20220610090843_AddSettingsToStore.cs

@@ -14,12 +14,13 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxlength = migrationBuilder.IsMySql() ? 255 : null;
             migrationBuilder.CreateTable(
                 name: "StoreSettings",
                 columns: table => new
                 {
-                    Name = table.Column<string>(type: "TEXT", nullable: false),
-                    StoreId = table.Column<string>(type: "TEXT", nullable: false),
+                    Name = table.Column<string>(nullable: false, maxLength: maxlength),
+                    StoreId = table.Column<string>(nullable: false, maxLength: maxlength),
                     Value = table.Column<string>(type: migrationBuilder.IsNpgsql() ? "JSONB" : "TEXT", nullable: true)
                 },
                 constraints: table =>

BTCPayServer.Data/Migrations/20220929132704_label.cs

@@ -17,13 +17,15 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxlength = migrationBuilder.IsMySql() ? 255 : null;
+
             migrationBuilder.CreateTable(
                 name: "WalletObjects",
                 columns: table => new
                 {
-                    WalletId = table.Column<string>(type: "TEXT", nullable: false),
-                    Type = table.Column<string>(type: "TEXT", nullable: false),
-                    Id = table.Column<string>(type: "TEXT", nullable: false),
+                    WalletId = table.Column<string>(nullable: false, maxLength: maxlength),
+                    Type = table.Column<string>(nullable: false, maxLength: maxlength),
+                    Id = table.Column<string>(nullable: false, maxLength: maxlength),
                     Data = table.Column<string>(type: migrationBuilder.IsNpgsql() ? "JSONB" : "TEXT", nullable: true)
                 },
                 constraints: table =>
@@ -35,15 +37,17 @@ namespace BTCPayServer.Migrations
                 table: "WalletObjects",
                 columns: new[] { "Type", "Id" });
 
+
+            maxlength = migrationBuilder.IsMySql() ? 100 : null;
             migrationBuilder.CreateTable(
                 name: "WalletObjectLinks",
                 columns: table => new
                 {
-                    WalletId = table.Column<string>(type: "TEXT", nullable: false),
-                    AType = table.Column<string>(type: "TEXT", nullable: false),
-                    AId = table.Column<string>(type: "TEXT", nullable: false),
-                    BType = table.Column<string>(type: "TEXT", nullable: false),
-                    BId = table.Column<string>(type: "TEXT", nullable: false),
+                    WalletId = table.Column<string>(nullable: false, maxLength: maxlength),
+                    AType = table.Column<string>(nullable: false, maxLength: maxlength),
+                    AId = table.Column<string>(nullable: false, maxLength: maxlength),
+                    BType = table.Column<string>(nullable: false, maxLength: maxlength),
+                    BId = table.Column<string>(nullable: false, maxLength: maxlength),
                     Data = table.Column<string>(type: migrationBuilder.IsNpgsql() ? "JSONB" : "TEXT", nullable: true)
                 },
                 constraints: table =>

BTCPayServer.Data/Migrations/20230125085242_AddForms.cs

@@ -0,0 +1,54 @@
+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("20230125085242_AddForms")]
+    public partial class AddForms : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            int? maxlength = migrationBuilder.IsMySql() ? 255 : null;
+            migrationBuilder.CreateTable(
+                name: "Forms",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "TEXT", nullable: false, maxLength: maxlength),
+                    Name = table.Column<string>(type: "TEXT", nullable: true, maxLength: maxlength),
+                    StoreId = table.Column<string>(type: "TEXT", nullable: true, maxLength: maxlength),
+                    Config = table.Column<string>(type: migrationBuilder.IsNpgsql() ? "JSONB" : "TEXT", nullable: true),
+                    Public = table.Column<bool>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Forms", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Forms_Stores_StoreId",
+                        column: x => x.StoreId,
+                        principalTable: "Stores",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Forms_StoreId",
+                table: "Forms",
+                column: "StoreId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Forms");
+
+        }
+    }
+}

BTCPayServer.Data/Migrations/20230130040047_blob2.cs

@@ -0,0 +1,150 @@
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20230130040047_blob2")]
+    public partial class blob2 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var type = migrationBuilder.IsNpgsql() ? "JSONB" : "TEXT";
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "Webhooks",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "WebhookDeliveries",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "PaymentRequests",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "Notifications",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "LightningAddresses",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "Fido2Credentials",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "AspNetUsers",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "ApiKeys",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "Invoices",
+                type: type,
+                nullable: true);
+            migrationBuilder.AddColumn<string>(
+              name: "Blob2",
+              table: "Payments",
+              type: type,
+              nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "PayoutProcessors",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Blob2",
+                table: "CustodianAccount",
+                type: type,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Type",
+                table: "Payments",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "Webhooks");
+
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "WebhookDeliveries");
+
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "Notifications");
+
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "LightningAddresses");
+
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "Fido2Credentials");
+
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "AspNetUsers");
+
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "ApiKeys");
+
+            migrationBuilder.DropColumn(
+               name: "Blob2",
+                table: "Invoices");
+
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "Payments");
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "PayoutProcessors");
+
+            migrationBuilder.DropColumn(
+                name: "Blob2",
+                table: "CustodianAccount");
+
+            migrationBuilder.DropColumn(
+             name: "Type",
+             table: "Payments");
+        }
+    }
+}

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/ApplicationDbContextModelSnapshot.cs

@@ -45,6 +45,9 @@ namespace BTCPayServer.Migrations
                     b.Property<byte[]>("Blob")
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("Label")
                         .HasColumnType("TEXT");
 
@@ -109,6 +112,9 @@ namespace BTCPayServer.Migrations
                     b.Property<byte[]>("Blob")
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasColumnType("TEXT");
@@ -183,6 +189,9 @@ namespace BTCPayServer.Migrations
                     b.Property<byte[]>("Blob")
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("CustodianCode")
                         .IsRequired()
                         .HasMaxLength(50)
@@ -205,7 +214,32 @@ namespace BTCPayServer.Migrations
                     b.ToTable("CustodianAccount");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.Data.PayoutProcessorData", b =>
+            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()
@@ -242,6 +276,9 @@ namespace BTCPayServer.Migrations
                     b.Property<byte[]>("Blob")
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("Name")
                         .HasColumnType("TEXT");
 
@@ -266,6 +303,9 @@ namespace BTCPayServer.Migrations
                     b.Property<byte[]>("Blob")
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<DateTimeOffset>("Created")
                         .HasColumnType("TEXT");
 
@@ -376,6 +416,9 @@ namespace BTCPayServer.Migrations
                     b.Property<byte[]>("Blob")
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("StoreDataId")
                         .IsRequired()
                         .HasColumnType("TEXT");
@@ -401,6 +444,9 @@ namespace BTCPayServer.Migrations
                     b.Property<byte[]>("Blob")
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<DateTimeOffset>("Created")
                         .HasColumnType("TEXT");
 
@@ -512,9 +558,15 @@ namespace BTCPayServer.Migrations
                     b.Property<byte[]>("Blob")
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("InvoiceDataId")
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("Type")
+                        .HasColumnType("TEXT");
+
                     b.HasKey("Id");
 
                     b.HasIndex("InvoiceDataId");
@@ -533,6 +585,9 @@ namespace BTCPayServer.Migrations
                     b.Property<byte[]>("Blob")
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<DateTimeOffset>("Created")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("TEXT")
@@ -705,8 +760,8 @@ namespace BTCPayServer.Migrations
                     b.Property<int>("SpeedPolicy")
                         .HasColumnType("INTEGER");
 
-                    b.Property<byte[]>("StoreBlob")
-                        .HasColumnType("BLOB");
+                    b.Property<string>("StoreBlob")
+                        .HasColumnType("TEXT");
 
                     b.Property<byte[]>("StoreCertificate")
                         .HasColumnType("BLOB");
@@ -920,9 +975,11 @@ namespace BTCPayServer.Migrations
                         .HasColumnType("TEXT");
 
                     b.Property<byte[]>("Blob")
-                        .IsRequired()
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.HasKey("Id");
 
                     b.ToTable("Webhooks");
@@ -935,9 +992,11 @@ namespace BTCPayServer.Migrations
                         .HasColumnType("TEXT");
 
                     b.Property<byte[]>("Blob")
-                        .IsRequired()
                         .HasColumnType("BLOB");
 
+                    b.Property<string>("Blob2")
+                        .HasColumnType("TEXT");
+
                     b.Property<DateTimeOffset>("Timestamp")
                         .HasColumnType("TEXT");
 
@@ -1129,7 +1188,17 @@ namespace BTCPayServer.Migrations
                     b.Navigation("StoreData");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.Data.PayoutProcessorData", b =>
+            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")
@@ -1519,6 +1588,8 @@ namespace BTCPayServer.Migrations
 
                     b.Navigation("CustodianAccounts");
 
+                    b.Navigation("Forms");
+
                     b.Navigation("Invoices");
 
                     b.Navigation("LightningAddresses");

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/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

@@ -11,6 +11,7 @@ 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 +51,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
@@ -386,7 +388,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 +398,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 +586,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 +624,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 };
@@ -680,7 +683,7 @@ donation:
                 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);
@@ -735,7 +738,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";
@@ -756,7 +759,7 @@ noninventoryitem:
                         .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "inventoryitem").Result);
                     return Task.CompletedTask;
                 });
-                
+
                 //we already bought all available stock so this should fail
                 await Task.Delay(100);
                 Assert.IsType<RedirectToActionResult>(publicApps
@@ -819,13 +822,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,7 +846,7 @@ f:
 g:
   custom: topup
 ";
-                
+
                 Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
                 vmpos = await pos.UpdatePointOfSale(app.Id).AssertViewModelAsync<UpdatePointOfSaleViewModel>();
                 Assert.DoesNotContain("custom", vmpos.Template);
@@ -855,7 +858,7 @@ g:
                 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);
-                
+
                 Assert.IsType<RedirectToActionResult>(publicApps
                     .ViewPointOfSale(app.Id, PosViewType.Static, null, null, null, null, null, "g").Result);
                 invoices = user.BitPay.GetInvoices();

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="108.0.5359.7100" />
+    <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,14 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
 using BTCPayServer.Payments;
 using BTCPayServer.Tests.Logging;
 using BTCPayServer.Views.Stores;
 using NBitcoin;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Support.Extensions;
+using OpenQA.Selenium.Support.UI;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -31,9 +34,9 @@ namespace BTCPayServer.Tests
             s.GoToRegister();
             s.RegisterNewUser(true);
             s.CreateNewStore();
-            s.EnableCheckoutV2();
             s.AddLightningNode();
-            s.AddDerivationScheme();
+            // Use non-legacy derivation scheme
+            s.AddDerivationScheme("BTC", "tpubDD79XF4pzhmPSJ9AyUay9YbXAeD1c6nkUqC32pnKARJH6Ja5hGUfGc76V82ahXpsKqN6UcSGXMkzR34aZq4W23C6DAdZFaVrzWqzj24F8BC");
 
             // Configure store url
             var storeUrl = "https://satoshisteaks.com/";
@@ -41,15 +44,14 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("StoreWebsite")).SendKeys(storeUrl);
             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);
@@ -59,30 +61,53 @@ namespace BTCPayServer.Tests
             Assert.Equal(2, s.Driver.FindElements(By.CssSelector(".payment-method")).Count);
             Assert.Contains("Bitcoin", s.Driver.FindElement(By.CssSelector(".payment-method.active")).Text);
             Assert.Contains("LNURL", s.Driver.FindElement(By.CssSelector(".payment-method:nth-child(2)")).Text);
-            var payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href");
-            Assert.StartsWith("bitcoin:", payUrl);
+            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");
+            Assert.Equal($"bitcoin:{address}", payUrl);
+            Assert.StartsWith("bcrt", s.Driver.FindElement(By.Id("Address_BTC")).GetAttribute("value"));
             Assert.DoesNotContain("lightning=", payUrl);
-            
+            Assert.Equal(address, copyAddress);
+            Assert.Equal($"bitcoin:{address.ToUpperInvariant()}", qrValue);
+            s.Driver.ElementDoesNotExist(By.Id("Lightning_BTC"));
+
+            // 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.CssSelector(".btn-primary")).GetAttribute("href");
+                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"));
+                s.Driver.ElementDoesNotExist(By.Id("Address_BTC"));
             });
 
             // 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);
             Assert.Contains("Lightning", s.Driver.WaitForElement(By.CssSelector(".payment-method.active")).Text);
             Assert.Contains("Bitcoin", s.Driver.WaitForElement(By.CssSelector(".payment-method")).Text);
-            payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href");
-            Assert.StartsWith("lightning:lnbcrt", payUrl);
+            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");
+            Assert.Equal($"lightning:{address}", payUrl);
+            Assert.Equal(address, copyAddress);
+            Assert.Equal($"lightning:{address.ToUpperInvariant()}", qrValue);
+            s.Driver.ElementDoesNotExist(By.Id("Address_BTC"));
 
-            // Lightning amount in Sats
+            // Lightning amount in sats
             Assert.Contains("BTC", s.Driver.FindElement(By.Id("AmountDue")).Text);
             s.GoToHome();
             s.GoToLightningSettings();
@@ -90,7 +115,16 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("save")).Click();
             Assert.Contains("BTC Lightning settings successfully updated", s.FindAlertMessage().Text);
             s.GoToInvoiceCheckout(invoiceId);
-            Assert.Contains("Sats", s.Driver.FindElement(By.Id("AmountDue")).Text);
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
+            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"));
@@ -103,17 +137,18 @@ 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.True(s.Driver.ElementDoesNotExist(By.Id("ReceiptLink")));
+            Assert.True(s.Driver.ElementDoesNotExist(By.Id("receipt-btn")));
             Assert.Equal(storeUrl, s.Driver.FindElement(By.Id("StoreLink")).GetAttribute("href"));
 
             // Test payment
             s.GoToHome();
             invoiceId = s.CreateInvoice();
             s.GoToInvoiceCheckout(invoiceId);
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
 
             // Details
             s.Driver.ToggleCollapse("PaymentDetails");
@@ -123,83 +158,164 @@ 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);
-            var address = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
+            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);
 
             // 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("ReceiptLink"));
+            s.Driver.FindElement(By.Id("confetti"));
+            s.Driver.FindElement(By.Id("receipt-btn"));
             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);
 
             invoiceId = s.CreateInvoice();
             s.GoToInvoiceCheckout(invoiceId);
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
             Assert.Empty(s.Driver.FindElements(By.CssSelector(".payment-method")));
-            payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href");
-            Assert.StartsWith("bitcoin:", payUrl);
+            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");
+            Assert.StartsWith($"bitcoin:{address}?amount=", payUrl);
+            Assert.Contains("?amount=", payUrl);
             Assert.Contains("&lightning=", payUrl);
+            Assert.StartsWith("bcrt", copyAddressOnchain);
+            Assert.Equal(address, copyAddressOnchain);
+            Assert.StartsWith("lnbcrt", copyAddressLightning);
+            Assert.StartsWith($"bitcoin:{address.ToUpperInvariant()}?amount=", qrValue);
+            Assert.Contains("&lightning=LNBCRT", qrValue);
+
+            // 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();
             invoiceId = s.CreateInvoice(defaultPaymentMethod: "BTC_LightningLike");
             s.GoToInvoiceCheckout(invoiceId);
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
             Assert.Empty(s.Driver.FindElements(By.CssSelector(".payment-method")));
-            payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href");
+            payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
             Assert.StartsWith("bitcoin:", payUrl);
             Assert.Contains("&lightning=lnbcrt", payUrl);
 
-            // BIP21 with topup invoice
+            // 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);
+
+            // BIP21 with top-up invoice
             invoiceId = s.CreateInvoice(amount: null);
             s.GoToInvoiceCheckout(invoiceId);
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
             Assert.Empty(s.Driver.FindElements(By.CssSelector(".payment-method")));
-            payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href");
-            Assert.StartsWith("bitcoin:", payUrl);
-            Assert.DoesNotContain("&lightning=lnurl", payUrl);
+            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");
+            Assert.StartsWith($"bitcoin:{address}", payUrl);
+            Assert.Contains("?lightning=lnurl", payUrl);
+            Assert.DoesNotContain("amount=", payUrl);
+            Assert.StartsWith("bcrt", copyAddressOnchain);
+            Assert.Equal(address, copyAddressOnchain);
+            Assert.StartsWith("lnurl", copyAddressLightning);
+            Assert.StartsWith($"bitcoin:{address.ToUpperInvariant()}?lightning=LNURL", qrValue);
 
-            // Expiry message should not show amount for topup invoice
+            // 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"));
             expirySeconds.Clear();
             expirySeconds.SendKeys("5");
@@ -209,7 +325,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();
@@ -221,12 +337,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");
@@ -236,6 +353,42 @@ 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.FindElement(By.Id("save")).Click();
+            Assert.Contains("BTC Lightning settings successfully updated", s.FindAlertMessage().Text);
+
+            // Test:
+            // - NFC/LNURL-W available with just Lightning
+            // - BIP21 works correctly even though Lightning is default payment method
+            s.GoToHome();
+            invoiceId = s.CreateInvoice(defaultPaymentMethod: "BTC_LightningLike");
+            s.GoToInvoiceCheckout(invoiceId);
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
+            Assert.Empty(s.Driver.FindElements(By.CssSelector(".payment-method")));
+            payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
+            Assert.StartsWith("bitcoin:", payUrl);
+            Assert.Contains("&lightning=lnbcrt", payUrl);
+
+            // 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)]
@@ -246,7 +399,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

@@ -4,11 +4,11 @@ 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 +34,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 };
@@ -61,8 +59,8 @@ namespace BTCPayServer.Tests
             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 +77,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 +104,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 +112,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 +169,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 +192,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 +216,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 +225,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 +278,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

@@ -199,11 +199,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

@@ -51,7 +51,6 @@ namespace BTCPayServer.Tests
     {
         public FastTests(ITestOutputHelper helper) : base(helper)
         {
-
         }
         class DockerImage
         {
@@ -135,6 +134,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 +352,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 +538,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();
@@ -581,18 +607,35 @@ namespace BTCPayServer.Tests
             return new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero) + TimeSpan.FromDays(days);
         }
 
+        [Fact]
+        public void CanDetectImage()
+        {
+            Assert.True(FileTypeDetector.IsPicture(new byte[] { 0x42, 0x4D }, "test.bmp"));
+            Assert.False(FileTypeDetector.IsPicture(new byte[] { 0x42, 0x4D }, ".bmp"));
+            Assert.False(FileTypeDetector.IsPicture(new byte[] { 0x42, 0x4D }, "test.svg"));
+            Assert.True(FileTypeDetector.IsPicture(new byte[] { 0xFF, 0xD8, 0xFF, 0xD9 }, "test.jpg"));
+            Assert.True(FileTypeDetector.IsPicture(new byte[] { 0xFF, 0xD8, 0xFF, 0xD9 }, "test.jpeg"));
+            Assert.False(FileTypeDetector.IsPicture(new byte[] { 0xFF, 0xD8, 0xFF, 0xDA }, "test.jpg"));
+            Assert.False(FileTypeDetector.IsPicture(new byte[] { 0xFF, 0xD8, 0xFF }, "test.jpg"));
+            Assert.True(FileTypeDetector.IsPicture(new byte[] { 0x3C, 0x73, 0x76, 0x67 }, "test.svg"));
+            Assert.False(FileTypeDetector.IsPicture(new byte[] { 0x3C, 0x73, 0x76, 0x67 }, "test.jpg"));
+            Assert.False(FileTypeDetector.IsPicture(new byte[] { 0xFF }, "e.jpg"));
+            Assert.False(FileTypeDetector.IsPicture(new byte[] { }, "empty.jpg"));
+        }
+
         [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);
             }
@@ -690,22 +733,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(
@@ -713,28 +803,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
@@ -1202,21 +1290,14 @@ namespace BTCPayServer.Tests
                     {(null, new Dictionary<string, object>())},
                     {("", new Dictionary<string, object>())},
                     {("{}", new Dictionary<string, object>())},
-                    {("non-json-content", new Dictionary<string, object>() {{string.Empty, "non-json-content"}})},
-                    {("[1,2,3]", new Dictionary<string, object>() {{string.Empty, "[1,2,3]"}})},
                     {("{ \"key\": \"value\"}", new Dictionary<string, object>() {{"key", "value"}})},
-                    {("{ \"key\": true}", new Dictionary<string, object>() {{"key", "True"}})},
-                    {
-                        ("{ invalidjson file here}",
-                            new Dictionary<string, object>() {{String.Empty, "{ invalidjson file here}"}})
-                    },
                     // Duplicate keys should not crash things
                     {("{ \"key\": true, \"key\": true}", new Dictionary<string, object>() {{"key", "True"}})}
                 };
 
             testCases.ForEach(tuple =>
             {
-                Assert.Equal(tuple.expectedOutput, UIInvoiceController.PosDataParser.ParsePosData(tuple.input));
+                Assert.Equal(tuple.expectedOutput, UIInvoiceController.PosDataParser.ParsePosData(string.IsNullOrEmpty(tuple.input) ? null : JToken.Parse(tuple.input)));
             });
         }
         [Fact]
@@ -1457,14 +1538,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));
@@ -1706,7 +1787,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");
@@ -1790,6 +1871,70 @@ namespace BTCPayServer.Tests
                 }
             }
         }
+
+        [Fact]
+        public void CanParseMetadata()
+        {
+            var metadata = InvoiceMetadata.FromJObject(JObject.Parse("{\"posData\": {\"test\":\"a\"}}"));
+            Assert.Equal(JObject.Parse("{\"test\":\"a\"}").ToString(), metadata.PosDataLegacy);
+            Assert.Equal(JObject.Parse("{\"test\":\"a\"}").ToString(), metadata.PosData.ToString());
+
+            // Legacy, as string
+            metadata = InvoiceMetadata.FromJObject(JObject.Parse("{\"posData\": \"{\\\"test\\\":\\\"a\\\"}\"}"));
+            Assert.Equal("{\"test\":\"a\"}", metadata.PosDataLegacy);
+            Assert.Equal(JObject.Parse("{\"test\":\"a\"}").ToString(), metadata.PosData.ToString());
+
+            metadata = InvoiceMetadata.FromJObject(JObject.Parse("{\"posData\": \"nobject\"}"));
+            Assert.Equal("nobject", metadata.PosDataLegacy);
+            Assert.Null(metadata.PosData);
+
+            metadata = InvoiceMetadata.FromJObject(JObject.Parse("{\"posData\": null}"));
+            Assert.Null(metadata.PosDataLegacy);
+            Assert.Null(metadata.PosData);
+
+            metadata = InvoiceMetadata.FromJObject(JObject.Parse("{}"));
+            Assert.Null(metadata.PosDataLegacy);
+            Assert.Null(metadata.PosData);
+        }
+
+        [Fact]
+        public void CanParseInvoiceEntityDerivationStrategies()
+        {
+            // We have 3 ways of serializing the derivation strategies:
+            // through "derivationStrategy", through "derivationStrategies" as a string, through "derivationStrategies" as JObject
+            // Let's check that InvoiceEntity is similar in all cases.
+            var legacy = new JObject()
+            {
+                ["derivationStrategy"] = "tpubDDLQZ1WMdy5YJAJWmRNoTJ3uQkavEPXCXnmD4eAuo9BKbzFUBbJmVHys5M3ku4Qw1C165wGpVWH55gZpHjdsCyntwNzhmCAzGejSL6rzbyf"
+            };
+            var scheme = DerivationSchemeSettings.Parse("tpubDDLQZ1WMdy5YJAJWmRNoTJ3uQkavEPXCXnmD4eAuo9BKbzFUBbJmVHys5M3ku4Qw1C165wGpVWH55gZpHjdsCyntwNzhmCAzGejSL6rzbyf", new BTCPayNetworkProvider(ChainName.Regtest).BTC);
+
+            scheme.Source = "ManualDerivationScheme";
+            scheme.AccountOriginal = "tpubDDLQZ1WMdy5YJAJWmRNoTJ3uQkavEPXCXnmD4eAuo9BKbzFUBbJmVHys5M3ku4Qw1C165wGpVWH55gZpHjdsCyntwNzhmCAzGejSL6rzbyf";
+            var legacy2 = new JObject()
+            {
+                ["derivationStrategies"] = scheme.ToJson()
+            };
+
+            var newformat = new JObject()
+            {
+                ["derivationStrategies"] = JObject.Parse(scheme.ToJson())
+            };
+
+            //new BTCPayNetworkProvider(ChainName.Regtest)
+#pragma warning disable CS0618 // Type or member is obsolete
+            var formats = new[] { legacy, legacy2, newformat }
+            .Select(o =>
+            {
+                var entity = JsonConvert.DeserializeObject<InvoiceEntity>(o.ToString());
+                entity.Networks = new BTCPayNetworkProvider(ChainName.Regtest);
+                return entity.DerivationStrategies.ToString();
+            })
+            .ToHashSet();
+#pragma warning restore CS0618 // Type or member is obsolete
+            Assert.Single(formats);
+        }
+
         [Fact]
         public void PaymentMethodIdConverterIsGraceful()
         {

BTCPayServer.Tests/FormTests.cs

@@ -0,0 +1,198 @@
+using System.Collections.Generic;
+using System.Linq;
+using BTCPayServer.Abstractions.Form;
+using BTCPayServer.Forms;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json.Linq;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace BTCPayServer.Tests;
+
+[Trait("Fast", "Fast")]
+public class FormTests : UnitTestBase
+{
+    public FormTests(ITestOutputHelper helper) : base(helper)
+    {
+    }
+
+    [Fact]
+    public void CanParseForm()
+    {
+        var form = new Form()
+        {
+            Fields = new List<Field>
+            {
+                Field.Create("Enter your email", "item1", 1.ToString(), true, null, "email"),
+                Field.Create("Name", "item2", 2.ToString(), true, null),
+                Field.Create("Name", "invoice_test", 2.ToString(), true, null),
+                new Field
+                {
+                    Name = "invoice",
+                    Type = "fieldset",
+                    Fields = new List<Field>
+                    {
+                        Field.Create("Name", "test", 3.ToString(), true, null),
+                        Field.Create("Name", "item4", 4.ToString(), true, null),
+                        Field.Create("Name", "item5", 5.ToString(), true, 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
+        {
+            Fields = new List<Field>
+            {
+                Field.Create("Enter your email", "item1", 1.ToString(), true, null, "email"),
+                Field.Create("Name", "item2", 2.ToString(), true, null),
+                Field.Create("Name", "invoice_item3", 2.ToString(), true, null),
+                new Field
+                {
+                    Name = "invoice",
+                    Type = "fieldset",
+                    Fields = new List<Field> {Field.Create("Name", "test", 3.ToString(), true, null),}
+                }
+            }
+        };
+
+
+        Assert.True(service.IsFormSchemaValid(form.ToString(), out _, out _));
+        form.ApplyValuesFromForm(new FormCollection(new Dictionary<string, StringValues>()
+        {
+            {"item1", new StringValues("updated")},
+            {"item2", new StringValues("updated")},
+            {"invoice_item3", new StringValues("updated")},
+            {"invoice_test", new StringValues("updated")}
+        }));
+        foreach (var f in form.GetAllFields())
+        {
+            if (f.Field.Type == "fieldset")
+                continue;
+            Assert.Equal("updated", f.Field.Value);
+        }
+
+        form = new Form()
+        {
+            Fields = new List<Field>
+            {
+                Field.Create("Enter your email", "item1", 1.ToString(), true, null, "email"),
+                Field.Create("Name", "item2", 2.ToString(), true, null),
+                Field.Create("Name", "invoice_item3", 2.ToString(), true, null),
+                new Field
+                {
+                    Name = "invoice",
+                    Type = "fieldset",
+                    Fields = new List<Field>
+                    {
+                        new() {Name = "test", Type = "text", Constant = true, Value = "original"}
+                    }
+                }
+            }
+        };
+        form.ApplyValuesFromForm(new FormCollection(new Dictionary<string, StringValues>()
+        {
+            {"item1", new StringValues("updated")},
+            {"item2", new StringValues("updated")},
+            {"invoice_item3", new StringValues("updated")},
+            {"invoice_test", new StringValues("updated")}
+        }));
+
+        foreach (var f in form.GetAllFields())
+        {
+            var field = f.Field;
+            if (field.Type == "fieldset")
+                continue;
+            switch (f.FullName)
+            {
+                case "invoice_test":
+                    Assert.Equal("original", field.Value);
+                    break;
+                default:
+                    Assert.Equal("updated", field.Value);
+                    break;
+            }
+        }
+
+        form = new Form()
+        {
+            Fields = new List<Field>
+            {
+                Field.Create("Enter your email", "item1", 1.ToString(), true, null, "email"),
+                Field.Create("Name", "item2", 2.ToString(), true, null),
+                Field.Create("Name", "invoice_item3", 2.ToString(), true, null),
+                new Field
+                {
+                    Name = "invoice",
+                    Type = "fieldset",
+                    Constant = true,
+                    Fields = new List<Field>
+                    {
+                        new() {Name = "test", Type = "text", Value = "original"}
+                    }
+                }
+            }
+        };
+        form.ApplyValuesFromForm(new FormCollection(new Dictionary<string, StringValues>()
+        {
+            {"item1", new StringValues("updated")},
+            {"item2", new StringValues("updated")},
+            {"invoice_item3", new StringValues("updated")},
+            {"invoice_test", new StringValues("updated")}
+        }));
+
+        foreach (var f in form.GetAllFields())
+        {
+            var field = f.Field;
+            if (field.Type == "fieldset")
+                continue;
+            switch (f.FullName)
+            {
+                case "invoice_test":
+                    Assert.Equal("original", field.Value);
+                    break;
+                default:
+                    Assert.Equal("updated", field.Value);
+                    break;
+            }
+        }
+
+        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 = service.GetValues(form);
+        Assert.Equal("original", obj["invoice"]["test"].Value<string>());
+        Assert.Equal("updated", obj["invoice_item3"].Value<string>());
+
+        form = new Form()
+        {
+            Fields = new List<Field>(){
+                new Field
+                {
+                    Type = "fieldset",
+                    Fields = new List<Field>
+                    {
+                        new() {Name = "test", Type = "text"}
+                    }
+                }
+            }
+        };
+        form.SetValues(obj);
+        obj = service.GetValues(form);
+        Assert.Null(obj["test"].Value<string>());
+        form.SetValues(new JObject { ["test"] = "hello" });
+        obj = service.GetValues(form);
+        Assert.Equal("hello", obj["test"].Value<string>());
+    }
+
+    private void Clear(Form form)
+    {
+        foreach (var f in form.Fields.Where(f => !f.Constant))
+            f.Value = null;
+    }
+}

BTCPayServer.Tests/GreenfieldAPITests.cs

@@ -15,12 +15,15 @@ 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 Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Hosting;
 using NBitcoin;
 using NBitpayClient;
 using Newtonsoft.Json;
@@ -190,6 +193,43 @@ namespace BTCPayServer.Tests
 
             await unrestricted.RevokeAPIKey(apiKey.ApiKey);
             await AssertAPIError("apikey-not-found", () => unrestricted.RevokeAPIKey(apiKey.ApiKey));
+
+
+            // Admin create API key to new user
+            acc = tester.NewAccount();
+            await acc.GrantAccessAsync(isAdmin: true);
+            unrestricted = await acc.CreateClient();
+            var newUser = await unrestricted.CreateUser(new CreateApplicationUserRequest() { Email = Utils.GenerateEmail(), Password = "Kitten0@" });
+            var newUserAPIKey = await unrestricted.CreateAPIKey(newUser.Id, new CreateApiKeyRequest()
+            {
+                Label = "Hello world",
+                Permissions = new Permission[] { Permission.Create(Policies.CanViewProfile) }
+            });
+            var newUserClient = acc.CreateClientFromAPIKey(newUserAPIKey.ApiKey);
+            Assert.Equal(newUser.Id, (await newUserClient.GetCurrentUser()).Id);
+            // Admin delete it
+            await unrestricted.RevokeAPIKey(newUser.Id, newUserAPIKey.ApiKey);
+            await Assert.ThrowsAsync<GreenfieldAPIException>(() => newUserClient.GetCurrentUser());
+
+            // Admin create store
+            var store = await unrestricted.CreateStore(new CreateStoreRequest() { Name = "Pouet lol" });
+
+            // Grant right to another user
+            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 newUserClient.GetInvoices(store.Id);
         }
 
         [Fact(Timeout = TestTimeout)]
@@ -265,7 +305,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");
             });
 
@@ -414,7 +455,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"
@@ -425,10 +466,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");
             });
 
@@ -451,7 +494,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);
             });
         }
@@ -475,8 +519,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" });
 
@@ -507,7 +551,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);
@@ -655,15 +699,8 @@ namespace BTCPayServer.Tests
             tester.PayTester.DisableRegistration = true;
             await tester.StartAsync();
             var unauthClient = new BTCPayServerClient(tester.PayTester.ServerUri);
-            await AssertValidationError(new[] { "Email", "Password" },
+            await AssertValidationError(new[] { "Email" },
                 async () => await unauthClient.CreateUser(new CreateApplicationUserRequest()));
-            await AssertValidationError(new[] { "Password" },
-                async () => await unauthClient.CreateUser(
-                    new CreateApplicationUserRequest() { Email = "test@gmail.com" }));
-            // Pass too simple
-            await AssertValidationError(new[] { "Password" },
-                async () => await unauthClient.CreateUser(
-                    new CreateApplicationUserRequest() { Email = "test3@gmail.com", Password = "a" }));
 
             // We have no admin, so it should work
             var user1 = await unauthClient.CreateUser(
@@ -1036,7 +1073,7 @@ namespace BTCPayServer.Tests
             var lnrURLs = await unauthenticated.GetPullPaymentLNURL(test4.Id);
             Assert.IsType<string>(lnrURLs.LNURLBech32);
             Assert.IsType<string>(lnrURLs.LNURLUri);
-            
+
             //permission test around auto approved pps and payouts
             var nonApproved = await acc.CreateClient(Policies.CanCreateNonApprovedPullPayments);
             var approved = await acc.CreateClient(Policies.CanCreatePullPayments);
@@ -1061,7 +1098,7 @@ namespace BTCPayServer.Tests
                     Destination = new Key().GetAddress(ScriptPubKeyType.TaprootBIP86, Network.RegTest).ToString()
                 });
             });
-            
+
             var pullPayment = await approved.CreatePullPayment(acc.StoreId, new CreatePullPaymentRequest()
             {
                 Amount = 100,
@@ -1070,7 +1107,7 @@ namespace BTCPayServer.Tests
                 PaymentMethods = new[] { "BTC" },
                 AutoApproveClaims = true
             });
-            
+
             var p = await approved.CreatePayout(acc.StoreId, new CreatePayoutThroughStoreRequest()
             {
                 Amount = 100,
@@ -1224,9 +1261,33 @@ namespace BTCPayServer.Tests
             var newStore = await client.CreateStore(new CreateStoreRequest() { Name = "A" });
 
             //update store
-            var updatedStore = await client.UpdateStore(newStore.Id, new UpdateStoreRequest() { Name = "B" });
+            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>()
+            {
+                new()
+                {
+                    Amount = 10,
+                    Above = true,
+                    PaymentMethod = "BTC",
+                    CurrencyCode = "USD"
+                }
+             }
+            });
             Assert.Equal("B", updatedStore.Name);
-            Assert.Equal("B", (await client.GetStore(newStore.Id)).Name);
+            var s = (await client.GetStore(newStore.Id));
+            Assert.Equal("B", s.Name);
+            var pmc = Assert.Single(s.PaymentMethodCriteria);
+            //check that pmc equals the one we set
+            Assert.Equal(10, pmc.Amount);
+            Assert.True(pmc.Above);
+            Assert.Equal("BTC", pmc.PaymentMethod);
+            Assert.Equal("USD", pmc.CurrencyCode);
+            updatedStore = await client.UpdateStore(newStore.Id, new UpdateStoreRequest() { Name = "B" });
+            Assert.Empty(newStore.PaymentMethodCriteria);
 
             //list stores
             var stores = await client.GetStores();
@@ -1255,15 +1316,21 @@ 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";
             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)
@@ -1347,10 +1414,6 @@ namespace BTCPayServer.Tests
                     Password = Guid.NewGuid().ToString()
                 }));
 
-            await AssertValidationError(new[] { "Password" }, async () =>
-                await clientServer.CreateUser(
-                    new CreateApplicationUserRequest() { Email = $"{Guid.NewGuid()}@g.com", }));
-
             await AssertValidationError(new[] { "Email" }, async () =>
                 await clientServer.CreateUser(
                     new CreateApplicationUserRequest() { Password = Guid.NewGuid().ToString() }));
@@ -1414,6 +1477,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
@@ -1707,7 +1771,9 @@ namespace BTCPayServer.Tests
                 var db = tester.PayTester.GetService<Data.ApplicationDbContextFactory>();
                 using var ctx = db.CreateContext();
                 var dbInvoice = await ctx.Invoices.FindAsync(oldInvoice.Id);
+#pragma warning disable CS0618 // Type or member is obsolete
                 dbInvoice.Blob = ZipUtils.Zip(invoiceV1);
+#pragma warning restore CS0618 // Type or member is obsolete
                 await ctx.SaveChangesAsync();
                 var newInvoice = await AssertInvoiceMetadata();
 
@@ -2009,7 +2075,7 @@ namespace BTCPayServer.Tests
 
             //get
             var invoice = await viewOnly.GetInvoice(user.StoreId, newInvoice.Id);
-            Assert.Equal(newInvoice.Metadata, invoice.Metadata);
+            Assert.True(JObject.DeepEquals(newInvoice.Metadata, invoice.Metadata));
             var paymentMethods = await viewOnly.GetInvoicePaymentMethods(user.StoreId, newInvoice.Id);
             Assert.Single(paymentMethods);
             var paymentMethod = paymentMethods.First();
@@ -2277,10 +2343,10 @@ 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);
@@ -2349,7 +2415,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);
@@ -2388,7 +2454,7 @@ 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);
@@ -2434,7 +2500,7 @@ 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,
                 new CreateInvoiceRequest
@@ -2449,12 +2515,12 @@ namespace BTCPayServer.Tests
                 });
             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"));
@@ -3139,7 +3205,7 @@ namespace BTCPayServer.Tests
 
         }
 
-        [Fact(Timeout =TestTimeout)]
+        [Fact(Timeout = TestTimeout)]
         [Trait("Integration", "Integration")]
         public async Task StoreLightningAddressesAPITests()
         {
@@ -3151,14 +3217,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
@@ -3167,8 +3233,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());
 
@@ -3179,8 +3245,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)]
@@ -3346,8 +3412,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 =
@@ -3432,8 +3498,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));
@@ -3446,8 +3512,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 () =>
             {
@@ -3457,8 +3525,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());
@@ -3466,8 +3535,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());
@@ -3652,7 +3723,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);
@@ -3887,7 +3958,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;
 
@@ -3927,28 +3997,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
@@ -3975,17 +4045,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
@@ -3995,18 +4061,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);
@@ -4014,30 +4080,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);
@@ -4057,66 +4123,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
@@ -4124,12 +4217,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);
 
@@ -4143,10 +4235,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

@@ -2,10 +2,9 @@ using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Data;
 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;
@@ -32,10 +31,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 };

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,8 +87,15 @@ namespace BTCPayServer.Tests
             Driver.AssertNoError();
         }
 
-        public void PayInvoice(bool mine = false)
+        public void PayInvoice(bool mine = false, decimal? amount = null)
         {
+
+            if (amount is not null)
+            {
+                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)
             {
@@ -187,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)
@@ -549,7 +563,7 @@ namespace BTCPayServer.Tests
             walletId ??= WalletId;
             GoToWallet(walletId, WalletsNavPages.Receive);
             Driver.FindElement(By.Id("generateButton")).Click();
-            var addressStr = Driver.FindElement(By.Id("address")).GetAttribute("value");
+            var addressStr = Driver.FindElement(By.Id("Address")).GetAttribute("value");
             var address = BitcoinAddress.Create(addressStr, ((BTCPayNetwork)Server.NetworkProvider.GetNetwork(walletId.CryptoCode)).NBitcoinNetwork);
             for (var i = 0; i < coins; i++)
             {

BTCPayServer.Tests/SeleniumTests.cs

@@ -2,19 +2,22 @@ using System;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Models;
+using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
+using BTCPayServer.Controllers;
 using BTCPayServer.Data;
 using BTCPayServer.Lightning;
+using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
-using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Wallets;
 using BTCPayServer.Views.Manage;
 using BTCPayServer.Views.Server;
@@ -26,6 +29,7 @@ using Microsoft.EntityFrameworkCore;
 using NBitcoin;
 using NBitcoin.DataEncoders;
 using NBitcoin.Payment;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.Extensions;
@@ -74,8 +78,7 @@ namespace BTCPayServer.Tests
             s.GenerateWallet(isHotWallet: true);
 
             // Point Of Sale
-            s.Driver.FindElement(By.Id("StoreNav-CreateApp")).Click();
-            new SelectElement(s.Driver.FindElement(By.Id("SelectedAppType"))).SelectByValue("PointOfSale");
+            s.Driver.FindElement(By.Id("StoreNav-CreatePointOfSale")).Click();
             s.Driver.FindElement(By.Id("AppName")).SendKeys(Guid.NewGuid().ToString());
             s.Driver.FindElement(By.Id("Create")).Click();
             Assert.Contains("App successfully created", s.FindAlertMessage().Text);
@@ -115,8 +118,73 @@ namespace BTCPayServer.Tests
 
             s.Driver.FindElement(By.Name("buyerEmail")).SendKeys("aa@aa.com");
             s.Driver.FindElement(By.CssSelector("input[type='submit']")).Click();
+            invoiceId = s.Driver.Url.Split('/').Last();
             s.Driver.Navigate().GoToUrl(editUrl);
             Assert.Contains("aa@aa.com", s.Driver.PageSource);
+            var invoice = await s.Server.PayTester.GetService<InvoiceRepository>().GetInvoice(invoiceId);
+            Assert.Equal("aa@aa.com", invoice.Metadata.BuyerEmail);
+
+            //Custom Forms
+            s.GoToStore(StoreNavPages.Forms);
+            Assert.Contains("There are no forms yet.", s.Driver.PageSource);
+            s.Driver.FindElement(By.Id("CreateForm")).Click();
+            s.Driver.FindElement(By.Name("Name")).SendKeys("Custom Form 1");
+            s.Driver.FindElement((By.CssSelector("[data-form-template='email']"))).Click();
+            var emailtemplate = s.Driver.FindElement(By.Name("FormConfig")).GetAttribute("value");
+            Assert.Contains("buyerEmail", emailtemplate);
+            s.Driver.FindElement(By.Name("FormConfig")).Clear();
+            s.Driver.FindElement(By.Name("FormConfig"))
+                .SendKeys(emailtemplate.Replace("Enter your email", "CustomFormInputTest"));
+            s.Driver.FindElement(By.Id("SaveButton")).Click();
+            s.Driver.FindElement(By.Id("ViewForm")).Click();
+
+
+            var formurl = s.Driver.Url;
+            Assert.Contains("CustomFormInputTest", s.Driver.PageSource);
+            s.Driver.FindElement(By.Name("buyerEmail")).SendKeys("aa@aa.com");
+            s.Driver.FindElement(By.CssSelector("input[type='submit']")).Click();
+            s.PayInvoice(true);
+            var result = await s.Server.PayTester.HttpClient.GetAsync(formurl);
+            Assert.Equal(HttpStatusCode.NotFound, result.StatusCode);
+
+            s.GoToHome();
+            s.GoToStore(StoreNavPages.Forms);
+            Assert.Contains("Custom Form 1", s.Driver.PageSource);
+            s.Driver.FindElement(By.LinkText("Remove")).Click();
+            s.Driver.WaitForElement(By.Id("ConfirmInput")).SendKeys("DELETE");
+            s.Driver.FindElement(By.Id("ConfirmContinue")).Click();
+
+            Assert.DoesNotContain("Custom Form 1", s.Driver.PageSource);
+            s.Driver.FindElement(By.Id("CreateForm")).Click();
+            s.Driver.FindElement(By.Name("Name")).SendKeys("Custom Form 2");
+            s.Driver.FindElement((By.CssSelector("[data-form-template='email']"))).Click();
+            s.Driver.SetCheckbox(By.Name("Public"), true);
+
+            s.Driver.FindElement(By.Name("FormConfig")).Clear();
+            s.Driver.FindElement(By.Name("FormConfig"))
+                .SendKeys(emailtemplate.Replace("Enter your email", "CustomFormInputTest2"));
+            s.Driver.FindElement(By.Id("SaveButton")).Click();
+            s.Driver.FindElement(By.Id("ViewForm")).Click();
+            formurl = s.Driver.Url;
+            result = await s.Server.PayTester.HttpClient.GetAsync(formurl);
+            Assert.NotEqual(HttpStatusCode.NotFound, result.StatusCode);
+
+            s.GoToHome();
+            s.GoToStore(StoreNavPages.Forms);
+            Assert.Contains("Custom Form 2", s.Driver.PageSource);
+
+            s.Driver.FindElement(By.LinkText("Custom Form 2")).Click();
+
+            s.Driver.FindElement(By.Name("Name")).Clear();
+            s.Driver.FindElement(By.Name("Name")).SendKeys("Custom Form 3");
+            s.Driver.FindElement(By.Id("SaveButton")).Click();
+            s.GoToStore(StoreNavPages.Forms);
+            Assert.Contains("Custom Form 3", s.Driver.PageSource);
+
+            s.Driver.FindElement(By.Id("StoreNav-PaymentRequests")).Click();
+            s.Driver.FindElement(By.Id("CreatePaymentRequest")).Click();
+            Assert.Equal(4, new SelectElement(s.Driver.FindElement(By.Id("FormId"))).Options.Count);
+
         }
 
         [Fact(Timeout = TestTimeout)]
@@ -403,7 +471,7 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("Rules_0__To")).SendKeys("test@gmail.com");
             s.Driver.FindElement(By.Id("Rules_0__CustomerEmail")).Click();
             s.Driver.FindElement(By.Id("Rules_0__Subject")).SendKeys("Thanks!");
-            s.Driver.FindElement(By.Id("Rules_0__Body")).SendKeys("Your invoice is settled");
+            s.Driver.FindElement(By.ClassName("note-editable")).SendKeys("Your invoice is settled");
             s.Driver.FindElement(By.Id("SaveEmailRules")).Click();
             Assert.Contains("Store email rules saved", s.FindAlertMessage().Text);
         }
@@ -515,8 +583,7 @@ namespace BTCPayServer.Tests
                 Assert.DoesNotContain("invoice-processing", s.Driver.PageSource);
             });
 
-            Assert.Contains(s.Server.PayTester.GetService<CurrencyNameTable>().DisplayFormatCurrency(100, "USD"),
-                s.Driver.PageSource);
+            Assert.Contains("100.00 USD", s.Driver.PageSource);
             Assert.Contains(i, s.Driver.PageSource);
 
             s.GoToInvoices(s.StoreId);
@@ -529,7 +596,7 @@ namespace BTCPayServer.Tests
             s.GoToInvoices(s.StoreId);
             s.GoToInvoiceCheckout(i);
             var checkouturi = s.Driver.Url;
-            s.PayInvoice();
+            s.PayInvoice(mine: true);
             TestUtils.Eventually(() =>
             {
                 s.Driver.Navigate().Refresh();
@@ -539,7 +606,7 @@ namespace BTCPayServer.Tests
             {
                 s.Driver.Navigate().Refresh();
                 Assert.DoesNotContain("invoice-unsettled", s.Driver.PageSource);
-                Assert.Contains("invoice-processing", s.Driver.PageSource);
+                Assert.Contains("\"PaymentDetails\"", s.Driver.PageSource);
             });
             s.GoToUrl(checkouturi);
 
@@ -769,6 +836,105 @@ namespace BTCPayServer.Tests
             AssertUrlHasPairingCode(s);
         }
 
+        [Fact(Timeout = TestTimeout)]
+        public async Task CookieReflectProperPermissions()
+        {
+            using var s = CreateSeleniumTester();
+            await s.StartAsync();
+            var alice = s.Server.NewAccount();
+            alice.Register(false);
+            await alice.CreateStoreAsync();
+            var bob = s.Server.NewAccount();
+            await bob.CreateStoreAsync();
+            await bob.AddGuest(alice.UserId);
+
+            s.GoToLogin();
+            s.LogIn(alice.Email, alice.Password);
+            s.GoToUrl($"/cheat/permissions/stores/{bob.StoreId}");
+            var pageSource = s.Driver.PageSource;
+            AssertPermissions(pageSource, true,
+                new[]
+                {
+                    Policies.CanViewInvoices,
+                    Policies.CanModifyInvoices,
+                    Policies.CanViewPaymentRequests,
+                    Policies.CanViewStoreSettings,
+                    Policies.CanModifyStoreSettingsUnscoped,
+                    Policies.CanDeleteUser
+                });
+            AssertPermissions(pageSource, false,
+             new[]
+             {
+                    Policies.CanModifyStoreSettings,
+                    Policies.CanCreateNonApprovedPullPayments,
+                    Policies.CanCreatePullPayments,
+                    Policies.CanManagePullPayments,
+                    Policies.CanModifyServerSettings
+             });
+
+            s.GoToUrl($"/cheat/permissions/stores/{alice.StoreId}");
+            pageSource = s.Driver.PageSource;
+
+            AssertPermissions(pageSource, true,
+                new[]
+                {
+                    Policies.CanViewInvoices,
+                    Policies.CanModifyInvoices,
+                    Policies.CanViewPaymentRequests,
+                    Policies.CanViewStoreSettings,
+                    Policies.CanModifyStoreSettingsUnscoped,
+                    Policies.CanDeleteUser,
+                    Policies.CanModifyStoreSettings,
+                    Policies.CanCreateNonApprovedPullPayments,
+                    Policies.CanCreatePullPayments,
+                    Policies.CanManagePullPayments
+                });
+            AssertPermissions(pageSource, false,
+             new[]
+             {
+                    Policies.CanModifyServerSettings
+             });
+
+            await alice.MakeAdmin();
+            s.Logout();
+            s.GoToLogin();
+            s.LogIn(alice.Email, alice.Password);
+            s.GoToUrl($"/cheat/permissions/stores/{alice.StoreId}");
+            pageSource = s.Driver.PageSource;
+
+            AssertPermissions(pageSource, true,
+            new[]
+            {
+                    Policies.CanViewInvoices,
+                    Policies.CanModifyInvoices,
+                    Policies.CanViewPaymentRequests,
+                    Policies.CanViewStoreSettings,
+                    Policies.CanModifyStoreSettingsUnscoped,
+                    Policies.CanDeleteUser,
+                    Policies.CanModifyStoreSettings,
+                    Policies.CanCreateNonApprovedPullPayments,
+                    Policies.CanCreatePullPayments,
+                    Policies.CanManagePullPayments,
+                    Policies.CanModifyServerSettings,
+                    Policies.CanCreateUser,
+                    Policies.CanManageUsers
+            });
+        }
+
+        void AssertPermissions(string source, bool expected, string[] permissions)
+        {
+            if (expected)
+            {
+                foreach (var p in permissions)
+                    Assert.Contains(p + "<", source);
+            }
+            else
+            {
+                foreach (var p in permissions)
+                    Assert.DoesNotContain(p + "<", source);
+            }
+        }
+
         [Fact(Timeout = TestTimeout)]
         public async Task CanCreateAppPoS()
         {
@@ -776,9 +942,8 @@ namespace BTCPayServer.Tests
             await s.StartAsync();
             var userId = s.RegisterNewUser(true);
             s.CreateNewStore();
-            s.Driver.FindElement(By.Id("StoreNav-CreateApp")).Click();
+            s.Driver.FindElement(By.Id("StoreNav-CreatePointOfSale")).Click();
             s.Driver.FindElement(By.Name("AppName")).SendKeys("PoS" + Guid.NewGuid());
-            s.Driver.FindElement(By.Id("SelectedAppType")).SendKeys("Point of Sale");
             s.Driver.FindElement(By.Id("Create")).Click();
             Assert.Contains("App successfully created", s.FindAlertMessage().Text);
 
@@ -864,9 +1029,8 @@ namespace BTCPayServer.Tests
             s.CreateNewStore();
             s.AddDerivationScheme();
 
-            s.Driver.FindElement(By.Id("StoreNav-CreateApp")).Click();
+            s.Driver.FindElement(By.Id("StoreNav-CreateCrowdfund")).Click();
             s.Driver.FindElement(By.Name("AppName")).SendKeys("CF" + Guid.NewGuid());
-            s.Driver.FindElement(By.Id("SelectedAppType")).SendKeys("Crowdfund");
             s.Driver.FindElement(By.Id("Create")).Click();
             Assert.Contains("App successfully created", s.FindAlertMessage().Text);
 
@@ -893,7 +1057,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(2, windows.Count);
             s.Driver.SwitchTo().Window(windows[1]);
 
-            Assert.Equal("currently active!",
+            Assert.Equal("Currently active!",
                 s.Driver.FindElement(By.CssSelector("[data-test='time-state']")).Text);
 
             s.Driver.Close();
@@ -907,6 +1071,7 @@ namespace BTCPayServer.Tests
             await s.StartAsync();
             s.RegisterNewUser();
             s.CreateNewStore();
+            s.EnableCheckout(CheckoutType.V1);
             s.AddDerivationScheme();
 
             s.Driver.FindElement(By.Id("StoreNav-PaymentRequests")).Click();
@@ -990,7 +1155,7 @@ namespace BTCPayServer.Tests
             var walletId = new WalletId(storeId, "BTC");
             s.GoToWallet(walletId, WalletsNavPages.Receive);
             s.Driver.FindElement(By.Id("generateButton")).Click();
-            var addressStr = s.Driver.FindElement(By.Id("address")).GetAttribute("value");
+            var addressStr = s.Driver.FindElement(By.Id("Address")).GetAttribute("value");
             var address = BitcoinAddress.Create(addressStr,
                 ((BTCPayNetwork)s.Server.NetworkProvider.GetNetwork("BTC")).NBitcoinNetwork);
             await s.Server.ExplorerNode.GenerateAsync(1);
@@ -1206,14 +1371,48 @@ namespace BTCPayServer.Tests
             Assert.True(s.Driver.FindElement(By.CssSelector("#address-tab .qr-container")).Displayed);
             // no previous page in the wizard, hence no back button
             Assert.True(s.Driver.ElementDoesNotExist(By.Id("GoBack")));
-            var receiveAddr = s.Driver.FindElement(By.Id("address")).GetAttribute("value");
+            var receiveAddr = s.Driver.FindElement(By.Id("Address")).GetAttribute("value");
+
+            // Can add a label?
+            await TestUtils.EventuallyAsync(async () =>
+            {
+                s.Driver.WaitForElement(By.CssSelector("div.label-manager input")).Click();
+                await Task.Delay(500);
+                s.Driver.WaitForElement(By.CssSelector("div.label-manager input")).SendKeys("test-label" + Keys.Enter);
+                await Task.Delay(500);
+                s.Driver.WaitForElement(By.CssSelector("div.label-manager input")).SendKeys("label2" + Keys.Enter);
+            });
+
+            TestUtils.Eventually(() =>
+            {
+                s.Driver.Navigate().Refresh();
+                Assert.NotNull(s.Driver.FindElement(By.CssSelector("[data-value='test-label']")));
+            });
 
             //unreserve
             s.Driver.FindElement(By.CssSelector("button[value=unreserve-current-address]")).Click();
             //generate it again, should be the same one as before as nothing got used in the meantime
             s.Driver.FindElement(By.CssSelector("button[value=generate-new-address]")).Click();
             Assert.True(s.Driver.FindElement(By.CssSelector("#address-tab .qr-container")).Displayed);
-            Assert.Equal(receiveAddr, s.Driver.FindElement(By.Id("address")).GetAttribute("value"));
+            Assert.Equal(receiveAddr, s.Driver.FindElement(By.Id("Address")).GetAttribute("value"));
+            TestUtils.Eventually(() =>
+            {
+                Assert.Contains("test-label", s.Driver.PageSource);
+            });
+
+            // Let's try to remove a label
+            await TestUtils.EventuallyAsync(async () =>
+            {
+                s.Driver.WaitForElement(By.CssSelector("[data-value='test-label']")).Click();
+                await Task.Delay(500);
+                s.Driver.ExecuteJavaScript("document.querySelector('[data-value=\"test-label\"]').nextSibling.dispatchEvent(new KeyboardEvent('keydown', {'key': 'Delete', keyCode: 46}));");
+
+            });
+            TestUtils.Eventually(() =>
+            {
+                s.Driver.Navigate().Refresh();
+                Assert.DoesNotContain("test-label", s.Driver.PageSource);
+            });
             Assert.True(s.Driver.ElementDoesNotExist(By.Id("GoBack")));
 
             //send money to addr and ensure it changed
@@ -1226,15 +1425,19 @@ namespace BTCPayServer.Tests
             await Task.Delay(200);
             s.Driver.Navigate().Refresh();
             s.Driver.FindElement(By.CssSelector("button[value=generate-new-address]")).Click();
-            Assert.NotEqual(receiveAddr, s.Driver.FindElement(By.Id("address")).GetAttribute("value"));
-            receiveAddr = s.Driver.FindElement(By.Id("address")).GetAttribute("value");
+            Assert.NotEqual(receiveAddr, s.Driver.FindElement(By.Id("Address")).GetAttribute("value"));
+            receiveAddr = s.Driver.FindElement(By.Id("Address")).GetAttribute("value");
             s.Driver.FindElement(By.Id("CancelWizard")).Click();
 
+            // Check the label is applied to the tx
+
+            Assert.Equal("label2", s.Driver.FindElement(By.XPath("//*[@id=\"WalletTransactionsList\"]//*[contains(@class, 'transaction-label')]")).Text);
+
             //change the wallet and ensure old address is not there and generating a new one does not result in the prev one
             s.GenerateWallet(cryptoCode, "", true);
             s.GoToWallet(null, WalletsNavPages.Receive);
             s.Driver.FindElement(By.CssSelector("button[value=generate-new-address]")).Click();
-            Assert.NotEqual(receiveAddr, s.Driver.FindElement(By.Id("address")).GetAttribute("value"));
+            Assert.NotEqual(receiveAddr, s.Driver.FindElement(By.Id("Address")).GetAttribute("value"));
 
             var invoiceId = s.CreateInvoice(storeId);
             var invoice = await s.Server.PayTester.InvoiceRepository.GetInvoice(invoiceId);
@@ -1369,9 +1572,20 @@ namespace BTCPayServer.Tests
             Assert.Contains("\"Amount\": \"3.00000000\"", s.Driver.PageSource);
             s.Driver.SwitchTo().Window(s.Driver.WindowHandles.First());
 
+            // BIP-329 export
+            s.Driver.FindElement(By.Id("ExportDropdownToggle")).Click();
+            s.Driver.FindElement(By.Id("ExportBIP329")).Click();
+            Thread.Sleep(1000);
+            s.Driver.SwitchTo().Window(s.Driver.WindowHandles.Last());
+            Assert.Contains(s.WalletId.ToString(), s.Driver.Url);
+            Assert.EndsWith("export?format=bip329", s.Driver.Url);
+            Assert.Contains("{\"type\":\"tx\",\"ref\":\"", s.Driver.PageSource);
+            s.Driver.SwitchTo().Window(s.Driver.WindowHandles.First());
+
             // CSV export
             s.Driver.FindElement(By.Id("ExportDropdownToggle")).Click();
             s.Driver.FindElement(By.Id("ExportCSV")).Click();
+            s.Driver.SwitchTo().Window(s.Driver.WindowHandles.First());
         }
 
         [Fact(Timeout = TestTimeout)]
@@ -1516,9 +1730,12 @@ namespace BTCPayServer.Tests
             TestUtils.Eventually(() =>
             {
                 s.Driver.Navigate().Refresh();
-                Assert.Contains("badge transactionLabel", s.Driver.PageSource);
+                Assert.Contains("transaction-label", s.Driver.PageSource);
             });
-            Assert.Equal("payout", s.Driver.FindElement(By.ClassName("transactionLabel")).Text);
+            var labels = s.Driver.FindElements(By.CssSelector("#WalletTransactionsList tr:first-child div.transaction-label"));
+            Assert.Equal(2, labels.Count);
+            Assert.Contains(labels, element => element.Text == "payout");
+            Assert.Contains(labels, element => element.Text == "pull-payment");
 
             s.GoToStore(s.StoreId, StoreNavPages.Payouts);
             s.Driver.FindElement(By.Id($"{PayoutState.InProgress}-view")).Click();
@@ -1791,9 +2008,7 @@ namespace BTCPayServer.Tests
             s.AddLightningNode(LightningConnectionType.CLightning, false);
             s.GoToLightningSettings();
             s.Driver.SetCheckbox(By.Id("LNURLEnabled"), true);
-            s.Driver.FindElement(By.Id("StoreNav-CreateApp")).Click();
-            s.Driver.FindElement(By.Id("SelectedAppType")).Click();
-            s.Driver.FindElement(By.CssSelector("option[value='PointOfSale']")).Click();
+            s.Driver.FindElement(By.Id("StoreNav-CreatePointOfSale")).Click();
             s.Driver.FindElement(By.Id("AppName")).SendKeys(Guid.NewGuid().ToString());
             s.Driver.FindElement(By.Id("Create")).Click();
             TestUtils.Eventually(() => Assert.Contains("App successfully created", s.FindAlertMessage().Text));
@@ -1828,6 +2043,7 @@ namespace BTCPayServer.Tests
                 new[] { s.Server.MerchantLnd.Client });
             s.RegisterNewUser(true);
             (_, string storeId) = s.CreateNewStore();
+            s.EnableCheckout(CheckoutType.V1);
             var network = s.Server.NetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode).NBitcoinNetwork;
             s.AddLightningNode(LightningConnectionType.CLightning, false);
             s.GoToLightningSettings();
@@ -1859,7 +2075,8 @@ namespace BTCPayServer.Tests
             var res = await s.Server.CustomerLightningD.Pay(lnurlResponse.Pr);
             Assert.Equal(PayResult.Error, res.Result);
 
-            await s.Server.CustomerLightningD.Pay(lnurlResponse2.Pr);
+            res = await s.Server.CustomerLightningD.Pay(lnurlResponse2.Pr);
+            Assert.Equal(PayResult.Ok, res.Result);
             await TestUtils.EventuallyAsync(async () =>
             {
                 var inv = await s.Server.PayTester.InvoiceRepository.GetInvoice(i);
@@ -1873,22 +2090,23 @@ namespace BTCPayServer.Tests
             });
             // Standard invoice test
             s.GoToStore(storeId);
-            s.GoToLightningSettings();
-            s.Driver.SetCheckbox(By.Id("LNURLStandardInvoiceEnabled"), true);
-            SudoForceSaveLightningSettingsRightNowAndFast(s, cryptoCode);
             i = s.CreateInvoice(storeId, 0.0000001m, cryptoCode);
             s.GoToInvoiceCheckout(i);
-            s.Driver.FindElement(By.ClassName("payment__currencies")).Click();
-            // BOLT11 is also available for standard invoices
-            Assert.Equal(2, s.Driver.FindElements(By.CssSelector(".vex.vex-theme-btcpay .vex-content .vexmenu li.vexmenuitem")).Count);
-            s.Driver.FindElement(By.CssSelector(".vex.vex-theme-btcpay .vex-content .vexmenu li.vexmenuitem")).Click();
+            s.Driver.FindElement(By.ClassName("payment__currencies_noborder")).Click();
+            // BOLT11 is also displayed for standard invoice (not LNURL, even if it is available)
             s.Driver.FindElement(By.Id("copy-tab")).Click();
-            lnurl = s.Driver.FindElement(By.CssSelector("input.checkoutTextbox")).GetAttribute("value");
-            parsed = LNURL.LNURL.Parse(lnurl, out tag);
-            fetchedReuqest = Assert.IsType<LNURLPayRequest>(await LNURL.LNURL.FetchInformation(parsed, new HttpClient()));
+            var bolt11 = s.Driver.FindElement(By.CssSelector("input.checkoutTextbox")).GetAttribute("value");
+            var bolt11Parsed = Lightning.BOLT11PaymentRequest.Parse(bolt11, s.Server.ExplorerNode.Network);
+            var invoiceId = s.Driver.Url.Split('/').Last();
+            using (var resp = await s.Server.PayTester.HttpClient.GetAsync("BTC/lnurl/pay/i/" + invoiceId))
+            {
+                resp.EnsureSuccessStatusCode();
+                fetchedReuqest = JsonConvert.DeserializeObject<LNURLPayRequest>(await resp.Content.ReadAsStringAsync());
+            }
             Assert.Equal(0.0000001m, fetchedReuqest.MaxSendable.ToDecimal(LightMoneyUnit.BTC));
             Assert.Equal(0.0000001m, fetchedReuqest.MinSendable.ToDecimal(LightMoneyUnit.BTC));
 
+
             await Assert.ThrowsAsync<LNUrlException>(async () =>
             {
                 await fetchedReuqest.SendRequest(new LightMoney(0.0000002m, LightMoneyUnit.BTC),
@@ -1910,13 +2128,6 @@ namespace BTCPayServer.Tests
             Assert.Equal(new LightMoney(0.0000001m, LightMoneyUnit.BTC),
                 lnurlResponse2.GetPaymentRequest(network).MinimumAmount);
             s.GoToHome();
-            s.GoToLightningSettings();
-            // LNURL is enabled and settings are expanded
-            Assert.True(s.Driver.FindElement(By.Id("LNURLEnabled")).Selected);
-            Assert.Contains("show", s.Driver.FindElement(By.Id("LNURLSettings")).GetAttribute("class"));
-            s.Driver.SetCheckbox(By.Id("LNURLStandardInvoiceEnabled"), false);
-            s.Driver.FindElement(By.Id("save")).Click();
-            Assert.Contains($"{cryptoCode} Lightning settings successfully updated", s.FindAlertMessage().Text);
 
             i = s.CreateInvoice(storeId, 0.000001m, cryptoCode);
             s.GoToInvoiceCheckout(i);
@@ -1930,23 +2141,12 @@ namespace BTCPayServer.Tests
             s.GoToHome();
             s.GoToLightningSettings();
             s.Driver.SetCheckbox(By.Id("LNURLBech32Mode"), false);
-            s.Driver.SetCheckbox(By.Id("LNURLStandardInvoiceEnabled"), false);
-            s.Driver.SetCheckbox(By.Id("DisableBolt11PaymentMethod"), true);
             s.Driver.FindElement(By.Id("save")).Click();
             Assert.Contains($"{cryptoCode} Lightning settings successfully updated", s.FindAlertMessage().Text);
 
             // Ensure the toggles are set correctly
             s.GoToLightningSettings();
-
-            //TODO: DisableBolt11PaymentMethod is actually disabled because LNURLStandardInvoiceEnabled is disabled
-            // checkboxes is not good choice here, in next release we should have multi choice instead
             Assert.False(s.Driver.FindElement(By.Id("LNURLBech32Mode")).Selected);
-            Assert.False(s.Driver.FindElement(By.Id("LNURLStandardInvoiceEnabled")).Selected);
-
-            //even though we set DisableBolt11PaymentMethod to true, logic when saving it turns it back off as otherwise no lightning option is available at all!
-            Assert.False(s.Driver.FindElement(By.Id("DisableBolt11PaymentMethod")).Selected);
-            // Invoice creation should fail, because it is a standard invoice with amount, but DisableBolt11PaymentMethod  = true and LNURLStandardInvoiceEnabled = false
-            s.CreateInvoice(storeId, 0.0000001m, cryptoCode, "", null, expectedSeverity: StatusMessageModel.StatusSeverity.Success);
 
             i = s.CreateInvoice(storeId, null, cryptoCode);
             s.GoToInvoiceCheckout(i);
@@ -1958,18 +2158,17 @@ namespace BTCPayServer.Tests
 
             s.GoToHome();
             s.CreateNewStore(false);
+            s.EnableCheckout(CheckoutType.V1);
             s.AddLightningNode(LightningConnectionType.LndREST, false);
             s.GoToLightningSettings();
             s.Driver.SetCheckbox(By.Id("LNURLEnabled"), true);
-            s.Driver.SetCheckbox(By.Id("DisableBolt11PaymentMethod"), true);
-            s.Driver.SetCheckbox(By.Id("LNURLStandardInvoiceEnabled"), true);
             s.Driver.FindElement(By.Id("save")).Click();
             Assert.Contains($"{cryptoCode} Lightning settings successfully updated", s.FindAlertMessage().Text);
-            var invForPP = s.CreateInvoice(0.0000001m, cryptoCode);
+            var invForPP = s.CreateInvoice(null, cryptoCode);
             s.GoToInvoiceCheckout(invForPP);
             s.Driver.FindElement(By.Id("copy-tab")).Click();
             lnurl = s.Driver.FindElement(By.CssSelector("input.checkoutTextbox")).GetAttribute("value");
-            parsed = LNURL.LNURL.Parse(lnurl, out tag);
+            LNURL.LNURL.Parse(lnurl, out tag);
 
             // Check that pull payment has lightning option
             s.GoToStore(s.StoreId, StoreNavPages.PullPayments);
@@ -2043,13 +2242,16 @@ namespace BTCPayServer.Tests
             s.FindAlertMessage(StatusMessageModel.StatusSeverity.Success);
 
             s.Driver.ToggleCollapse("AddAddress");
+
             var lnaddress2 = "EUR" + Guid.NewGuid().ToString();
             s.Driver.FindElement(By.Id("Add_Username")).SendKeys(lnaddress2);
+            lnaddress2 = lnaddress2.ToLowerInvariant();
 
             s.Driver.ToggleCollapse("AdvancedSettings");
             s.Driver.FindElement(By.Id("Add_CurrencyCode")).SendKeys("EUR");
             s.Driver.FindElement(By.Id("Add_Min")).SendKeys("2");
             s.Driver.FindElement(By.Id("Add_Max")).SendKeys("10");
+            s.Driver.FindElement(By.Id("Add_InvoiceMetadata")).SendKeys("{\"test\":\"lol\"}");
             s.Driver.FindElement(By.CssSelector("button[value='add']")).Click();
             s.FindAlertMessage(StatusMessageModel.StatusSeverity.Success);
 
@@ -2065,20 +2267,101 @@ namespace BTCPayServer.Tests
                 var lnurl = new Uri(LNURL.LNURL.ExtractUriFromInternetIdentifier(value).ToString()
                     .Replace("https", "http"));
                 var request = (LNURL.LNURLPayRequest)await LNURL.LNURL.FetchInformation(lnurl, new HttpClient());
-
+                var m = request.ParsedMetadata.ToDictionary(o => o.Key, o => o.Value);
                 switch (value)
                 {
                     case { } v when v.StartsWith(lnaddress2):
+                        Assert.StartsWith(lnaddress2 + "@", m["text/identifier"]);
+                        lnaddress2 = m["text/identifier"];
                         Assert.Equal(2, request.MinSendable.ToDecimal(LightMoneyUnit.Satoshi));
                         Assert.Equal(10, request.MaxSendable.ToDecimal(LightMoneyUnit.Satoshi));
                         break;
 
                     case { } v when v.StartsWith(lnaddress1):
+                        Assert.StartsWith(lnaddress1 + "@", m["text/identifier"]);
+                        lnaddress1 = m["text/identifier"];
                         Assert.Equal(1, request.MinSendable.ToDecimal(LightMoneyUnit.Satoshi));
                         Assert.Equal(6.12m, request.MaxSendable.ToDecimal(LightMoneyUnit.BTC));
                         break;
+                    default:
+                        Assert.False(true, "Should have matched");
+                        break;
                 }
             }
+            var repo = s.Server.PayTester.GetService<InvoiceRepository>();
+            var invoices = await repo.GetInvoices(new InvoiceQuery() { StoreId = new[] { s.StoreId } });
+            Assert.Equal(2, invoices.Length);
+            var emailSuffix = $"@{s.Server.PayTester.HostName}:{s.Server.PayTester.Port}";
+            foreach (var i in invoices)
+            {
+                var lightningPaymentMethod = i.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.LNURLPay));
+                var paymentMethodDetails =
+                    lightningPaymentMethod.GetPaymentMethodDetails() as LNURLPayPaymentMethodDetails;
+                Assert.Contains(
+                    paymentMethodDetails.ConsumedLightningAddress,
+                    new[] { lnaddress1, lnaddress2 });
+
+                if (paymentMethodDetails.ConsumedLightningAddress == lnaddress2)
+                {
+                    Assert.Equal("lol", i.Metadata.AdditionalData["test"].Value<string>());
+                }
+            }
+
+            var lnUsername = lnaddress1.Split('@')[0];
+
+
+            LNURLPayRequest req;
+            using (var resp = await s.Server.PayTester.HttpClient.GetAsync($"/.well-known/lnurlp/{lnUsername}"))
+            {
+                var str = await resp.Content.ReadAsStringAsync();
+                req = JsonConvert.DeserializeObject<LNURLPayRequest>(str);
+                Assert.Contains(req.ParsedMetadata, m => m.Key == "text/identifier" && m.Value == lnaddress1);
+                Assert.Contains(req.ParsedMetadata, m => m.Key == "text/plain" && m.Value.StartsWith("Paid to"));
+                Assert.NotNull(req.Callback);
+                Assert.Equal(new LightMoney(1000), req.MinSendable);
+                Assert.Equal(LightMoney.FromUnit(6.12m, LightMoneyUnit.BTC), req.MaxSendable);
+            }
+            lnUsername = lnaddress2.Split('@')[0];
+            using (var resp = await s.Server.PayTester.HttpClient.GetAsync($"/.well-known/lnurlp/{lnUsername}"))
+            {
+                var str = await resp.Content.ReadAsStringAsync();
+                req = JsonConvert.DeserializeObject<LNURLPayRequest>(str);
+                Assert.Equal(new LightMoney(2000), req.MinSendable);
+                Assert.Equal(new LightMoney(10_000), req.MaxSendable);
+            }
+            // Check if we can get the same payrequest through the callback
+            using (var resp = await s.Server.PayTester.HttpClient.GetAsync(req.Callback))
+            {
+                var str = await resp.Content.ReadAsStringAsync();
+                req = JsonConvert.DeserializeObject<LNURLPayRequest>(str);
+                Assert.Equal(new LightMoney(2000), req.MinSendable);
+                Assert.Equal(new LightMoney(10_000), req.MaxSendable);
+            }
+
+            // Can we ask for invoice? (Should fail, below minSpendable)
+            using (var resp = await s.Server.PayTester.HttpClient.GetAsync(req.Callback + "?amount=1999"))
+            {
+                var str = await resp.Content.ReadAsStringAsync();
+                var err = JsonConvert.DeserializeObject<LNUrlStatusResponse>(str);
+                Assert.Equal("Amount is out of bounds.", err.Reason);
+            }
+            // Can we ask for invoice?
+            using (var resp = await s.Server.PayTester.HttpClient.GetAsync(req.Callback + "?amount=2000"))
+            {
+                var str = await resp.Content.ReadAsStringAsync();
+                var succ = JsonConvert.DeserializeObject<LNURLPayRequest.LNURLPayRequestCallbackResponse>(str);
+                Assert.NotNull(succ.Pr);
+                Assert.Equal(new LightMoney(2000), BOLT11PaymentRequest.Parse(succ.Pr, Network.RegTest).MinimumAmount);
+            }
+
+            // Can we change comment?
+            using (var resp = await s.Server.PayTester.HttpClient.GetAsync(req.Callback + "?amount=2001"))
+            {
+                var str = await resp.Content.ReadAsStringAsync();
+                var succ = JsonConvert.DeserializeObject<LNURLPayRequest.LNURLPayRequestCallbackResponse>(str);
+                Assert.NotNull(succ.Pr);
+                Assert.Equal(new LightMoney(2001), BOLT11PaymentRequest.Parse(succ.Pr, Network.RegTest).MinimumAmount);
+            }
         }
 
         [Fact]

BTCPayServer.Tests/ServerTester.cs

@@ -177,7 +177,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 +194,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 +247,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 = Guid.NewGuid() + "@toto.com",
-                ConfirmPassword = "Kitten0@",
-                Password = "Kitten0@",
+                Email = Utils.GenerateEmail(),
+                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; }
 

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

@@ -349,6 +349,15 @@ retry:
             version = Regex.Match(actual, "vue-qrcode v([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
             expected = (await (await client.GetAsync($"https://unpkg.com/@chenfengyuan/vue-qrcode@{version}/dist/vue-qrcode.min.js")).Content.ReadAsStringAsync()).Trim();
             Assert.Equal(expected, actual);
+
+            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);
         }
 
         string GetFileContent(params string[] path)

BTCPayServer.Tests/UnitTest1.cs

@@ -35,6 +35,8 @@ 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.Services;
@@ -160,25 +162,7 @@ namespace BTCPayServer.Tests
             await tester.StartAsync();
             var acc = tester.NewAccount();
 
-            var description =
-                "BTCPay Server supports authenticating and authorizing users through an API Key that is generated by them. Send the API Key as a header value to Authorization with the format: `token {token}`. For a smoother experience, you can generate a url that redirects users to an API key creation screen.\n\n The following permissions are available to the context of the user creating the API Key:\n\n#OTHERPERMISSIONS#\n\nThe following permissions are available if the user is an administrator:\n\n#SERVERPERMISSIONS#\n\nThe following permissions applies to all stores of the user, you can limit to a specific store with the following format: `btcpay.store.cancreateinvoice:6HSHAEU4iYWtjxtyRs9KyPjM9GAQp8kw2T9VWbGG1FnZ`:\n\n#STOREPERMISSIONS#\n\nNote that API Keys only limits permission of a user and can never expand it. If an API Key has the permission `btcpay.server.canmodifyserversettings` but that the user account creating this API Key is not administrator, the API Key will not be able to modify the server settings.\nSome permissions may include other permissions, see [this operation](#operation/permissionsMetadata).\n";
-
-            var storePolicies =
-                UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair =>
-                    Policies.IsStorePolicy(pair.Key) && !pair.Key.EndsWith(":", StringComparison.InvariantCulture));
-            var serverPolicies =
-                UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair =>
-                    Policies.IsServerPolicy(pair.Key));
-            var otherPolicies =
-                UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair =>
-                    !Policies.IsStorePolicy(pair.Key) && !Policies.IsServerPolicy(pair.Key));
-
-            description = description.Replace("#OTHERPERMISSIONS#",
-                    string.Join("\n", otherPolicies.Select(pair => $"* `{pair.Key}`: {pair.Value.Title}")))
-                .Replace("#SERVERPERMISSIONS#",
-                    string.Join("\n", serverPolicies.Select(pair => $"* `{pair.Key}`: {pair.Value.Title}")))
-                .Replace("#STOREPERMISSIONS#",
-                    string.Join("\n", storePolicies.Select(pair => $"* `{pair.Key}`: {pair.Value.Title}")));
+            var description = UtilitiesTests.GetSecuritySchemeDescription();
             TestLogs.LogInformation(description);
 
             var sresp = Assert
@@ -187,7 +171,11 @@ namespace BTCPayServer.Tests
 
             JObject json = JObject.Parse(sresp);
 
-            Assert.Equal(description, json["components"]["securitySchemes"]["API_Key"]["description"].Value<string>());
+            // If this test fail, run `UpdateSwagger` once.
+            if (description != json["components"]["securitySchemes"]["API_Key"]["description"].Value<string>())
+            {
+                Assert.False(true, "Please run manually the test `UpdateSwagger` once");
+            }
         }
 
         [Fact]
@@ -1613,15 +1601,15 @@ namespace BTCPayServer.Tests
             var paymentMethodUnified = Assert.IsType<PaymentModel>(
                 Assert.IsType<ViewResult>(res).Model
             );
-            Assert.StartsWith("bitcoin:", paymentMethodUnified.InvoiceBitcoinUrl);
-            Assert.StartsWith("bitcoin:", paymentMethodUnified.InvoiceBitcoinUrlQR);
-            Assert.Contains("&lightning=", paymentMethodUnified.InvoiceBitcoinUrl);
-            Assert.Contains("&lightning=", paymentMethodUnified.InvoiceBitcoinUrlQR);
+            Assert.StartsWith("bitcoin:bcrt", paymentMethodUnified.InvoiceBitcoinUrl);
+            Assert.StartsWith("bitcoin:BCRT", paymentMethodUnified.InvoiceBitcoinUrlQR);
+            Assert.Contains("&lightning=lnbcrt", paymentMethodUnified.InvoiceBitcoinUrl);
+            Assert.Contains("&lightning=LNBCRT", paymentMethodUnified.InvoiceBitcoinUrlQR);
 
             // 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]);
@@ -1647,6 +1635,7 @@ namespace BTCPayServer.Tests
             var cryptoCode = "BTC";
             user.GrantAccess(true);
             user.RegisterLightningNode(cryptoCode, LightningConnectionType.Charge);
+            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);
@@ -1661,16 +1650,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.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);
@@ -1709,37 +1694,17 @@ namespace BTCPayServer.Tests
             var testCases =
                 new List<(string input, Dictionary<string, object> expectedOutput)>()
                 {
-                        {(null, new Dictionary<string, object>())},
-                        {("", new Dictionary<string, object>())},
-                        {("{}", new Dictionary<string, object>())},
-                        {
-                            ("non-json-content",
-                                new Dictionary<string, object>() {{string.Empty, "non-json-content"}})
-                        },
-                        {("[1,2,3]", new Dictionary<string, object>() {{string.Empty, "[1,2,3]"}})},
                         {("{ \"key\": \"value\"}", new Dictionary<string, object>() {{"key", "value"}})},
-                        {("{ \"key\": true}", new Dictionary<string, object>() {{"key", "True"}})},
-                        {
-                            ("{ invalidjson file here}",
-                                new Dictionary<string, object>() {{String.Empty, "{ invalidjson file here}"}})
-                        }
+                        {("{ \"key\": true}", new Dictionary<string, object>() {{"key", "True"}})}
                 };
 
-            var tasks = new List<Task>();
             foreach (var valueTuple in testCases)
             {
-                tasks.Add(user.BitPay.CreateInvoiceAsync(new Invoice(1, "BTC") { PosData = valueTuple.input })
-                    .ContinueWith(async task =>
-                    {
-                        var result = await controller.Invoice(task.Result.Id);
-                        var viewModel =
-                            Assert.IsType<InvoiceDetailsModel>(
-                                Assert.IsType<ViewResult>(result).Model);
-                        Assert.Equal(valueTuple.expectedOutput, viewModel.PosData);
-                    }));
+                var invoice = await user.BitPay.CreateInvoiceAsync(new Invoice(1, "BTC") { PosData = valueTuple.input });
+                var result = await controller.Invoice(invoice.Id);
+                var viewModel = result.AssertViewModel<InvoiceDetailsModel>();
+                Assert.Equal(valueTuple.expectedOutput, viewModel.AdditionalData["posData"]);
             }
-
-            await Task.WhenAll(tasks);
         }
 
         [Fact(Timeout = LongRunningTestTimeout)]
@@ -1987,14 +1952,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);
@@ -2010,7 +1974,7 @@ namespace BTCPayServer.Tests
             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);
@@ -2478,6 +2442,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,12 +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 Microsoft.Extensions.Configuration;
-using NBitcoin.DataEncoders;
+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
 {
@@ -15,8 +31,231 @@ namespace BTCPayServer.Tests
     /// </summary>
     public class UtilitiesTests
     {
+        public ITestOutputHelper Logs { get; }
+
+        public UtilitiesTests(ITestOutputHelper logs)
+        {
+            Logs = logs;
+        }
+        internal static string GetSecuritySchemeDescription()
+        {
+            var description =
+                "BTCPay Server supports authenticating and authorizing users through an API Key that is generated by them. Send the API Key as a header value to Authorization with the format: `token {token}`. For a smoother experience, you can generate a url that redirects users to an API key creation screen.\n\n The following permissions are available to the context of the user creating the API Key:\n\n#OTHERPERMISSIONS#\n\nThe following permissions are available if the user is an administrator:\n\n#SERVERPERMISSIONS#\n\nThe following permissions applies to all stores of the user, you can limit to a specific store with the following format: `btcpay.store.cancreateinvoice:6HSHAEU4iYWtjxtyRs9KyPjM9GAQp8kw2T9VWbGG1FnZ`:\n\n#STOREPERMISSIONS#\n\nNote that API Keys only limits permission of a user and can never expand it. If an API Key has the permission `btcpay.server.canmodifyserversettings` but that the user account creating this API Key is not administrator, the API Key will not be able to modify the server settings.\nSome permissions may include other permissions, see [this operation](#operation/permissionsMetadata).\n";
+
+            var storePolicies =
+                UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair =>
+                    Policies.IsStorePolicy(pair.Key) && !pair.Key.EndsWith(":", StringComparison.InvariantCulture));
+            var serverPolicies =
+                UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair =>
+                    Policies.IsServerPolicy(pair.Key));
+            var otherPolicies =
+                UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair =>
+                    !Policies.IsStorePolicy(pair.Key) && !Policies.IsServerPolicy(pair.Key));
+
+            description = description.Replace("#OTHERPERMISSIONS#",
+                    string.Join("\n", otherPolicies.Select(pair => $"* `{pair.Key}`: {pair.Value.Title}")))
+                .Replace("#SERVERPERMISSIONS#",
+                    string.Join("\n", serverPolicies.Select(pair => $"* `{pair.Key}`: {pair.Value.Title}")))
+                .Replace("#STOREPERMISSIONS#",
+                    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>
-        /// Download transifex transactions and put them in BTCPayServer\wwwroot\locales
+        /// 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()
+        {
+            var filePath = Path.Combine(TestUtils.TryGetSolutionDirectoryInfo().FullName, "BTCPayServer", "wwwroot", "swagger", "v1", "swagger.template.json");
+            var o = JObject.Parse(File.ReadAllText(filePath));
+            o["components"]["securitySchemes"]["API_Key"]["description"] = GetSecuritySchemeDescription();
+            File.WriteAllText(filePath, o.ToString(Newtonsoft.Json.Formatting.Indented));
+        }
+
+        /// <summary>
+        /// Download transifex transactions and put them in BTCPayServer\wwwroot\locales and BTCPayServer\wwwroot\locales\checkout
         /// </summary>
         [FactWithSecret("TransifexAPIToken")]
         [Trait("Utilities", "Utilities")]
@@ -24,56 +263,75 @@ 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"));
-            var json = await client.GetTransifexAsync("https://api.transifex.com/organizations/btcpayserver/projects/btcpayserver/resources/enjson/");
-            var langs = new[] { "en" }.Concat(((JObject)json["stats"]).Properties().Select(n => n.Name)).ToArray();
+            await PullTransifexTranslationsCore(TranslationFolder.CheckoutV1);
+            await PullTransifexTranslationsCore(TranslationFolder.CheckoutV2);
 
-            var langsDir = Path.Combine(TestUtils.TryGetSolutionDirectoryInfo().FullName, "BTCPayServer", "wwwroot", "locales");
+        }
+
+        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);
+
+            enTranslation.Words.Clear();
+            enTranslation.Translate(resourceStrings.SourceTranslations);
+            enTranslation.Save();
 
-            JObject sourceLang = null;
             Task.WaitAll(langs.Select(async l =>
             {
-                bool isSourceLang = l == "en";
-                var j = await client.GetTransifexAsync($"https://www.transifex.com/api/2/project/btcpayserver/resource/enjson/translation/{l}/");
-                if (!isSourceLang)
+                if (l == "en")
+                    return;
+retry:
+                try
                 {
-                    while (sourceLang == null)
-                        await Task.Delay(10);
-                }
-                var content = j["content"].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("_", "-");
-                var langFile = Path.Combine(langsDir, langCode + ".json");
-                var jobj = JObject.Parse(content);
-                jobj["code"] = langCode;
-
-                if ((string)jobj["currentLanguage"] == "English" && !isSourceLang)
-                    return; // Not translated
-                if ((string)jobj["currentLanguage"] == "disable")
-                    return; // Not translated
-
-                jobj.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/"));
-                if (isSourceLang)
-                {
-                    sourceLang = jobj;
-                }
-                else
-                {
-                    if (jobj["InvoiceExpired_Body_3"].Value<string>() == sourceLang["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;
                     }
+
+                    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;
                 }
-                content = jobj.ToString(Newtonsoft.Json.Formatting.Indented);
-                File.WriteAllText(Path.Combine(langsDir, langFile), content);
             }).ToArray());
         }
+
+        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("-", "_");
+        }
     }
 
     public class TransifexClient
@@ -90,10 +348,256 @@ namespace BTCPayServer.Tests
         public async Task<JObject> GetTransifexAsync(string uri)
         {
             var message = new HttpRequestMessage(HttpMethod.Get, uri);
-            message.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", Encoders.Base64.EncodeData(Encoding.ASCII.GetBytes($"api:{APIToken}")));
-            message.Headers.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
-            var response = await Client.SendAsync(message);
-            return await response.Content.ReadAsAsync<JObject>();
+            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"));
+            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/Utils.cs

@@ -77,5 +77,10 @@ namespace BTCPayServer.Tests
             }
             // depending on your use case, consider throwing an exception here
         }
+
+        public static string GenerateEmail()
+        {
+            return Guid.NewGuid() + "@toto.com";
+        }
     }
 }

BTCPayServer.Tests/docker-compose.altcoins.yml

@@ -38,6 +38,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"
@@ -89,6 +93,8 @@ services:
     image: selenium/standalone-chrome:101.0
     expose:
       - "4444"
+    extra_hosts:
+      - "tests:172.18.0.18"
   nbxplorer:
     image: nicolasdorier/nbxplorer:2.3.58
     restart: unless-stopped
@@ -154,7 +160,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v22.11-dev
+    image: btcpayserver/lightning:v23.02-1-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment:
@@ -203,7 +209,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v22.11-dev
+    image: btcpayserver/lightning:v23.02-1-dev
     stop_signal: SIGKILL
     environment:
       EXPOSE_TCP: "true"
@@ -237,7 +243,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 +278,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 +410,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

@@ -36,6 +36,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"
@@ -84,6 +88,8 @@ services:
       - merchant_lnd
   selenium:
     image: selenium/standalone-chrome:101.0
+    extra_hosts:
+      - "tests:172.18.0.18"
     expose:
       - "4444"
   nbxplorer:
@@ -110,7 +116,6 @@ services:
     depends_on:
       - bitcoind
 
-
   bitcoind:
     restart: unless-stopped
     image: btcpayserver/bitcoin:24.0
@@ -141,7 +146,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v22.11-dev
+    image: btcpayserver/lightning:v23.02-1-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment:
@@ -190,7 +195,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v22.11-dev
+    image: btcpayserver/lightning:v23.02-1-dev
     stop_signal: SIGKILL
     environment:
       EXPOSE_TCP: "true"
@@ -225,7 +230,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 +267,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 +328,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

@@ -47,13 +47,13 @@
   <ItemGroup>
     <PackageReference Include="BIP78.Sender" Version="0.2.2" />
     <PackageReference Include="BTCPayServer.Hwi" Version="2.0.2" />
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.4.20" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.4.23" />
     <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" />
@@ -123,6 +123,7 @@
 	  <Folder Include="wwwroot\vendor\clipboard.js\" />
 	  <Folder Include="wwwroot\vendor\highlightjs\" />
 	  <Folder Include="wwwroot\vendor\summernote" />
+	  <Folder Include="wwwroot\vendor\tom-select" />
 	  <Folder Include="wwwroot\vendor\ur-registry" />
 	  <Folder Include="wwwroot\vendor\vue-qrcode-reader" />
 	</ItemGroup>
@@ -133,11 +134,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

@@ -0,0 +1,62 @@
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace BTCPayServer
+{
+    public class BufferizedFormFile : IFormFile
+    {
+        private IFormFile _formFile;
+        private MemoryStream _content;
+        public byte[] Buffer { get; }
+        BufferizedFormFile(IFormFile formFile, byte[] content)
+        {
+            _formFile = formFile;
+            Buffer = content;
+            _content = new MemoryStream(content);
+        }
+
+        public string ContentType => _formFile.ContentType;
+
+        public string ContentDisposition => _formFile.ContentDisposition;
+
+        public IHeaderDictionary Headers => _formFile.Headers;
+
+        public long Length => _formFile.Length;
+
+        public string Name => _formFile.Name;
+
+        public string FileName => _formFile.FileName;
+
+        public static async Task<BufferizedFormFile> Bufferize(IFormFile formFile)
+        {
+            if (formFile is BufferizedFormFile b)
+                return b;
+            var content = new byte[formFile.Length];
+            using var fs = formFile.OpenReadStream();
+            await fs.ReadAsync(content, 0, content.Length);
+            return new BufferizedFormFile(formFile, content);
+        }
+
+        public void CopyTo(Stream target)
+        {
+            _content.CopyTo(target);
+        }
+
+        public Task CopyToAsync(Stream target, CancellationToken cancellationToken = default)
+        {
+            return _content.CopyToAsync(target, cancellationToken);
+        }
+
+        public Stream OpenReadStream()
+        {
+            return _content;
+        }
+
+        public void Rewind()
+        {
+            _content.Seek(0, SeekOrigin.Begin);
+        }
+    }
+}

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>