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

.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/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,7 +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)
     {
     }
+
+    
 }

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

@@ -12,7 +12,7 @@ public interface ICustodian
      * Get the unique code that identifies this custodian.
      */
     string Code { get; }
-
+    
     string Name { get; }
 
     /**

BTCPayServer.Abstractions/Extensions/GreenfieldExtensions.cs

@@ -30,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

@@ -17,7 +17,7 @@ public class Field
             Label = label,
             Name = name,
             Value = value,
-            OriginalValue = value,
+            OriginalValue = value,  
             Required = required,
             HelpText = helpText,
             Type = type

BTCPayServer.Abstractions/Form/Form.cs

@@ -22,10 +22,10 @@ public class Form
 #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()
     {
@@ -36,7 +36,7 @@ public class Form
     {
         return GetFieldByName(name, Fields, null);
     }
-
+    
     private static Field GetFieldByName(string name, List<Field> fields, string prefix)
     {
         prefix ??= string.Empty;
@@ -45,7 +45,7 @@ public class Form
             var currentPrefix = prefix;
             if (!string.IsNullOrEmpty(field.Name))
             {
-
+                
                 currentPrefix = $"{prefix}{field.Name}";
                 if (currentPrefix.Equals(name, StringComparison.InvariantCultureIgnoreCase))
                 {
@@ -60,7 +60,7 @@ public class Form
             {
                 return subFieldResult;
             }
-
+            
         }
         return null;
     }
@@ -73,7 +73,7 @@ public class Form
     private static List<string> GetAllNames(List<Field> fields)
     {
         var names = new List<string>();
-
+        
         foreach (var field in fields)
         {
             string prefix = string.Empty;
@@ -85,7 +85,7 @@ public class Form
 
             if (field.Fields.Any())
             {
-                names.AddRange(GetAllNames(field.Fields).Select(s => $"{prefix}{s}"));
+                names.AddRange(GetAllNames(field.Fields).Select(s => $"{prefix}{s}" ));
             }
         }
 
@@ -105,7 +105,7 @@ public class Form
             }
         }
     }
-
+    
     public void ApplyValuesFromForm(IFormCollection form)
     {
         var names = GetAllNames();
@@ -125,7 +125,7 @@ public class Form
     {
         return GetValues(Fields);
     }
-
+    
     private static Dictionary<string, object> GetValues(List<Field> fields)
     {
         var result = new Dictionary<string, object>();
@@ -136,12 +136,11 @@ public class Form
             {
                 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)
+                if (keylessValue is not Dictionary<string, object> dict) continue;
+                foreach (KeyValuePair<string,object> keyValuePair in dict)
                 {
                     result.TryAdd(keyValuePair.Key, keyValuePair.Value);
                 }

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

@@ -29,5 +29,5 @@ public class SVGUse : UrlResolutionTagHelper2
         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.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)
         {
@@ -51,44 +51,6 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Get), token);
             return await HandleResponse<AppDataBase>(response);
         }
-        
-        public virtual async Task<AppDataBase[]> GetAllApps(string storeId, CancellationToken token = default)
-        {
-            if (storeId == null)
-                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)
         {

BTCPayServer.Client/BTCPayServerClient.CustodianAccounts.cs

@@ -58,7 +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,
@@ -81,8 +81,8 @@ 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> CreateWithdrawal(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);

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

@@ -16,15 +16,9 @@ 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/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/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);
@@ -64,7 +60,7 @@ namespace BTCPayServer.Client.Models
         public NetworkFeeMode NetworkFeeMode { get; set; } = NetworkFeeMode.Never;
 
         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/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";
@@ -30,8 +28,6 @@ namespace BTCPayServer.Client
         public const string CanCreateUser = "btcpay.server.cancreateuser";
         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";
@@ -60,14 +56,10 @@ 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;
@@ -99,11 +91,6 @@ namespace BTCPayServer.Client
     }
     public class Permission
     {
-        static Permission()
-        {
-            Init();
-        }
-        
         public static Permission Create(string policy, string scope = null)
         {
             if (TryCreatePermission(policy, scope, out var r))
@@ -188,55 +175,37 @@ 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 );
-            
-            PolicyHasChild(Policies.CanManagePullPayments, Policies.CanCreatePullPayments );
-            PolicyHasChild(Policies.CanCreatePullPayments, Policies.CanCreateNonApprovedPullPayments );
-            PolicyHasChild(Policies.CanModifyPaymentRequests, Policies.CanViewPaymentRequests );
-            PolicyHasChild(Policies.CanModifyProfile, Policies.CanViewProfile );
-            PolicyHasChild(Policies.CanUseLightningNodeInStore, Policies.CanViewLightningInvoiceInStore, Policies.CanCreateLightningInvoiceInStore );
-            PolicyHasChild(Policies.CanManageNotificationsForUser, Policies.CanViewNotificationsForUser );
-            PolicyHasChild(Policies.CanModifyServerSettings, Policies.CanUseInternalLightningNode );
-            PolicyHasChild(Policies.CanUseInternalLightningNode, Policies.CanCreateLightningInvoiceInternalNode,Policies.CanViewLightningInvoiceInternalNode );
-            PolicyHasChild(Policies.CanManageCustodianAccounts, Policies.CanViewCustodianAccounts );
-            PolicyHasChild(Policies.CanModifyInvoices, Policies.CanViewInvoices, Policies.CanCreateInvoice );
-            PolicyHasChild(Policies.CanViewStoreSettings, Policies.CanViewInvoices, Policies.CanViewPaymentRequests  );
-            
-        }
-
-        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;
             }
         }
-        
 
         public string Scope { get; }
         public string Policy { get; }

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,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using BTCPayServer.Data.Data;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
@@ -32,11 +31,6 @@ namespace BTCPayServer.Data
             _designTime = designTime;
         }
 
-        public async Task<string?> GetMigrationState()
-        {
-            return (await Settings.FromSqlRaw("SELECT \"Id\", \"Value\" FROM \"Settings\" WHERE \"Id\"='MigrationData'").AsNoTracking().FirstOrDefaultAsync())?.Value;
-        }
-
         public DbSet<AddressInvoiceData> AddressInvoices { get; set; }
         public DbSet<APIKeyData> ApiKeys { get; set; }
         public DbSet<AppData> Apps { get; set; }
@@ -73,7 +67,7 @@ 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; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)

BTCPayServer.Data/Data/CustodianAccountData.cs

@@ -14,28 +14,28 @@ public class CustodianAccountData
     [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]
     public byte[] Blob { get; set; }
-
+    
     [JsonIgnore]
     public StoreData StoreData { get; set; }
-
+    
     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<APIKeyData>()
             .HasIndex(o => o.StoreId);
     }

BTCPayServer.Data/Data/LightingAddressData.cs

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

BTCPayServer.Data/Data/PayoutProcessorData.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data.Data;
@@ -11,9 +11,9 @@ public class PayoutProcessorData
     public StoreData Store { get; set; }
     public string PaymentMethod { get; set; }
     public string Processor { get; set; }
-
+    
     public byte[] Blob { get; set; }
-
+    
     internal static void OnModelCreating(ModelBuilder builder)
     {
 

BTCPayServer.Data/Data/StoreData.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Text;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Data.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 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; }
@@ -59,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

@@ -21,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)
         {

BTCPayServer.Data/Migrations/20220115184620_AddCustodianAccountData.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 

BTCPayServer.Data/Migrations/20220311135252_AddPayoutProcessors.cs

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

BTCPayServer.Data/Migrations/20220414132313_AddLightningAddress.cs

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

BTCPayServer.Data/Migrations/20220610090843_AddSettingsToStore.cs

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

BTCPayServer.Data/Migrations/20220929132704_label.cs

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

BTCPayServer.Data/Migrations/20221123072311_WalletObjectInfection.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    public partial class WalletObjectInfection : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "InfectionRate",
+                table: "WalletObjectLinks",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "InfectionRate",
+                table: "WalletObjectLinks");
+        }
+    }
+}

BTCPayServer.Data/Migrations/20230123062447_migrateoldratesource.cs

@@ -1,30 +0,0 @@
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20230123062447_migrateoldratesource")]
-    public partial class migrateoldratesource : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            if (migrationBuilder.IsNpgsql())
-            {
-                migrationBuilder.Sql("UPDATE \"Stores\" SET \"StoreBlob\"=jsonb_set(\"StoreBlob\", \'{preferredExchange}\', \'{\"oasis_trade\": \"oasisdev\", \"gdax\":\"coinbasepro\", \"coinaverage\":\"coingecko\"}\'::jsonb->(\"StoreBlob\"->>\'preferredExchange\')) WHERE \"StoreBlob\"->>\'preferredExchange\' = ANY (ARRAY[\'oasis_trade\', \'gdax\', \'coinaverage\']);");
-            }
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            // Not supported
-        }
-    }
-}

BTCPayServer.Data/Migrations/20230130062447_jsonb2.cs

@@ -1,30 +0,0 @@
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20230130062447_jsonb2")]
-    public partial class jsonb2 : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            if (migrationBuilder.IsNpgsql())
-            {
-                migrationBuilder.Sql("ALTER TABLE \"Stores\" ALTER COLUMN \"DerivationStrategies\" TYPE JSONB USING \"DerivationStrategies\"::JSONB");
-            }
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            // Not supported
-        }
-    }
-}

BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -886,8 +886,12 @@ namespace BTCPayServer.Migrations
 
                     b.Property<string>("Data")
                         .HasColumnType("TEXT");
+					
+					b.Property<int>("InfectionRate")
+
+                    b.HasKey("WalletId", "AType", "AId", "BType", "BId");                        
+                    .HasColumnType("INTEGER");
 
-                    b.HasKey("WalletId", "AType", "AId", "BType", "BId");
 
                     b.HasIndex("WalletId", "BType", "BId");
 

BTCPayServer.PluginPacker/BTCPayServer.PluginPacker.csproj

@@ -26,8 +26,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="BTCPayServer.NETCore.Plugins.Mvc" Version="1.4.4" />
-      <ProjectReference Include="..\BTCPayServer\BTCPayServer.csproj" />
+      <PackageReference Include="McMaster.NETCore.Plugins.Mvc" Version="1.4.0" />
+      <ProjectReference Include="..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />
       <None Include="icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 </Project>

BTCPayServer.PluginPacker/Program.cs

@@ -28,13 +28,13 @@ namespace BTCPayServer.PluginPacker
             var name = args[1];
             var outputDir = Path.Combine(args[2], name);
             var outputFile = Path.Combine(outputDir, name);
-            var rootDLLPath = Path.GetFullPath(Path.Combine(directory, name + ".dll"));
+            var rootDLLPath = Path.Combine(directory, name + ".dll");
             if (!File.Exists(rootDLLPath))
             {
                 throw new Exception($"{rootDLLPath} could not be found");
             }
 
-            var plugin = PluginLoader.CreateFromAssemblyFile(rootDLLPath, false, new[] { typeof(IBTCPayServerPlugin) }, o => o.PreferSharedTypes = true);
+            var plugin = PluginLoader.CreateFromAssemblyFile(rootDLLPath, false, new[] { typeof(IBTCPayServerPlugin) });
             var assembly = plugin.LoadAssembly(name);
             var extension = GetAllExtensionTypesFromAssembly(assembly).FirstOrDefault();
             if (extension is null)
@@ -57,8 +57,8 @@ namespace BTCPayServer.PluginPacker
 
             var sha256sums = new StringBuilder();
             sha256sums.AppendLine(
-                $"{Encoders.Hex.EncodeData(Hashes.SHA256(Encoding.UTF8.GetBytes(json)))} {name}.btcpay.json");
-
+                $"{Encoders.Hex.EncodeData(Hashes.SHA256(Encoding.UTF8.GetBytes(json)))} {name}.btcpay.json"); 
+            
             sha256sums.AppendLine(
                 $"{Encoders.Hex.EncodeData(Hashes.SHA256(await File.ReadAllBytesAsync(outputFile + ".btcpay")))} {name}.btcpay");
 
@@ -68,7 +68,7 @@ namespace BTCPayServer.PluginPacker
                 File.Delete(sha256dirs);
             }
             await File.WriteAllTextAsync(sha256dirs, sha256sums.ToString());
-
+            
             // try Windows executable first, fall back to macOS/Linux PowerShell
             try
             {
@@ -86,7 +86,7 @@ namespace BTCPayServer.PluginPacker
                         $"Attempted to sign hashes with gpg but maybe powershell is not installed?\n{ex.Message}");
                 }
             }
-
+            
             Console.WriteLine($"Created {outputFile}.btcpay at {directory}");
         }
 

BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
     <ItemGroup>
       <FrameworkReference Include="Microsoft.AspNetCore.App" />
-      <ProjectReference Include="..\..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />
+      <ProjectReference Include="..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />
       <EmbeddedResource Include="Resources\**" />
     </ItemGroup>
     <ItemGroup>

BTCPayServer.Plugins.Test/TestExtension.cs

@@ -1,7 +1,10 @@
+using System;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Abstractions.Services;
 using BTCPayServer.Plugins.Test.Services;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace BTCPayServer.Plugins.Test

BTCPayServer.Plugins.Test/TestPluginMigrationRunner.cs

@@ -7,7 +7,7 @@ using Microsoft.Extensions.Hosting;
 
 namespace BTCPayServer.Plugins.Test;
 
-public class TestPluginMigrationRunner : IHostedService
+public class TestPluginMigrationRunner:IHostedService
 {
     public class TestPluginDataMigrationHistory
     {
@@ -35,6 +35,7 @@ public class TestPluginMigrationRunner : IHostedService
             settings.UpdatedSomething = true;
             await _settingsRepository.UpdateSetting(settings);
         }
+            
     }
 
     public Task StopAsync(CancellationToken cancellationToken)

BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml

@@ -0,0 +1,2 @@
+
+<li class="nav-item"><a asp-controller="UITestExtension" asp-action="Index" class="nav-link js-scroll-trigger" >Dear Nicolas Dorier</a></li>