Introduce wallet object contagion

.editorconfig

@@ -11,14 +11,10 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 charset = utf-8
-space_before_self_closing = true
 
 [*.json]
 indent_size = 2
 
-[swagger*.json]
-indent_size = 4
-
 # C# files
 [*.cs]
 # New line preferences
@@ -71,7 +67,7 @@ dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
 dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
 
 dotnet_naming_style.camel_case_underscore_style.required_prefix = _
-dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case 
 
 # Code style defaults
 dotnet_sort_system_directives_first = true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +1,8 @@
 blank_issues_enabled: true
 contact_links:
-  - 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: 🚀 Discussions
+    url: https://github.com/btcpayserver/btcpayserver/discussions
+    about: Technical discussions, questions and feature requests
   - name: 📝 Official Documentation
     url: https://docs.btcpayserver.org
     about: Check our documentation for answers to common questions

.gitignore

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

.run/Pack Test Extension.run.xml

@@ -14,8 +14,8 @@
     <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" default="false" projectName="BTCPayServer.Plugins.Test" projectPath="C:\Git\btcpayserver\BTCPayServer.Plugins.Test\BTCPayServer.Plugins.Test.csproj" />
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>

BTCPayServer.Abstractions/Configuration/DataDirectories.cs

@@ -1,5 +1,3 @@
-using System.IO;
-
 namespace BTCPayServer.Configuration
 {
     public class DataDirectories
@@ -9,12 +7,5 @@ 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/IFileService.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;

BTCPayServer.Abstractions/Contracts/INotificationHandler.cs

@@ -19,8 +19,6 @@ 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/Contracts/IScopeProvider.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 namespace BTCPayServer.Abstractions.Contracts;
 
 public interface IScopeProvider

BTCPayServer.Abstractions/Contracts/IStoredFile.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace BTCPayServer.Abstractions.Contracts;
 

BTCPayServer.Abstractions/Contracts/IUTXOLocker.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using NBitcoin;
 

BTCPayServer.Abstractions/Custodians/Client/AssetQuoteResult.cs

@@ -9,7 +9,7 @@ public class AssetQuoteResult
 
     public AssetQuoteResult() { }
 
-    public AssetQuoteResult(string fromAsset, string toAsset, decimal bid, decimal ask)
+    public AssetQuoteResult(string fromAsset, string toAsset,decimal bid, decimal ask)
     {
         FromAsset = fromAsset;
         ToAsset = toAsset;

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

@@ -2,11 +2,10 @@ namespace BTCPayServer.Abstractions.Custodians;
 
 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

@@ -1,7 +1,6 @@
 using System;
 namespace BTCPayServer.Abstractions.Custodians;
-public class CustodianApiException : Exception
-{
+public class CustodianApiException: Exception {
     public int HttpStatus { get; }
     public string Code { get; }
 
@@ -10,8 +9,7 @@ public class CustodianApiException : Exception
         HttpStatus = httpStatus;
         Code = code;
     }
-
-    public CustodianApiException(int httpStatus, string code, string message) : this(httpStatus, code, message, null)
+    public CustodianApiException( int httpStatus, string code, string message) : this(httpStatus, code, message, null)
     {
     }
 }

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

@@ -1,8 +1,9 @@
 namespace BTCPayServer.Abstractions.Custodians;
 
-public class CustodianFeatureNotImplementedException : CustodianApiException
+public class CustodianFeatureNotImplementedException: CustodianApiException
 {
     public CustodianFeatureNotImplementedException(string message) : base(400, "not-implemented", message)
     {
+        
     }
 }

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

@@ -1,8 +1,9 @@
 namespace BTCPayServer.Abstractions.Custodians;
 
 public class InsufficientFundsException : CustodianApiException
-{
+{   
     public InsufficientFundsException(string message) : base(400, "insufficient-funds", message)
     {
     }
+
 }

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

@@ -4,7 +4,7 @@ public class TradeNotFoundException : CustodianApiException
 {
     private string tradeId { get; }
 
-    public TradeNotFoundException(string tradeId) : base(404, "trade-not-found", "Could not find trade ID " + tradeId)
+    public TradeNotFoundException(string tradeId) : base(404,"trade-not-found","Could not find trade ID " + tradeId)
     {
         this.tradeId = tradeId;
     }

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

@@ -1,6 +1,6 @@
 namespace BTCPayServer.Abstractions.Custodians;
 
-public class WrongTradingPairException : CustodianApiException
+public class WrongTradingPairException: CustodianApiException
 {
     public const int HttpCode = 404;
     public WrongTradingPairException(string fromAsset, string toAsset) : base(HttpCode, "wrong-trading-pair", $"Cannot find a trading pair for converting {fromAsset} into {toAsset}.")

BTCPayServer.Abstractions/Custodians/Client/SimulateWithdrawalResult.cs

@@ -1,28 +0,0 @@
-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/ICanTrade.cs

@@ -9,16 +9,18 @@ namespace BTCPayServer.Abstractions.Custodians;
 
 public interface ICanTrade
 {
+
+    
     /**
      * A list of tradable asset pairs, or NULL if the custodian cannot trade/convert assets. if thr asset pair contains fiat, fiat is always put last. If both assets are a cyrptocode or both are fiat, the pair is written alphabetically. Always in uppercase. Example: ["BTC/EUR","BTC/USD", "EUR/USD", "BTC/ETH",...]
      */
     public List<AssetPairData> GetTradableAssetPairs();
-
+    
     /**
      * Execute a market order right now.
      */
     public Task<MarketTradeResult> TradeMarketAsync(string fromAsset, string toAsset, decimal qty, JObject config, CancellationToken cancellationToken);
-
+    
     /**
      * Get the details about a previous market trade.
      */

BTCPayServer.Abstractions/Custodians/ICanWithdraw.cs

@@ -5,14 +5,9 @@ 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> WithdrawToStoreWalletAsync(string paymentMethod, decimal amount, JObject config, CancellationToken cancellationToken);
-
-    public Task<SimulateWithdrawalResult> SimulateWithdrawalAsync(string paymentMethod, decimal qty, JObject config, CancellationToken cancellationToken);
+    public Task<WithdrawResult> WithdrawAsync(string paymentMethod, decimal amount, JObject config, CancellationToken cancellationToken);
 
     public Task<WithdrawResult> GetWithdrawalInfoAsync(string paymentMethod, string withdrawalId, JObject config, CancellationToken cancellationToken);
 

BTCPayServer.Abstractions/Custodians/ICustodian.cs

@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -13,7 +12,7 @@ public interface ICustodian
      * Get the unique code that identifies this custodian.
      */
     string Code { get; }
-
+    
     string Name { get; }
 
     /**
@@ -21,6 +20,7 @@ public interface ICustodian
      */
     Task<Dictionary<string, decimal>> GetAssetBalancesAsync(JObject config, CancellationToken cancellationToken);
 
-    public Task<Form.Form> GetConfigForm(JObject config, CancellationToken cancellationToken = default);
+    public Task<Form.Form> GetConfigForm(JObject config, string locale,
+        CancellationToken cancellationToken = default);
 
 }

BTCPayServer.Abstractions/Extensions/GreenfieldExtensions.cs

@@ -7,10 +7,6 @@ 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());
@@ -34,12 +30,12 @@ public static class GreenfieldExtensions
     {
         return controller.BadRequest(new GreenfieldAPIError(errorCode, errorMessage));
     }
-
+        
     public static IActionResult CreateAPIError(this ControllerBase controller, int httpCode, string errorCode, string errorMessage)
     {
         return controller.StatusCode(httpCode, new GreenfieldAPIError(errorCode, errorMessage));
     }
-
+        
     public static IActionResult CreateAPIPermissionError(this ControllerBase controller, string missingPermission, string message = null)
     {
         return controller.StatusCode(403, new GreenfieldPermissionAPIError(missingPermission, message));

BTCPayServer.Abstractions/Extensions/HttpRequestExtensions.cs

@@ -11,7 +11,7 @@ public static class HttpRequestExtensions
             return false;
         return request.Host.Host.EndsWith(".onion", StringComparison.OrdinalIgnoreCase);
     }
-
+    
     public static string GetAbsoluteRoot(this HttpRequest request)
     {
         return string.Concat(

BTCPayServer.Abstractions/Extensions/StringExtensions.cs

@@ -6,6 +6,7 @@ namespace BTCPayServer.Abstractions.Extensions;
 
 public static class StringExtensions
 {
+
     public static bool IsValidFileName(this string fileName)
     {
         return !fileName.ToCharArray().Any(c => Path.GetInvalidFileNameChars().Contains(c)
@@ -40,4 +41,5 @@ public static class StringExtensions
             return str.Substring(0, str.Length - 1);
         return str;
     }
+    
 }

BTCPayServer.Abstractions/Extensions/ViewsRazor.cs

@@ -50,7 +50,7 @@ namespace BTCPayServer.Abstractions.Extensions
         {
             return IsActiveCategory(viewData, category.ToString(), id);
         }
-
+        
         public static string IsActiveCategory(this ViewDataDictionary viewData, string category, object id = null)
         {
             if (!viewData.ContainsKey(ACTIVE_CATEGORY_KEY))
@@ -77,7 +77,7 @@ namespace BTCPayServer.Abstractions.Extensions
                 ? ActivePageClass
                 : null;
         }
-
+        
         public static string IsActivePage(this ViewDataDictionary viewData, string page, string category, object id = null)
         {
             if (!viewData.ContainsKey(ACTIVE_PAGE_KEY))
@@ -126,7 +126,7 @@ namespace BTCPayServer.Abstractions.Extensions
             {
                 return $"{(int)timeSpan.TotalMinutes} minute{Plural((int)timeSpan.TotalMinutes)}";
             }
-            return timeSpan.Days < 1
+            return timeSpan.Days < 1 
                 ? $"{(int)timeSpan.TotalHours} hour{Plural((int)timeSpan.TotalHours)}"
                 : $"{(int)timeSpan.TotalDays} day{Plural((int)timeSpan.TotalDays)}";
         }

BTCPayServer.Abstractions/Form/AlertMessage.cs

@@ -17,16 +17,16 @@ public class AlertMessage
         Danger,
         Info
     }
-
+    
     [JsonConverter(typeof(StringEnumConverter))]
     public AlertMessageType Type;
-
+    
     // The translated message to be shown to the user
     public string Message;
 
     public AlertMessage()
     {
-
+        
     }
 
     public AlertMessage(AlertMessageType type, string message)

BTCPayServer.Abstractions/Form/Field.cs

@@ -12,12 +12,12 @@ 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,
             Value = value,
-            OriginalValue = value,
+            OriginalValue = value,  
             Required = required,
             HelpText = helpText,
             Type = type
@@ -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 Constant;
+    public bool Hidden;
 
-    // HTML5 compatible type string like "text", "textarea", "email", "password", etc.
+    // 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).
     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();
+    public List<string> ValidationErrors = new List<string>();
 
     public virtual bool IsValid()
     {

BTCPayServer.Abstractions/Form/Form.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Newtonsoft.Json.Linq;
-using Npgsql.Internal.TypeHandlers.GeometricHandlers;
 
 namespace BTCPayServer.Abstractions.Form;
 
@@ -22,120 +20,137 @@ 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();
-
+    
     // Groups of fields in the form
     public List<Field> Fields { get; set; } = new();
-
+    
     // 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 GetFieldByFullName(string fullName)
+    public Field GetFieldByName(string name)
     {
-        foreach (var f in GetAllFields())
+        return GetFieldByName(name, Fields, null);
+    }
+    
+    private static Field GetFieldByName(string name, List<Field> fields, string prefix)
+    {
+        prefix ??= string.Empty;
+        foreach (var field in fields)
         {
-            if (f.FullName == fullName)
-                return f.Field;
+            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;
+            }
+            
         }
         return null;
     }
 
-    public IEnumerable<(string FullName, List<string> Path, Field Field)> GetAllFields()
+    public List<string> GetAllNames()
     {
-        HashSet<string> nameReturned = new();
-        foreach (var f in GetAllFieldsCore(new List<string>(), Fields))
-        {
-            var fullName = string.Join('_', f.Path.Where(s => !string.IsNullOrEmpty(s)));
-            if (!nameReturned.Add(fullName))
-                continue;
-            yield return (fullName, f.Path, f.Field);
-        }
+        return GetAllNames(Fields);
     }
 
-    public bool ValidateFieldNames(out List<string> errors)
-    {
-        errors = new List<string>();
-        HashSet<string> nameReturned = new();
-        foreach (var f in GetAllFieldsCore(new List<string>(), Fields))
-        {
-            var fullName = string.Join('_', f.Path.Where(s => !string.IsNullOrEmpty(s)));
-            if (!nameReturned.Add(fullName))
-            {
-                errors.Add($"Form contains duplicate field names '{fullName}'");
-                continue;
-            }
-        }
-        return errors.Count == 0;
-    }
-
-    IEnumerable<(List<string> Path, Field Field)> GetAllFieldsCore(List<string> path, List<Field> fields)
+    private static List<string> GetAllNames(List<Field> fields)
     {
+        var names = new List<string>();
+        
         foreach (var field in fields)
         {
-            List<string> thisPath = new(path.Count + 1);
-            thisPath.AddRange(path);
+            string prefix = string.Empty;
             if (!string.IsNullOrEmpty(field.Name))
             {
-                thisPath.Add(field.Name);
-                yield return (thisPath, field);
+                names.Add(field.Name);
+                prefix = $"{field.Name}_";
             }
 
-            foreach (var child in field.Fields)
+            if (field.Fields.Any())
             {
-                if (field.Constant)
-                    child.Constant = true;
-                foreach (var descendant in GetAllFieldsCore(thisPath, field.Fields))
+                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;
+            }
+        }
+    }
+    
+    public void ApplyValuesFromForm(IFormCollection form)
+    {
+        var names = GetAllNames();
+        foreach (var name in names)
+        {
+            var field = GetFieldByName(name);
+            if (field is null || !form.TryGetValue(name, out var val))
+            {
+                continue;
+            }
+
+            field.Value = val;
+        }
+    }
+
+    public Dictionary<string, object> GetValues()
+    {
+        return GetValues(Fields);
+    }
+    
+    private static Dictionary<string, object> GetValues(List<Field> fields)
+    {
+        var result = new Dictionary<string, object>();
+        foreach (Field field in fields)
+        {
+            var name = field.Name ?? string.Empty;
+            if (field.Fields.Any())
+            {
+                var values = GetValues(fields);
+                values.Remove(string.Empty, out var keylessValue);
+                
+                result.TryAdd(name, values);
+
+                if (keylessValue is not Dictionary<string, object> dict) continue;
+                foreach (KeyValuePair<string,object> keyValuePair in dict)
                 {
-                    yield return descendant;
+                    result.TryAdd(keyValuePair.Key, keyValuePair.Value);
                 }
             }
-        }
-    }
-
-    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)
+            else
             {
-                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>();
+                result.TryAdd(name, field.Value);
             }
         }
+
+        return result;
     }
-
-
 }

BTCPayServer.Abstractions/Models/BaseBTCPayServerPlugin.cs

@@ -8,52 +8,18 @@ namespace BTCPayServer.Abstractions.Models
 {
     public abstract class BaseBTCPayServerPlugin : IBTCPayServerPlugin
     {
-        public virtual string Identifier
-        {
-            get
-            {
-                return GetType().GetTypeInfo().Assembly.GetName().Name;
-            }
-        }
-        public virtual string Name
-        {
-            get
-            {
-                return GetType().GetTypeInfo().Assembly
-                        .GetCustomAttribute<AssemblyProductAttribute>()?
-                        .Product ?? "???";
-            }
-        }
+        public abstract string Identifier { get; }
+        public abstract string Name { get; }
 
         public virtual Version Version
         {
             get
             {
-                return GetVersion(GetType().GetTypeInfo().Assembly
-                        .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
-                        .InformationalVersion) ??
-                        Assembly.GetAssembly(GetType())?.GetName()?.Version ??
-                        new Version(1, 0, 0, 0);
+                return Assembly.GetAssembly(GetType())?.GetName().Version ?? new Version(1, 0, 0, 0);
             }
         }
 
-        private static Version GetVersion(string informationalVersion)
-        {
-            if (informationalVersion is null)
-                return null;
-            Version.TryParse(informationalVersion, out var r);
-            return r;
-        }
-
-        public virtual string Description
-        {
-            get
-            {
-                return GetType().GetTypeInfo().Assembly
-                        .GetCustomAttribute<AssemblyDescriptionAttribute>()?
-                        .Description ?? string.Empty;
-            }
-        }
+        public abstract string Description { get; }
         public bool SystemPlugin { get; set; }
         public virtual IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = Array.Empty<IBTCPayServerPlugin.PluginDependency>();
 

BTCPayServer.Abstractions/Security/AuthorizationFilterHandle.cs

@@ -8,7 +8,7 @@ public class AuthorizationFilterHandle
     public AuthorizationHandlerContext Context { get; }
     public PolicyRequirement Requirement { get; }
     public HttpContext HttpContext { get; }
-    public bool Success { get; private set; }
+    public bool Success { get; private set;  }
 
     public AuthorizationFilterHandle(
         AuthorizationHandlerContext context,

BTCPayServer.Abstractions/Security/ContentSecurityPolicies.cs

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

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -14,7 +14,7 @@
         <RepositoryType>git</RepositoryType>
     </PropertyGroup>
   <PropertyGroup>
-    <Version Condition=" '$(Version)' == '' ">1.7.2</Version>
+    <Version Condition=" '$(Version)' == '' ">1.7.1</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -28,8 +28,8 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.3.21" />
-      <PackageReference Include="NBitcoin" Version="7.0.24" />
+      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.3.15" />
+      <PackageReference Include="NBitcoin" Version="7.0.14" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
   <ItemGroup>

BTCPayServer.Client/BTCPayServerClient.APIKeys.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -23,15 +22,6 @@ 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);
@@ -45,14 +35,5 @@ 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

@@ -19,7 +19,7 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Post), token);
             return await HandleResponse<PointOfSaleAppData>(response);
         }
-
+        
         public virtual async Task<CrowdfundAppData> CreateCrowdfundApp(string storeId,
             CreateCrowdfundAppRequest request, CancellationToken token = default)
         {
@@ -52,44 +52,6 @@ namespace BTCPayServer.Client
             return await HandleResponse<AppDataBase>(response);
         }
 
-        public virtual async Task<AppDataBase[]> GetAllApps(string storeId, CancellationToken token = default)
-        {
-            if (storeId == null)
-                throw new ArgumentNullException(nameof(storeId));
-            var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/stores/{storeId}/apps",
-                    method: HttpMethod.Get), token);
-            return await HandleResponse<AppDataBase[]>(response);
-        }
-
-        public virtual async Task<AppDataBase[]> GetAllApps(CancellationToken token = default)
-        {
-            var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/apps",
-                    method: HttpMethod.Get), token);
-            return await HandleResponse<AppDataBase[]>(response);
-        }
-
-        public virtual async Task<PointOfSaleAppData> GetPosApp(string appId, CancellationToken token = default)
-        {
-            if (appId == null)
-                throw new ArgumentNullException(nameof(appId));
-            var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/apps/pos/{appId}",
-                    method: HttpMethod.Get), token);
-            return await HandleResponse<PointOfSaleAppData>(response);
-        }
-
-        public virtual async Task<CrowdfundAppData> GetCrowdfundApp(string appId, CancellationToken token = default)
-        {
-            if (appId == null)
-                throw new ArgumentNullException(nameof(appId));
-            var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/apps/crowdfund/{appId}",
-                    method: HttpMethod.Get), token);
-            return await HandleResponse<CrowdfundAppData>(response);
-        }
-
         public virtual async Task DeleteApp(string appId, CancellationToken token = default)
         {
             if (appId == null)

BTCPayServer.Client/BTCPayServerClient.CustodianAccounts.cs

@@ -50,7 +50,7 @@ namespace BTCPayServer.Client
             await HandleResponse(response);
         }
 
-        public virtual async Task<DepositAddressData> GetCustodianAccountDepositAddress(string storeId, string accountId, string paymentMethod, CancellationToken token = default)
+        public virtual async Task<DepositAddressData> GetDepositAddress(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,6 +58,7 @@ 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,
@@ -66,13 +67,13 @@ namespace BTCPayServer.Client
             return await HandleResponse<MarketTradeResponseData>(response);
         }
 
-        public virtual async Task<MarketTradeResponseData> GetCustodianAccountTradeInfo(string storeId, string accountId, string tradeId, CancellationToken token = default)
+        public virtual async Task<MarketTradeResponseData> GetTradeInfo(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> GetCustodianAccountTradeQuote(string storeId, string accountId, string fromAsset, string toAsset, CancellationToken token = default)
+        public virtual async Task<TradeQuoteResponseData> GetTradeQuote(string storeId, string accountId, string fromAsset, string toAsset, CancellationToken token = default)
         {
             var queryPayload = new Dictionary<string, object>();
             queryPayload.Add("fromAsset", fromAsset);
@@ -80,20 +81,14 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/quote", queryPayload), token);
             return await HandleResponse<TradeQuoteResponseData>(response);
         }
-
-        public virtual async Task<WithdrawalResponseData> CreateCustodianAccountWithdrawal(string storeId, string accountId, WithdrawRequestData request, CancellationToken token = default)
+        
+        public virtual async Task<WithdrawalResponseData> CreateWithdrawal(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<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)
+        public virtual async Task<WithdrawalResponseData> GetWithdrawalInfo(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

@@ -17,7 +17,7 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Get), token);
             return await HandleResponse<LightningNodeInformationData>(response);
         }
-
+        
         public virtual async Task<LightningNodeBalanceData> GetLightningNodeBalance(string cryptoCode,
             CancellationToken token = default)
         {
@@ -95,7 +95,7 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Get), token);
             return await HandleResponse<LightningInvoiceData>(response);
         }
-
+        
         public virtual async Task<LightningInvoiceData[]> GetLightningInvoices(string cryptoCode,
             bool? pendingOnly = null, long? offsetIndex = null, CancellationToken token = default)
         {
@@ -114,24 +114,6 @@ namespace BTCPayServer.Client
             return await HandleResponse<LightningInvoiceData[]>(response);
         }
 
-        public virtual async Task<LightningPaymentData[]> GetLightningPayments(string cryptoCode,
-            bool? includePending = null, long? offsetIndex = null, CancellationToken token = default)
-        {
-            var queryPayload = new Dictionary<string, object>();
-            if (includePending is bool v)
-            {
-                queryPayload.Add("includePending", v.ToString());
-            }
-            if (offsetIndex is > 0)
-            {
-                queryPayload.Add("offsetIndex", offsetIndex);
-            }
-
-            var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/payments", queryPayload), token);
-            return await HandleResponse<LightningPaymentData[]>(response);
-        }
-
         public virtual async Task<LightningInvoiceData> CreateLightningInvoice(string cryptoCode, CreateLightningInvoiceRequest request,
             CancellationToken token = default)
         {

BTCPayServer.Client/BTCPayServerClient.Lightning.Store.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Get), token);
             return await HandleResponse<LightningNodeInformationData>(response);
         }
-
+        
         public virtual async Task<LightningNodeBalanceData> GetLightningNodeBalance(string storeId, string cryptoCode,
             CancellationToken token = default)
         {
@@ -97,7 +97,7 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Get), token);
             return await HandleResponse<LightningInvoiceData>(response);
         }
-
+        
         public virtual async Task<LightningInvoiceData[]> GetLightningInvoices(string storeId, string cryptoCode,
             bool? pendingOnly = null, long? offsetIndex = null, CancellationToken token = default)
         {
@@ -116,24 +116,6 @@ namespace BTCPayServer.Client
             return await HandleResponse<LightningInvoiceData[]>(response);
         }
 
-        public virtual async Task<LightningPaymentData[]> GetLightningPayments(string storeId, string cryptoCode,
-            bool? includePending = null, long? offsetIndex = null, CancellationToken token = default)
-        {
-            var queryPayload = new Dictionary<string, object>();
-            if (includePending is bool v)
-            {
-                queryPayload.Add("includePending", v.ToString());
-            }
-            if (offsetIndex is > 0)
-            {
-                queryPayload.Add("offsetIndex", offsetIndex);
-            }
-
-            var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/payments", queryPayload), token);
-            return await HandleResponse<LightningPaymentData[]>(response);
-        }
-
         public virtual async Task<LightningInvoiceData> CreateLightningInvoice(string storeId, string cryptoCode,
             CreateLightningInvoiceRequest request, CancellationToken token = default)
         {

BTCPayServer.Client/BTCPayServerClient.LightningAddresses.cs

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

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.Objects.cs

@@ -39,7 +39,7 @@ namespace BTCPayServer.Client
                 parameters.Add("includeNeighbourData", v);
             var response =
                 await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", parameters, method: HttpMethod.Get), token);
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", parameters, method:HttpMethod.Get), token);
             return await HandleResponse<OnChainWalletObjectData[]>(response);
         }
         public virtual async Task RemoveOnChainWalletObject(string storeId, string cryptoCode, OnChainWalletObjectId objectId,
@@ -47,7 +47,7 @@ namespace BTCPayServer.Client
         {
             var response =
                 await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}", method: HttpMethod.Delete), token);
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}", method:HttpMethod.Delete), token);
             await HandleResponse(response);
         }
         public virtual async Task<OnChainWalletObjectData> AddOrUpdateOnChainWalletObject(string storeId, string cryptoCode, AddOnChainWalletObjectRequest request,
@@ -55,7 +55,7 @@ namespace BTCPayServer.Client
         {
             var response =
                 await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", method: HttpMethod.Post, bodyPayload: request), token);
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", method:HttpMethod.Post, bodyPayload: request), token);
             return await HandleResponse<OnChainWalletObjectData>(response);
         }
         public virtual async Task AddOrUpdateOnChainWalletLink(string storeId, string cryptoCode,
@@ -65,7 +65,7 @@ namespace BTCPayServer.Client
         {
             var response =
                 await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links", method: HttpMethod.Post, bodyPayload: request), token);
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links", method:HttpMethod.Post, bodyPayload: request), token);
             await HandleResponse(response);
         }
         public virtual async Task RemoveOnChainWalletLinks(string storeId, string cryptoCode,
@@ -75,7 +75,7 @@ namespace BTCPayServer.Client
         {
             var response =
                 await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links/{link.Type}/{link.Id}", method: HttpMethod.Delete), token);
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links/{link.Type}/{link.Id}", method:HttpMethod.Delete), token);
             await HandleResponse(response);
         }
     }

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.cs

@@ -63,8 +63,7 @@ namespace BTCPayServer.Client
             {
                 query.Add(nameof(statusFilter), statusFilter);
             }
-            if (labelFilter != null)
-            {
+            if (labelFilter != null) {
                 query.Add(nameof(labelFilter), labelFilter);
             }
             var response =

BTCPayServer.Client/BTCPayServerClient.PullPayments.cs

@@ -52,17 +52,17 @@ namespace BTCPayServer.Client
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts", bodyPayload: payoutRequest, method: HttpMethod.Post), cancellationToken);
             return await HandleResponse<PayoutData>(response);
-        }
+        } 
         public virtual async Task<PayoutData> GetPullPaymentPayout(string pullPaymentId, string payoutId, CancellationToken cancellationToken = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts/{payoutId}", method: HttpMethod.Get), cancellationToken);
             return await HandleResponse<PayoutData>(response);
-        }
+        } 
         public virtual async Task<PayoutData> GetStorePayout(string storeId, string payoutId, CancellationToken cancellationToken = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payouts/{payoutId}", method: HttpMethod.Get), cancellationToken);
             return await HandleResponse<PayoutData>(response);
-        }
+        } 
         public virtual async Task<PayoutData> CreatePayout(string storeId, CreatePayoutThroughStoreRequest payoutRequest, CancellationToken cancellationToken = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payouts", bodyPayload: payoutRequest, method: HttpMethod.Post), cancellationToken);
@@ -97,15 +97,5 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Post, bodyPayload: request), cancellationToken);
             await HandleResponse(response);
         }
-
-        public virtual async Task<PullPaymentLNURL> GetPullPaymentLNURL(string pullPaymentId,
-            CancellationToken cancellationToken = default)
-        {
-            var response = await _httpClient.SendAsync(
-                CreateHttpRequest(
-                    $"/api/v1/pull-payments/{pullPaymentId}/lnurl",
-                    method: HttpMethod.Get), cancellationToken);
-            return await HandleResponse<PullPaymentLNURL>(response);
-        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.StorePayoutProcessors.cs

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

BTCPayServer.Client/BTCPayServerClient.StoreRatesConfiguration.cs

@@ -37,28 +37,17 @@ namespace BTCPayServer.Client
             return await HandleResponse<StoreRateConfiguration>(response);
         }
 
-        public virtual async Task<List<StoreRateResult>> PreviewUpdateStoreRateConfiguration(string storeId,
+        public virtual async Task<List<StoreRatePreviewResult>> PreviewUpdateStoreRateConfiguration(string storeId,
             StoreRateConfiguration request,
             string[] currencyPair,
             CancellationToken token = default)
         {
             using var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/stores/{storeId}/rates/configuration/preview", bodyPayload: request,
-                    queryPayload: new Dictionary<string, object>() { { "currencyPair", currencyPair } },
+                    queryPayload: new Dictionary<string, object>() {{"currencyPair", currencyPair}},
                     method: HttpMethod.Post),
                 token);
-            return await HandleResponse<List<StoreRateResult>>(response);
-        }
-
-        public virtual async Task<List<StoreRateResult>> GetStoreRates(string storeId, string[] currencyPair,
-            CancellationToken token = default)
-        {
-            using var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/stores/{storeId}/rates",
-                    queryPayload: new Dictionary<string, object>() { { "currencyPair", currencyPair } },
-                    method: HttpMethod.Get),
-                token);
-            return await HandleResponse<List<StoreRateResult>>(response);
+            return await HandleResponse<List<StoreRatePreviewResult>>(response);
         }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Users.cs

@@ -33,15 +33,14 @@ namespace BTCPayServer.Client
             return await HandleResponse<ApplicationUserData>(response);
         }
 
-        public virtual async Task<bool> LockUser(string idOrEmail, bool locked, CancellationToken token = default)
+        public virtual async Task LockUser(string idOrEmail, bool locked, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{idOrEmail}/lock", null,
-                new LockUserRequest { Locked = locked }, HttpMethod.Post), token);
+                new LockUserRequest() {Locked = locked}, HttpMethod.Post), token);
             await HandleResponse(response);
-            return response.IsSuccessStatusCode;
         }
 
-        public virtual async Task<ApplicationUserData[]> GetUsers(CancellationToken token = default)
+        public virtual async Task<ApplicationUserData[]> GetUsers( CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/", null, HttpMethod.Get), token);
             return await HandleResponse<ApplicationUserData[]>(response);

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(), NumberStyles.Any, CultureInfo.InvariantCulture);
+                        return decimal.Parse(token.ToString(), CultureInfo.InvariantCulture);
                     if (objectType == typeof(double) || objectType == typeof(double?))
-                        return double.Parse(token.ToString(), NumberStyles.Any, CultureInfo.InvariantCulture);
+                        return double.Parse(token.ToString(), CultureInfo.InvariantCulture);
                     throw new JsonSerializationException("Unexpected object type: " + objectType);
                 case JTokenType.Null when objectType == typeof(decimal?) || objectType == typeof(double?):
                     return null;

BTCPayServer.Client/JsonConverters/TradeQuantityJsonConverter.cs

@@ -1,36 +0,0 @@
-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/AssetPairData.cs

@@ -8,7 +8,7 @@ public class AssetPairData
     public AssetPairData()
     {
     }
-
+    
     public AssetPairData(string assetBought, string assetSold, decimal minimumTradeQty)
     {
         AssetBought = assetBought;
@@ -25,7 +25,7 @@ public class AssetPairData
     [JsonProperty]
     public decimal MinimumTradeQty { set; get; }
 
-
+    
     public override string ToString()
     {
         return AssetBought + "/" + AssetSold;

BTCPayServer.Client/Models/CreateLightningInvoiceRequest.cs

@@ -11,18 +11,19 @@ namespace BTCPayServer.Client.Models
         {
 
         }
-
+        
         public CreateLightningInvoiceRequest(LightMoney amount, string description, TimeSpan expiry)
         {
             Amount = amount;
             Description = description;
             Expiry = expiry;
         }
-
+        
         [JsonConverter(typeof(JsonConverters.LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
         public string Description { get; set; }
-        public bool DescriptionHashOnly { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.UInt256JsonConverter))]
+        public uint256 DescriptionHash { get; set; }
         [JsonConverter(typeof(JsonConverters.TimeSpanJsonConverter.Seconds))]
         public TimeSpan Expiry { get; set; }
         public bool PrivateRouteHints { get; set; }

BTCPayServer.Client/Models/CustodianAccountBaseData.cs

@@ -5,11 +5,11 @@ namespace BTCPayServer.Client.Models
     public abstract class CustodianAccountBaseData
     {
         public string CustodianCode { get; set; }
-
+        
         public string Name { get; set; }
-
+        
         public string StoreId { get; set; }
-
+        
         public JObject Config { get; set; }
     }
 

BTCPayServer.Client/Models/CustodianAccountResponse.cs

@@ -2,13 +2,13 @@ using System.Collections.Generic;
 
 namespace BTCPayServer.Client.Models;
 
-public class CustodianAccountResponse : CustodianAccountData
+public class CustodianAccountResponse: CustodianAccountData
 {
     public IDictionary<string, decimal> AssetBalances { get; set; }
 
     public CustodianAccountResponse()
     {
-
+        
     }
 
 }

BTCPayServer.Client/Models/CustodianData.cs

@@ -9,5 +9,5 @@ public class CustodianData
     public Dictionary<string, AssetPairData> TradableAssetPairs { get; set; }
     public string[] WithdrawablePaymentMethods { get; set; }
     public string[] DepositablePaymentMethods { get; set; }
-
+    
 }

BTCPayServer.Client/Models/DepositAddressData.cs

@@ -6,10 +6,10 @@ public class DepositAddressData
     // * Example: P2PKH, P2SH, P2WPKH, P2TR, BOLT11, ...
     // */
     // public string Type { get; set; }
-
+    
     /**
      * Format depends hugely on the type.
      */
     public string Address { get; set; }
-
+    
 }

BTCPayServer.Client/Models/LedgerEntryData.cs

@@ -1,4 +1,3 @@
-using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -7,7 +6,6 @@ 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

@@ -1,10 +0,0 @@
-namespace BTCPayServer.Client.Models;
-
-public class LightningAddressData
-{
-    public string Username { get; set; }
-    public string CurrencyCode { get; set; }
-    public decimal? Min { get; set; }
-    public decimal? Max { get; set; }
-
-}

BTCPayServer.Client/Models/LightningAutomatedPayoutSettings.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using BTCPayServer.Client.JsonConverters;
 using Newtonsoft.Json;
 
@@ -7,7 +7,7 @@ namespace BTCPayServer.Client.Models;
 public class LightningAutomatedPayoutSettings
 {
     public string PaymentMethod { get; set; }
-
+        
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }
 }

BTCPayServer.Client/Models/LightningInvoiceData.cs

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

BTCPayServer.Client/Models/LightningNodeBalanceData.cs

@@ -9,10 +9,10 @@ namespace BTCPayServer.Client.Models
     {
         [JsonProperty("onchain")]
         public OnchainBalanceData OnchainBalance { get; set; }
-
+        
         [JsonProperty("offchain")]
         public OffchainBalanceData OffchainBalance { get; set; }
-
+        
         public LightningNodeBalanceData()
         {
         }
@@ -31,7 +31,7 @@ namespace BTCPayServer.Client.Models
 
         [JsonConverter(typeof(JsonConverters.MoneyJsonConverter))]
         public Money Unconfirmed { get; set; }
-
+        
         [JsonConverter(typeof(JsonConverters.MoneyJsonConverter))]
         public Money Reserved { get; set; }
     }
@@ -40,13 +40,13 @@ namespace BTCPayServer.Client.Models
     {
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Opening { get; set; }
-
+        
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Local { get; set; }
-
+        
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Remote { get; set; }
-
+        
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Closing { get; set; }
     }

BTCPayServer.Client/Models/LightningPaymentData.cs

@@ -17,12 +17,12 @@ namespace BTCPayServer.Client.Models
 
         [JsonProperty("BOLT11")]
         public string BOLT11 { get; set; }
-
+        
         public string Preimage { get; set; }
 
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset? CreatedAt { get; set; }
-
+        
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney TotalAmount { get; set; }
 

BTCPayServer.Client/Models/LockUserRequest.cs

@@ -1,4 +1,4 @@
-namespace BTCPayServer.Client;
+namespace BTCPayServer.Client;
 
 public class LockUserRequest
 {

BTCPayServer.Client/Models/MarketTradeResponseData.cs

@@ -16,7 +16,7 @@ public class MarketTradeResponseData
     public string TradeId { get; }
 
     public string AccountId { get; }
-
+    
     public string CustodianCode { get; }
 
     public MarketTradeResponseData(string fromAsset, string toAsset, List<LedgerEntryData> ledgerEntries, string tradeId, string accountId, string custodianCode)

BTCPayServer.Client/Models/NotificationData.cs

@@ -6,8 +6,6 @@ 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/OnChainAutomatedPayoutSettings.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using BTCPayServer.Client.JsonConverters;
 using Newtonsoft.Json;
 
@@ -7,9 +7,9 @@ namespace BTCPayServer.Client.Models;
 public class OnChainAutomatedPayoutSettings
 {
     public string PaymentMethod { get; set; }
-
+       
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }
 
-    public int? FeeBlockTarget { get; set; }
+    public int? FeeBlockTarget { get; set; } 
 }

BTCPayServer.Client/Models/OpenLightningChannelRequest.cs

@@ -11,7 +11,7 @@ namespace BTCPayServer.Client.Models
     {
         [JsonConverter(typeof(NodeUriJsonConverter))]
         [JsonProperty("nodeURI")]
-        public BTCPayServer.Lightning.NodeInfo NodeURI { get; set; }
+        public NodeInfo NodeURI { get; set; }
         [JsonConverter(typeof(MoneyJsonConverter))]
         public Money ChannelAmount { get; set; }
 

BTCPayServer.Client/Models/PayLightningInvoiceRequest.cs

@@ -11,13 +11,13 @@ namespace BTCPayServer.Client.Models
     {
         [JsonProperty("BOLT11")]
         public string BOLT11 { get; set; }
-
+        
         [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
         public float? MaxFeePercent { get; set; }
-
+        
         [JsonConverter(typeof(MoneyJsonConverter))]
         public Money MaxFeeFlat { get; set; }
-
+    
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
 

BTCPayServer.Client/Models/PaymentMethodCriteriaData.cs

@@ -1,13 +0,0 @@
-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/PointOfSaleAppData.cs

@@ -12,56 +12,14 @@ namespace BTCPayServer.Client.Models
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset Created { get; set; }
     }
-
+    
     public class PointOfSaleAppData : AppDataBase
     {
-        public string Title { get; set; }
-        public string DefaultView { get; set; }
-        public bool ShowCustomAmount { get; set; }
-        public bool ShowDiscount { get; set; }
-        public bool EnableTips { get; set; }
-        public string Currency { get; set; }
-        public object Items { get; set; }
-        public string FixedAmountPayButtonText { get; set; }
-        public string CustomAmountPayButtonText { get; set; }
-        public string TipText { get; set; }
-        public string CustomCSSLink { get; set; }
-        public string NotificationUrl { get; set; }
-        public string RedirectUrl { get; set; }
-        public string Description { get; set; }
-        public string EmbeddedCSS { get; set; }
-        public bool? RedirectAutomatically { get; set; }
-        public bool? RequiresRefundEmail { get; set; }
+        // We can add POS specific things here later
     }
 
     public class CrowdfundAppData : AppDataBase
     {
-        public string Title { get; set; }
-        public bool Enabled { get; set; }
-        public bool EnforceTargetAmount { get; set; }
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-        public DateTimeOffset? StartDate { get; set; }
-        public string TargetCurrency { get; set; }
-        public string Description { get; set; }
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-        public DateTimeOffset? EndDate { get; set; }
-        public decimal? TargetAmount { get; set; }
-        public string CustomCSSLink { get; set; }
-        public string MainImageUrl { get; set; }
-        public string EmbeddedCSS { get; set; }
-        public string NotificationUrl { get; set; }
-        public string Tagline { get; set; }
-        public object Perks { get; set; }
-        public bool DisqusEnabled { get; set; }
-        public string DisqusShortname { get; set; }
-        public bool SoundsEnabled { get; set; }
-        public bool AnimationsEnabled { get; set; }
-        public int ResetEveryAmount { get; set; }
-        public string ResetEvery { get; set; }
-        public bool DisplayPerksValue { get; set; }
-        public bool DisplayPerksRanking { get; set; }
-        public bool SortPerksByPopularity { get; set; }
-        public string[] Sounds { get; set; }
-        public string[] AnimationColors { get; set; }
+        // We can add Crowdfund specific things here later
     }
 }

BTCPayServer.Client/Models/PullPaymentLNURL.cs

@@ -1,8 +0,0 @@
-namespace BTCPayServer.Client.Models
-{
-    public class PullPaymentLNURL
-    {
-        public string LNURLBech32 { get; set; }
-        public string LNURLUri { get; set; }
-    }
-}

BTCPayServer.Client/Models/RateSource.cs

@@ -1,7 +1,7 @@
-namespace BTCPayServer.Client.Models;
+namespace BTCPayServer.Client.Models;
 
 public class RateSource
 {
     public string Id { get; set; }
     public string Name { get; set; }
-}
+}

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -20,10 +20,6 @@ namespace BTCPayServer.Client.Models
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public TimeSpan InvoiceExpiration { get; set; } = TimeSpan.FromMinutes(15);
 
-        [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public TimeSpan DisplayExpirationTimer { get; set; } = TimeSpan.FromMinutes(5);
-
         [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public TimeSpan MonitoringExpiration { get; set; } = TimeSpan.FromMinutes(60);
@@ -63,11 +59,8 @@ 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/StoreData.cs

@@ -7,7 +7,7 @@ namespace BTCPayServer.Client.Models
         /// </summary>
         public string Id { get; set; }
     }
-
+    
     public class StoreUserData
     {
         /// <summary>

BTCPayServer.Client/Models/StoreRatePreviewResult.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace BTCPayServer.Client.Models;
+
+public class StoreRatePreviewResult
+{
+    public string CurrencyPair { get; set; }
+    public decimal? Rate { get; set; }
+    public List<string> Errors { get; set; }
+}

BTCPayServer.Client/Models/StoreRateResult.cs

@@ -1,13 +1,7 @@
-using System.Collections.Generic;
-using BTCPayServer.JsonConverters;
-using Newtonsoft.Json;
-
-namespace BTCPayServer.Client.Models;
+namespace BTCPayServer.Client.Models;
 
 public class StoreRateResult
 {
     public string CurrencyPair { get; set; }
-    [JsonConverter(typeof(NumericStringJsonConverter))]
-    public decimal? Rate { get; set; }
-    public List<string> Errors { get; set; }
-}
+    public decimal Rate { get; set; }
+}

BTCPayServer.Client/Models/TradeQuoteResponseData.cs

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

BTCPayServer.Client/Models/WithdrawRequestData.cs

@@ -1,85 +1,13 @@
-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; }
-    [JsonConverter(typeof(JsonConverters.TradeQuantityJsonConverter))]
-    public TradeQuantity Qty { set; get; }
+    public decimal Qty { set; get; }
 
-    public WithdrawRequestData()
-    {
-
-    }
-
-    public WithdrawRequestData(string paymentMethod, TradeQuantity qty)
+    public WithdrawRequestData(string paymentMethod, decimal 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

@@ -1,22 +0,0 @@
-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,13 +5,18 @@ using Newtonsoft.Json.Converters;
 
 namespace BTCPayServer.Client.Models;
 
-public class WithdrawalResponseData : WithdrawalBaseResponseData
+public class WithdrawalResponseData
 {
+    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; }
@@ -19,10 +24,14 @@ public class WithdrawalResponseData : WithdrawalBaseResponseData
     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) : base(paymentMethod, asset, ledgerEntries, accountId,
-        custodianCode)
+        string custodianCode, WithdrawalStatus status, DateTimeOffset createdTime, string targetAddress, string transactionId)
     {
+        PaymentMethod = paymentMethod;
+        Asset = asset;
+        LedgerEntries = ledgerEntries;
         WithdrawalId = withdrawalId;
+        AccountId = accountId;
+        CustodianCode = custodianCode;
         TargetAddress = targetAddress;
         TransactionId = transactionId;
         Status = status;

BTCPayServer.Client/Models/WithdrawalSimulationResponseData.cs

@@ -1,21 +0,0 @@
-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

@@ -6,9 +6,7 @@ namespace BTCPayServer.Client
 {
     public class Policies
     {
-        public const string CanViewLightningInvoiceInternalNode = "btcpay.server.canviewlightninginvoiceinternalnode";
         public const string CanCreateLightningInvoiceInternalNode = "btcpay.server.cancreatelightninginvoiceinternalnode";
-        public const string CanViewLightningInvoiceInStore = "btcpay.store.canviewlightninginvoice";
         public const string CanCreateLightningInvoiceInStore = "btcpay.store.cancreatelightninginvoice";
         public const string CanUseInternalLightningNode = "btcpay.server.canuseinternallightningnode";
         public const string CanUseLightningNodeInStore = "btcpay.store.canuselightningnode";
@@ -28,11 +26,8 @@ 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";
-        public const string CanCreateNonApprovedPullPayments = "btcpay.store.cancreatenonapprovedpullpayments";
         public const string CanViewCustodianAccounts = "btcpay.store.canviewcustodianaccounts";
         public const string CanManageCustodianAccounts = "btcpay.store.canmanagecustodianaccounts";
         public const string CanDepositToCustodianAccounts = "btcpay.store.candeposittocustodianaccount";
@@ -61,20 +56,15 @@ namespace BTCPayServer.Client
                 yield return CanViewNotificationsForUser;
                 yield return Unrestricted;
                 yield return CanUseInternalLightningNode;
-                yield return CanViewLightningInvoiceInternalNode;
                 yield return CanCreateLightningInvoiceInternalNode;
                 yield return CanUseLightningNodeInStore;
-                yield return CanViewLightningInvoiceInStore;
                 yield return CanCreateLightningInvoiceInStore;
                 yield return CanManagePullPayments;
-                yield return CanCreatePullPayments;
-                yield return CanCreateNonApprovedPullPayments;
                 yield return CanViewCustodianAccounts;
                 yield return CanManageCustodianAccounts;
                 yield return CanDepositToCustodianAccounts;
                 yield return CanWithdrawFromCustodianAccounts;
                 yield return CanTradeCustodianAccount;
-                yield return CanManageUsers;
             }
         }
         public static bool IsValidPolicy(string policy)
@@ -98,45 +88,9 @@ namespace BTCPayServer.Client
         {
             return policy.StartsWith("btcpay.plugin", StringComparison.OrdinalIgnoreCase);
         }
-        public static bool IsUserPolicy(string policy)
-        {
-            return policy.StartsWith("btcpay.user", StringComparison.OrdinalIgnoreCase);
-        }
-    }
-
-    public class PermissionSet
-    {
-        public PermissionSet() : this(Array.Empty<Permission>())
-        {
-
-        }
-        public PermissionSet(Permission[] permissions)
-        {
-            Permissions = permissions;
-        }
-
-        public Permission[] Permissions { get; }
-
-        public bool Contains(Permission requestedPermission)
-        {
-            return Permissions.Any(p => p.Contains(requestedPermission));
-        }
-        public bool Contains(string permission, string store)
-        {
-            if (permission is null)
-                throw new ArgumentNullException(nameof(permission));
-            if (store is null)
-                throw new ArgumentNullException(nameof(store));
-            return Contains(Permission.Create(permission, store));
-        }
     }
     public class Permission
     {
-        static Permission()
-        {
-            Init();
-        }
-
         public static Permission Create(string policy, string scope = null)
         {
             if (TryCreatePermission(policy, scope, out var r))
@@ -152,7 +106,7 @@ namespace BTCPayServer.Client
             policy = policy.Trim().ToLowerInvariant();
             if (!Policies.IsValidPolicy(policy))
                 return false;
-            if (!string.IsNullOrEmpty(scope) && !Policies.IsStorePolicy(policy))
+            if (scope != null && !Policies.IsStorePolicy(policy))
                 return false;
             permission = new Permission(policy, scope);
             return true;
@@ -205,7 +159,7 @@ namespace BTCPayServer.Client
             }
             if (!Policies.IsStorePolicy(subpermission.Policy))
                 return true;
-            return Scope == null || subpermission.Scope == Scope;
+            return Scope == null || subpermission.Scope == this.Scope;
         }
 
         public static IEnumerable<Permission> ToPermissions(string[] permissions)
@@ -221,61 +175,35 @@ namespace BTCPayServer.Client
 
         private bool ContainsPolicy(string subpolicy)
         {
-            return ContainsPolicy(Policy, subpolicy);
-        }
-
-        private static bool ContainsPolicy(string policy, string subpolicy)
-        {
-            if (policy == Policies.Unrestricted)
+            if (this.Policy == Policies.Unrestricted)
                 return true;
-            if (policy == subpolicy)
+            if (this.Policy == subpolicy)
                 return true;
-            if (!PolicyMap.TryGetValue(policy, out var subPolicies))
-                return false;
-            return subPolicies.Contains(subpolicy) || subPolicies.Any(s => ContainsPolicy(s, subpolicy));
-        }
-
-        private static Dictionary<string, HashSet<string>> PolicyMap = new();
-
-        private static void Init()
-        {
-            PolicyHasChild(Policies.CanModifyStoreSettings,
-                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)
-        {
-            if (PolicyMap.TryGetValue(policy, out var existingSubPolicies))
+            switch (subpolicy)
             {
-                foreach (string subPolicy in subPolicies)
-                {
-                    existingSubPolicies.Add(subPolicy);
-                }
-            }
-            else
-            {
-                PolicyMap.Add(policy, subPolicies.ToHashSet());
+                case Policies.CanViewInvoices when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanViewInvoices when this.Policy == Policies.CanModifyInvoices:
+                case Policies.CanModifyStoreWebhooks when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanViewInvoices when this.Policy == Policies.CanViewStoreSettings:
+                case Policies.CanViewStoreSettings when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanCreateInvoice when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanModifyInvoices when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanViewProfile when this.Policy == Policies.CanModifyProfile:
+                case Policies.CanModifyPaymentRequests when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanViewPaymentRequests when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanManagePullPayments when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanViewPaymentRequests when this.Policy == Policies.CanViewStoreSettings:
+                case Policies.CanViewPaymentRequests when this.Policy == Policies.CanModifyPaymentRequests:
+                case Policies.CanCreateLightningInvoiceInternalNode when this.Policy == Policies.CanUseInternalLightningNode:
+                case Policies.CanCreateLightningInvoiceInStore when this.Policy == Policies.CanUseLightningNodeInStore:
+                case Policies.CanViewNotificationsForUser when this.Policy == Policies.CanManageNotificationsForUser:
+                case Policies.CanUseInternalLightningNode when this.Policy == Policies.CanModifyServerSettings:
+                case Policies.CanViewCustodianAccounts when this.Policy == Policies.CanManageCustodianAccounts:
+                case Policies.CanViewCustodianAccounts when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanManageCustodianAccounts when this.Policy == Policies.CanModifyStoreSettings:
+                    return true;
+                default:
+                    return false;
             }
         }
 
@@ -284,17 +212,23 @@ namespace BTCPayServer.Client
 
         public override string ToString()
         {
-            return Scope != null ? $"{Policy}:{Scope}" : Policy;
+            if (Scope != null)
+            {
+                return $"{Policy}:{Scope}";
+            }
+            return Policy;
         }
 
         public override bool Equals(object obj)
         {
             Permission item = obj as Permission;
-            return item != null && ToString().Equals(item.ToString());
+            if (item == null)
+                return false;
+            return ToString().Equals(item.ToString());
         }
         public static bool operator ==(Permission a, Permission b)
         {
-            if (ReferenceEquals(a, b))
+            if (System.Object.ReferenceEquals(a, b))
                 return true;
             if (((object)a == null) || ((object)b == null))
                 return false;

BTCPayServer.Common/BTCPayServer.Common.csproj

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

BTCPayServer.Common/MultiProcessingQueue.cs

@@ -23,7 +23,7 @@ namespace BTCPayServer
             internal Task ProcessTask;
             public async Task Process(CancellationToken cancellationToken)
             {
-retry:
+                retry:
                 while (Chan.Reader.TryRead(out var item))
                 {
                     await item(cancellationToken);
@@ -52,7 +52,7 @@ retry:
         {
             lock (_Queues)
             {
-retry:
+                retry:
                 if (stopped)
                     return;
                 Cleanup();

BTCPayServer.Data/ApplicationDbContext.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
+using BTCPayServer.Data.Data;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
@@ -30,12 +30,7 @@ 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; }
@@ -72,9 +67,8 @@ namespace BTCPayServer.Data
         public DbSet<WalletTransactionData> WalletTransactions { get; set; }
         public DbSet<WebhookDeliveryData> WebhookDeliveries { get; set; }
         public DbSet<WebhookData> Webhooks { get; set; }
-        public DbSet<LightningAddressData> LightningAddresses { 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)
         {
@@ -89,23 +83,23 @@ namespace BTCPayServer.Data
 
             // some of the data models don't have OnModelCreating for now, commenting them
 
-            ApplicationUser.OnModelCreating(builder, Database);
+            ApplicationUser.OnModelCreating(builder);
             AddressInvoiceData.OnModelCreating(builder);
-            APIKeyData.OnModelCreating(builder, Database);
+            APIKeyData.OnModelCreating(builder);
             AppData.OnModelCreating(builder);
-            CustodianAccountData.OnModelCreating(builder, Database);
+            CustodianAccountData.OnModelCreating(builder);
             //StoredFile.OnModelCreating(builder);
             InvoiceEventData.OnModelCreating(builder);
             InvoiceSearchData.OnModelCreating(builder);
             InvoiceWebhookDeliveryData.OnModelCreating(builder);
-            InvoiceData.OnModelCreating(builder, Database);
-            NotificationData.OnModelCreating(builder, Database);
+            InvoiceData.OnModelCreating(builder);
+            NotificationData.OnModelCreating(builder);
             //OffchainTransactionData.OnModelCreating(builder);
             BTCPayServer.Data.PairedSINData.OnModelCreating(builder);
             PairingCodeData.OnModelCreating(builder);
             //PayjoinLock.OnModelCreating(builder);
-            PaymentRequestData.OnModelCreating(builder, Database);
-            PaymentData.OnModelCreating(builder, Database);
+            PaymentRequestData.OnModelCreating(builder);
+            PaymentData.OnModelCreating(builder);
             PayoutData.OnModelCreating(builder);
             PendingInvoiceData.OnModelCreating(builder);
             //PlannedTransaction.OnModelCreating(builder);
@@ -116,7 +110,7 @@ namespace BTCPayServer.Data
             StoreWebhookData.OnModelCreating(builder);
             StoreData.OnModelCreating(builder, Database);
             U2FDevice.OnModelCreating(builder);
-            Fido2Credential.OnModelCreating(builder, Database);
+            Fido2Credential.OnModelCreating(builder);
             BTCPayServer.Data.UserStore.OnModelCreating(builder);
             //WalletData.OnModelCreating(builder);
             WalletObjectData.OnModelCreating(builder, Database);
@@ -124,11 +118,10 @@ namespace BTCPayServer.Data
 #pragma warning disable CS0612 // Type or member is obsolete
             WalletTransactionData.OnModelCreating(builder);
 #pragma warning restore CS0612 // Type or member is obsolete
-            WebhookDeliveryData.OnModelCreating(builder, Database);
-            LightningAddressData.OnModelCreating(builder, Database);
-            PayoutProcessorData.OnModelCreating(builder, Database);
-            WebhookData.OnModelCreating(builder, Database);
-            FormData.OnModelCreating(builder, Database);
+            WebhookDeliveryData.OnModelCreating(builder);
+            LightningAddressData.OnModelCreating(builder);
+            PayoutProcessorData.OnModelCreating(builder);
+            //WebhookData.OnModelCreating(builder);
 
 
             if (Database.IsSqlite() && !_designTime)

BTCPayServer.Data/Data/APIKeyData.cs

@@ -1,11 +1,9 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class APIKeyData : IHasBlob<APIKeyBlob>
+    public class APIKeyData
     {
         [MaxLength(50)]
         public string Id { get; set; }
@@ -18,15 +16,13 @@ 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, DatabaseFacade databaseFacade)
+        internal static void OnModelCreating(ModelBuilder builder)
         {
             builder.Entity<APIKeyData>()
                    .HasOne(o => o.StoreData)
@@ -40,13 +36,6 @@ 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,13 +2,11 @@ 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, IHasBlob<UserBlob>
+    public class ApplicationUser : IdentityUser
     {
         public bool RequiresEmailConfirmation { get; set; }
         public List<StoredFile> StoredFiles { get; set; }
@@ -22,28 +20,15 @@ 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, DatabaseFacade databaseFacade)
+        public static void OnModelCreating(ModelBuilder builder)
         {
             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,13 +1,11 @@
-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 : IHasBlob<JObject>
+public class CustodianAccountData
 {
     [Required]
     [MaxLength(50)]
@@ -16,39 +14,29 @@ public class CustodianAccountData : IHasBlob<JObject>
     [Required]
     [MaxLength(50)]
     public string StoreId { get; set; }
-
+    
     [Required]
     [MaxLength(50)]
     public string CustodianCode { get; set; }
-
+    
     [Required]
     [MaxLength(50)]
     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, DatabaseFacade databaseFacade)
+    
+    internal static void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity<CustodianAccountData>()
             .HasOne(o => o.StoreData)
             .WithMany(i => i.CustodianAccounts)
             .HasForeignKey(i => i.StoreId).OnDelete(DeleteBehavior.Cascade);
-
-        builder.Entity<CustodianAccountData>()
+        
+        builder.Entity<APIKeyData>()
             .HasIndex(o => o.StoreId);
-
-        if (databaseFacade.IsNpgsql())
-        {
-            builder.Entity<CustodianAccountData>()
-                .Property(o => o.Blob2)
-                .HasColumnType("JSONB");
-        }
     }
 }

BTCPayServer.Data/Data/Fido2Credential.cs

@@ -2,11 +2,10 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class Fido2Credential : IHasBlobUntyped
+    public class Fido2Credential
     {
         public string Name { get; set; }
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -15,7 +14,6 @@ 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
         {
@@ -24,18 +22,12 @@ namespace BTCPayServer.Data
             [Display(Name = "Lightning node (LNURL Auth)")]
             LNURLAuth
         }
-        public static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
+        public static void OnModelCreating(ModelBuilder builder)
         {
             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,30 +2,11 @@ using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace BTCPayServer.Data;
+namespace BTCPayServer.Data.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

@@ -1,28 +0,0 @@
-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,11 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class InvoiceData : IHasBlobUntyped
+    public class InvoiceData
     {
         public string Id { get; set; }
 
@@ -17,9 +16,7 @@ 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; }
@@ -35,7 +32,7 @@ namespace BTCPayServer.Data
         public RefundData CurrentRefund { get; set; }
 
 
-        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
+        internal static void OnModelCreating(ModelBuilder builder)
         {
             builder.Entity<InvoiceData>()
                 .HasOne(o => o.StoreData)
@@ -45,13 +42,6 @@ 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,22 +1,17 @@
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Newtonsoft.Json.Linq;
+using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data;
 
-public class LightningAddressData : IHasBlob<LightningAddressDataBlob>
+public class LightningAddressData
 {
     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, DatabaseFacade databaseFacade)
+    internal static void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity<LightningAddressData>()
             .HasOne(o => o.Store)
@@ -25,12 +20,6 @@ public class LightningAddressData : IHasBlob<LightningAddressDataBlob>
             .IsRequired()
             .OnDelete(DeleteBehavior.Cascade);
         builder.Entity<LightningAddressData>().HasKey(o => o.Username);
-        if (databaseFacade.IsNpgsql())
-        {
-            builder.Entity<LightningAddressData>()
-                .Property(o => o.Blob2)
-                .HasColumnType("JSONB");
-        }
     }
 }
 
@@ -39,6 +28,4 @@ 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,12 +1,10 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage;
 
 namespace BTCPayServer.Data
 {
-    public class NotificationData : IHasBlobUntyped
+    public class NotificationData
     {
         [MaxLength(36)]
         public string Id { get; set; }
@@ -19,23 +17,15 @@ 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, DatabaseFacade databaseFacade)
+        internal static void OnModelCreating(ModelBuilder builder)
         {
             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,34 +1,24 @@
-using System;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class PaymentData : IHasBlobUntyped
+    public class PaymentData
     {
         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, DatabaseFacade databaseFacade)
+        internal static void OnModelCreating(ModelBuilder builder)
         {
             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,10 +1,9 @@
 using System;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class PaymentRequestData : IHasBlobUntyped
+    public class PaymentRequestData
     {
         public string Id { get; set; }
         public DateTimeOffset Created { get; set; }
@@ -15,12 +14,10 @@ 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, DatabaseFacade databaseFacade)
+        internal static void OnModelCreating(ModelBuilder builder)
         {
             builder.Entity<PaymentRequestData>()
                 .HasOne(o => o.StoreData)
@@ -31,13 +28,6 @@ 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,15 +1,9 @@
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace BTCPayServer.Data;
+namespace BTCPayServer.Data.Data;
 
-public class AutomatedPayoutBlob
-{
-    public TimeSpan Interval { get; set; } = TimeSpan.FromHours(1);
-}
-public class PayoutProcessorData : IHasBlobUntyped
+public class PayoutProcessorData
 {
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     public string Id { get; set; }
@@ -17,23 +11,15 @@ public class PayoutProcessorData : IHasBlobUntyped
     public StoreData Store { get; set; }
     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, DatabaseFacade databaseFacade)
+    
+    internal static void OnModelCreating(ModelBuilder builder)
     {
+
         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,13 +1,11 @@
 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 Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using PayoutProcessorData = BTCPayServer.Data.PayoutProcessorData;
+using PayoutProcessorData = BTCPayServer.Data.Data.PayoutProcessorData;
 
 namespace BTCPayServer.Data
 {
@@ -27,6 +25,7 @@ namespace BTCPayServer.Data
         [Obsolete("Use GetDerivationStrategies instead")]
         public string DerivationStrategy { get; set; }
 
+        [Obsolete("Use GetDerivationStrategies instead")]
         public string DerivationStrategies { get; set; }
 
         public string StoreName { get; set; }
@@ -51,7 +50,6 @@ 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)
         {
@@ -60,20 +58,6 @@ namespace BTCPayServer.Data
                 builder.Entity<StoreData>()
                     .Property(o => o.StoreBlob)
                     .HasColumnType("JSONB");
-
-                builder.Entity<StoreData>()
-                    .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/StoreSettingData.cs

@@ -11,7 +11,7 @@ public class StoreSettingData
     public string Value { get; set; }
 
     public StoreData Store { get; set; }
-
+        
     public static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
     {
         builder.Entity<StoreSettingData>().HasKey(data => new { data.StoreId, data.Name });

BTCPayServer.Data/Data/TradeResultData.cs

@@ -2,5 +2,5 @@ namespace BTCPayServer.Data;
 
 public class TradeResultData
 {
-
+    
 }

BTCPayServer.Data/Data/WalletObjectData.cs

@@ -12,13 +12,6 @@ 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";
@@ -28,7 +21,7 @@ namespace BTCPayServer.Data
             public const string PayjoinExposed = "pj-exposed";
             public const string Payout = "payout";
             public const string PullPayment = "pull-payment";
-            public const string Address = "address";
+            public const string Script = "script";
             public const string Utxo = "utxo";
         }
         public string WalletId { get; set; }

BTCPayServer.Data/Data/WalletObjectLinkData.cs

@@ -19,6 +19,7 @@ namespace BTCPayServer.Data
 
         public WalletObjectData A { get; set; }
         public WalletObjectData B { get; set; }
+        public int InfectionRate { get; set; } = 0;
 
         internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {