Merge pull request #6282 from NicolasDorier/refactorcheckout

Allow payment methods to modify all the payment model

BTCPayApp.CommonServer/BTCPayApp.CommonServer.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <LangVersion>latest</LangVersion>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\BTCPayServer.Client\BTCPayServer.Client.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.6" />
-    </ItemGroup>
-</Project>

BTCPayApp.CommonServer/IBTCPayAppHubClient.cs

@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using BTCPayServer.Client.Models;
-using BTCPayServer.Lightning;
-using NBitcoin;
-
-namespace BTCPayApp.CommonServer;
-
-//methods available on the hub in the client
-public interface IBTCPayAppHubClient
-{
-    Task NotifyServerEvent(ServerEvent ev);
-    Task NotifyNetwork(string network);
-    Task NotifyServerNode(string nodeInfo);
-    Task TransactionDetected(TransactionDetectedRequest request);
-    Task NewBlock(string block);
-
-    Task<LightningInvoice> CreateInvoice(CreateLightningInvoiceRequest createLightningInvoiceRequest);
-    Task<LightningInvoice?> GetLightningInvoice(uint256 paymentHash);
-    Task<LightningPayment?> GetLightningPayment(uint256 paymentHash);
-    Task<List<LightningPayment>> GetLightningPayments(ListPaymentsParams request);
-    Task<List<LightningInvoice>> GetLightningInvoices(ListInvoicesParams request);
-    Task<PayResponse> PayInvoice(string bolt11, long? amountMilliSatoshi);
-    Task MasterUpdated(long? deviceIdentifier);
-    Task<LightningNodeInformation> GetLightningNodeInfo();
-    Task<LightningNodeBalance> GetLightningBalance();
-}
-
-//methods available on the hub in the server
-public interface IBTCPayAppHubServer
-{
-    Task<bool> DeviceMasterSignal(long deviceIdentifier, bool active);
-    
-    Task<Dictionary<string,string>> Pair(PairRequest request);
-    Task<AppHandshakeResponse> Handshake(AppHandshake request);
-    Task<bool> BroadcastTransaction(string tx);
-    Task<decimal> GetFeeRate(int blockTarget);
-    Task<BestBlockResponse> GetBestBlock();
-    
-    Task<TxInfoResponse> FetchTxsAndTheirBlockHeads(string[] txIds);
-    Task<string> DeriveScript(string identifier);
-    Task TrackScripts(string identifier, string[] scripts);
-    Task<string> UpdatePsbt(string[] identifiers, string psbt);
-    Task<CoinResponse[]> GetUTXOs(string[] identifiers);
-    Task<Dictionary<string, TxResp[]>> GetTransactions(string[] identifiers);
-
-    Task SendInvoiceUpdate(string identifier, LightningInvoice lightningInvoice);
-}
-
-public class ServerEvent(string type)
-{
-    public string Type { get; } = type;
-    public string? StoreId { get; init; }
-    public string? UserId { get; init; }
-    public string? InvoiceId { get; init; }
-}
-
-public record TxResp(long Confirmations, long? Height, decimal BalanceChange, DateTimeOffset Timestamp, string TransactionId)
-{
-    public override string ToString()
-    {
-        return $"{{ Confirmations = {Confirmations}, Height = {Height}, BalanceChange = {BalanceChange}, Timestamp = {Timestamp}, TransactionId = {TransactionId} }}";
-    }
-}
-
-public class TransactionDetectedRequest
-{
-    public string Identifier { get; set; }
-    public string TxId { get; set; }
-    public string[] SpentScripts { get; set; }
-    public string[] ReceivedScripts { get; set; }
-    public bool Confirmed { get; set; }
-}
-
-public class CoinResponse
-{
-    public string Identifier{ get; set; }
-    public bool Confirmed { get; set; }
-    public string Script { get; set; }
-    public string Outpoint { get; set; }
-    public decimal Value { get; set; }
-    public string Path { get; set; }
-}
-
-public class TxInfoResponse
-{
-    public Dictionary<string,TransactionResponse> Txs { get; set; }
-    public Dictionary<string,string> Blocks { get; set; }
-    public Dictionary<string,int> BlockHeghts { get; set; }
-}
-
-public class TransactionResponse
-{
-    public string? BlockHash { get; set; }
-    public int? BlockHeight { get; set; }
-    public string Transaction { get; set; }
-}
-
-public class BestBlockResponse
-{
-    public required string BlockHash { get; set; }
-    public required int BlockHeight { get; set; }
-    public string BlockHeader { get; set; }
-}
-
-public class AppHandshake
-{
-    public string[] Identifiers { get; set; }
-}
-
-public class AppHandshakeResponse
-{
-    //response about identifiers being tracked successfully
-    public string[] IdentifiersAcknowledged { get; set; }
-}
-
-
-public class PairRequest
-{
-    public Dictionary<string, string?> Derivations { get; set; } = new();
-}

BTCPayApp.CommonServer/Models/AcceptInviteRequest.cs

@@ -1,12 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace BTCPayApp.CommonServer.Models;
-
-public class AcceptInviteRequest
-{
-    [Required]
-    public string? UserId { get; init; }
-    
-    [Required]
-    public string? Code { get; init; }
-}

BTCPayApp.CommonServer/Models/AcceptInviteResult.cs

@@ -1,9 +0,0 @@
-namespace BTCPayApp.CommonServer.Models;
-
-public class AcceptInviteResult(string email)
-{
-    public string Email { get; init; } = email;
-    public bool? RequiresUserApproval { get; set; }
-    public bool? EmailHasBeenConfirmed { get; set; }
-    public string? PasswordSetCode { get; set; }
-}

BTCPayApp.CommonServer/Models/AccessTokenResult.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace BTCPayApp.CommonServer.Models;
-
-public class AccessTokenResult(string accessToken, string refreshToken, DateTimeOffset expiry)
-{
-    public string AccessToken { get; init; } = accessToken;
-    public string RefreshToken { get; init; } = refreshToken;
-    public DateTimeOffset Expiry { get; init; } = expiry;
-}

BTCPayApp.CommonServer/Models/AppInstanceInfo.cs

@@ -1,12 +0,0 @@
-namespace BTCPayApp.CommonServer.Models;
-
-public class AppInstanceInfo
-{
-    public string BaseUrl { get; set; }
-    public string ServerName { get; set; }
-    public string? ContactUrl { get; set; }
-    public string? LogoUrl { get; set; }
-    public string? CustomThemeCssUrl { get; set; }
-    public string? CustomThemeExtension { get; set; }
-    public bool RegistrationEnabled { get; set; }
-}

BTCPayApp.CommonServer/Models/AppUserInfo.cs

@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using System.Text.Json;
-using BTCPayServer.Lightning;
-using NBitcoin;
-using NBitcoin.JsonConverters;
-using Newtonsoft.Json;
-
-namespace BTCPayApp.CommonServer.Models;
-
-// public partial class LightningPayment
-// {
-//     public string PaymentHash { get; set; }
-//     public string? PaymentId { get; set; }
-//     public string? Preimage { get; set; }
-//     public string? Secret { get; set; }
-//     public bool Inbound { get; set; }
-//     public DateTimeOffset Timestamp { get; set; }
-//     public long Value { get; set; }
-//     public LightningPaymentStatus Status { get; set; }
-//
-//     //you can have multiple requests generated for the same payment hash, but once you reveal the preimage, you should reject any attempt to pay the same payment hash
-//     public List<string> PaymentRequests { get; set; }
-//     [JsonIgnore]
-//     public Dictionary<string, JsonDocument> AdditionalData { get; set; } 
-//     
-// }
-
-public class AppUserInfo
-{
-    public string? UserId { get; set; }
-    public string? Email { get; set; }
-    public string? Name { get; set; }
-    public string? ImageUrl { get; set; }
-    public IEnumerable<string>? Roles { get; set; }
-    public IEnumerable<AppUserStoreInfo>? Stores { get; set; }
-
-    public void SetInfo(string email, string? name, string? imageUrl)
-    {
-        Email = email;
-        Name = name;
-        ImageUrl = imageUrl;
-    }
-
-    public static bool Equals(AppUserInfo? x, AppUserInfo? y)
-    {
-        if (ReferenceEquals(x, y)) return true;
-        if (ReferenceEquals(x, null)) return false;
-        if (ReferenceEquals(y, null)) return false;
-        if (x.GetType() != y.GetType()) return false;
-        return x.UserId == y.UserId && x.Email == y.Email &&
-               x.Name == y.Name && x.ImageUrl == y.ImageUrl &&
-               Equals(x.Roles, y.Roles) && Equals(x.Stores, y.Stores);
-    }
-}
-
-public class AppUserStoreInfo
-{
-    public string? Id { get; set; }
-    public string? Name { get; set; }
-    public string? LogoUrl { get; set; }
-    public string? RoleId { get; set; }
-    public string? PosAppId { get; set; }
-    public string? DefaultCurrency { get; set; }
-    public bool Archived { get; set; }
-    public IEnumerable<string>? Permissions { get; set; }
-}

BTCPayApp.CommonServer/Models/CreateStoreData.cs

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace BTCPayApp.CommonServer.Models;
-
-public class CreateStoreData
-{
-    public string? DefaultCurrency { get; set; }
-    public string? RecommendedExchangeId { get; set; }
-    public Dictionary<string, string>? Exchanges { get; set; }
-}

BTCPayApp.CommonServer/Models/SignupRequest.cs

@@ -1,12 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace BTCPayApp.CommonServer.Models;
-
-public class SignupRequest
-{
-    [Required]
-    public string? Email { get; init; }
-    
-    [Required]
-    public string? Password { get; init; }
-}

BTCPayApp.CommonServer/Models/SignupResult.cs

@@ -1,8 +0,0 @@
-namespace BTCPayApp.CommonServer.Models;
-
-public class SignupResult
-{
-    public string? Email { get; set; }
-    public bool RequiresConfirmedEmail { get; set; }
-    public bool RequiresUserApproval { get; set; }
-}

BTCPayApp.CommonServer/PosDataParser.cs

@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayApp.CommonServer;
-
-public static class PosDataParser
-{
-    public static Dictionary<string, object> ParsePosData(JToken? posData)
-    {
-        var result = new Dictionary<string, object>();
-        if (posData is JObject jobj)
-        {
-            foreach (var item in jobj)
-            {
-                ParsePosDataItem(item, ref result);
-            }
-        }
-        return result;
-    }
-
-    static void ParsePosDataItem(KeyValuePair<string, JToken?> item, ref Dictionary<string, object> result)
-    {
-        switch (item.Value?.Type)
-        {
-            case JTokenType.Array:
-                var items = item.Value.AsEnumerable().ToList();
-                var arrayResult = new List<object>();
-                for (var i = 0; i < items.Count; i++)
-                {
-                    arrayResult.Add(items[i] is JObject
-                        ? ParsePosData(items[i])
-                        : items[i].ToString());
-                }
-
-                result.TryAdd(item.Key, arrayResult);
-
-                break;
-            case JTokenType.Object:
-                result.TryAdd(item.Key, ParsePosData(item.Value));
-                break;
-            case null:
-                break;
-            default:
-                result.TryAdd(item.Key, item.Value.ToString());
-                break;
-        }
-    }
-}

BTCPayApp.CommonServer/Roles.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace BTCPayApp.CommonServer;
-
-public class Roles
-{
-    public const string ServerAdmin = "ServerAdmin";
-    public static bool HasServerAdmin(IList<string> roles)
-    {
-        return roles.Contains(Roles.ServerAdmin, StringComparer.Ordinal);
-    }
-}

BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj

@@ -36,7 +36,6 @@
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\BTCPayApp.CommonServer\BTCPayApp.CommonServer.csproj" />
     <ProjectReference Include="..\BTCPayServer.Client\BTCPayServer.Client.csproj" />
   </ItemGroup>
 </Project>

BTCPayServer.Abstractions/Constants/AuthenticationSchemes.cs

@@ -1,12 +1,11 @@
-namespace BTCPayApp.CommonServer
+namespace BTCPayServer.Abstractions.Constants
 {
     public class AuthenticationSchemes
     {
         public const string Cookie = "Identity.Application";
         public const string Bitpay = "Bitpay";
-        public const string Greenfield = "Greenfield.APIKeys,Greenfield.Basic,Greenfield.Bearer";
+        public const string Greenfield = "Greenfield.APIKeys,Greenfield.Basic";
         public const string GreenfieldAPIKeys = "Greenfield.APIKeys";
         public const string GreenfieldBasic = "Greenfield.Basic";
-        public const string GreenfieldBearer = "Greenfield.Bearer";
     }
 }

BTCPayServer.Abstractions/Contracts/IFileService.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using BTCPayServer.Abstractions.Models;
 
 namespace BTCPayServer.Abstractions.Contracts;
 
@@ -14,4 +15,5 @@ public interface IFileService
     Task<string?> GetTemporaryFileUrl(Uri baseUri, string fileId, DateTimeOffset expiry,
         bool isDownload);
     Task RemoveFile(string fileId, string userId);
+    Task<UploadImageResultModel> UploadImage(IFormFile file, string userId, long maxFileSizeInBytes = 1_000_000);
 }

BTCPayServer.Abstractions/Contracts/ISyncSummaryProvider.cs

@@ -12,7 +12,7 @@ namespace BTCPayServer.Abstractions.Contracts
 
     public interface ISyncStatus
     {
-        public string CryptoCode { get; set; }
+        public string PaymentMethodId { get; set; }
         public bool Available { get; }
     }
 }

BTCPayServer.Abstractions/Extensions/ViewsRazor.cs

@@ -55,7 +55,7 @@ namespace BTCPayServer.Abstractions.Extensions
             viewData[ACTIVE_CATEGORY_KEY] = activeCategory;
         }
 
-        public static bool IsActiveCategory(this ViewDataDictionary viewData, string category, object id = null)
+        public static bool IsCategoryActive(this ViewDataDictionary viewData, string category, object id = null)
         {
             if (!viewData.ContainsKey(ACTIVE_CATEGORY_KEY)) return false;
             var activeId = viewData[ACTIVE_ID_KEY];
@@ -65,12 +65,12 @@ namespace BTCPayServer.Abstractions.Extensions
             return categoryMatch && idMatch;
         }
 
-        public static bool IsActiveCategory<T>(this ViewDataDictionary viewData, T category, object id = null)
+        public static bool IsCategoryActive<T>(this ViewDataDictionary viewData, T category, object id = null)
         {
-            return IsActiveCategory(viewData, category.ToString(), id);
+            return IsCategoryActive(viewData, category.ToString(), id);
         }
 
-        public static bool IsActivePage(this ViewDataDictionary viewData, string page, string category, object id = null)
+        public static bool IsPageActive(this ViewDataDictionary viewData, string page, string category, object id = null)
         {
             if (!viewData.ContainsKey(ACTIVE_PAGE_KEY)) return false;
             var activeId = viewData[ACTIVE_ID_KEY];
@@ -82,7 +82,7 @@ namespace BTCPayServer.Abstractions.Extensions
             return categoryAndPageMatch && idMatch;
         }
         
-        public static bool IsActivePage<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null)
+        public static bool IsPageActive<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null)
             where T : IConvertible
         {
             return pages.Any(page => ActivePageClass(viewData, page.ToString(), page.GetType().ToString(), id) == ACTIVE_CLASS);
@@ -95,7 +95,7 @@ namespace BTCPayServer.Abstractions.Extensions
 
         public static string ActiveCategoryClass(this ViewDataDictionary viewData, string category, object id = null)
         {
-            return IsActiveCategory(viewData, category, id) ? ACTIVE_CLASS : null;
+            return IsCategoryActive(viewData, category, id) ? ACTIVE_CLASS : null;
         }
 
         public static string ActivePageClass<T>(this ViewDataDictionary viewData, T page, object id = null)
@@ -106,12 +106,42 @@ namespace BTCPayServer.Abstractions.Extensions
 
         public static string ActivePageClass(this ViewDataDictionary viewData, string page, string category, object id = null)
         {
-            return IsActivePage(viewData, page, category, id) ? ACTIVE_CLASS : null;
+            return IsPageActive(viewData, page, category, id) ? ACTIVE_CLASS : null;
         }
-        
+
         public static string ActivePageClass<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null) where T : IConvertible
         {
-            return IsActivePage(viewData, pages, id) ? ACTIVE_CLASS : null;
+            return IsPageActive(viewData, pages, id) ? ACTIVE_CLASS : null;
+        }
+
+        [Obsolete("Use ActiveCategoryClass instead")]
+        public static string IsActiveCategory<T>(this ViewDataDictionary viewData, T category, object id = null)
+        {
+            return ActiveCategoryClass(viewData, category, id);
+        }
+
+        [Obsolete("Use ActiveCategoryClass instead")]
+        public static string IsActiveCategory(this ViewDataDictionary viewData, string category, object id = null)
+        {
+            return ActiveCategoryClass(viewData, category, id);
+        }
+
+        [Obsolete("Use ActivePageClass instead")]
+        public static string IsActivePage<T>(this ViewDataDictionary viewData, T page, object id = null) where T : IConvertible
+        {
+            return ActivePageClass(viewData, page, id);
+        }
+
+        [Obsolete("Use ActivePageClass instead")]
+        public static string IsActivePage<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null) where T : IConvertible
+        {
+            return ActivePageClass(viewData, pages, id);
+        }
+
+        [Obsolete("Use ActivePageClass instead")]
+        public static string IsActivePage(this ViewDataDictionary viewData, string page, string category, object id = null)
+        {
+            return ActivePageClass(viewData, page, category, id);
         }
 
         public static HtmlString ToBrowserDate(this DateTimeOffset date, string netFormat, string jsDateFormat = "short", string jsTimeFormat = "short")

BTCPayServer.Abstractions/Models/UploadImageResultModel.cs

@@ -0,0 +1,16 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BTCPayServer.Abstractions.Contracts;
+
+namespace BTCPayServer.Abstractions.Models;
+
+public class UploadImageResultModel
+{
+    public bool Success { get; set; }
+    public string Response { get; set; } = string.Empty;
+    public IStoredFile? StoredFile { get; set; }
+}

BTCPayServer.Abstractions/Security/AuthorizationFilterHandle.cs

@@ -1,4 +1,3 @@
-using BTCPayApp.CommonServer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 

BTCPayServer.Abstractions/Security/PolicyRequirement.cs

@@ -1,7 +1,7 @@
 using System;
 using Microsoft.AspNetCore.Authorization;
 
-namespace BTCPayApp.CommonServer
+namespace BTCPayServer.Security
 {
     public class PolicyRequirement : IAuthorizationRequirement
     {

BTCPayServer.Abstractions/Services/UIExtension.cs

@@ -1,9 +1,11 @@
+using System;
 using BTCPayServer.Abstractions.Contracts;
 
 namespace BTCPayServer.Abstractions.Services
 {
     public class UIExtension : IUIExtension
     {
+        [Obsolete("Use extension method BTCPayServer.Extensions.AddUIExtension(this IServiceCollection services, string location, string partialViewName) instead")]
         public UIExtension(string partial, string location)
         {
             Partial = partial;

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -12,7 +12,7 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/btcpayserver/btcpayserver</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Configurations>Debug;Release;Altcoins-Debug;Altcoins-Release</Configurations>
+        <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
     </PropertyGroup>
   <PropertyGroup>

BTCPayServer.Client/BTCPayServerClient.Apps.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -58,6 +59,20 @@ public partial class BTCPayServerClient
         return await SendHttpRequest<CrowdfundAppData>($"api/v1/apps/crowdfund/{appId}", null, HttpMethod.Get, token);
     }
 
+    public virtual async Task<AppSalesStats> GetAppSales(string appId, int numberOfDays = 7, CancellationToken token = default)
+    {
+        if (appId == null) throw new ArgumentNullException(nameof(appId));
+        var queryPayload = new Dictionary<string, object> { { nameof(numberOfDays), numberOfDays } };
+        return await SendHttpRequest<AppSalesStats>($"api/v1/apps/{appId}/sales", queryPayload, HttpMethod.Get, token);
+    }
+
+    public virtual async Task<List<AppItemStats>> GetAppTopItems(string appId, int offset = 0, int count = 10, CancellationToken token = default)
+    {
+        if (appId == null) throw new ArgumentNullException(nameof(appId));
+        var queryPayload = new Dictionary<string, object> { { nameof(offset), offset }, { nameof(count), count } };
+        return await SendHttpRequest<List<AppItemStats>>($"api/v1/apps/{appId}/top-items", queryPayload, HttpMethod.Get, token);
+    }
+
     public virtual async Task DeleteApp(string appId, CancellationToken token = default)
     {
         if (appId == null) throw new ArgumentNullException(nameof(appId));

BTCPayServer.Client/BTCPayServerClient.Invoices.cs

@@ -46,9 +46,15 @@ public partial class BTCPayServerClient
         return await SendHttpRequest<InvoiceData>($"api/v1/stores/{storeId}/invoices/{invoiceId}", null, HttpMethod.Get, token);
     }
     public virtual async Task<InvoicePaymentMethodDataModel[]> GetInvoicePaymentMethods(string storeId, string invoiceId,
+        bool onlyAccountedPayments = true, bool includeSensitive = false,
         CancellationToken token = default)
     {
-        return await SendHttpRequest<InvoicePaymentMethodDataModel[]>($"api/v1/stores/{storeId}/invoices/{invoiceId}/payment-methods", null, HttpMethod.Get, token);
+        var queryPayload = new Dictionary<string, object>
+        {
+            { nameof(onlyAccountedPayments), onlyAccountedPayments },
+            { nameof(includeSensitive), includeSensitive }
+        };
+        return await SendHttpRequest<InvoicePaymentMethodDataModel[]>($"api/v1/stores/{storeId}/invoices/{invoiceId}/payment-methods", queryPayload, HttpMethod.Get, token);
     }
 
     public virtual async Task ArchiveInvoice(string storeId, string invoiceId,

BTCPayServer.Client/BTCPayServerClient.Lightning.Internal.cs

@@ -21,13 +21,6 @@ public partial class BTCPayServerClient
         return await SendHttpRequest<LightningNodeBalanceData>($"api/v1/server/lightning/{cryptoCode}/balance", null, HttpMethod.Get, token);
     }
 
-    public virtual async Task<HistogramData> GetLightningNodeHistogram(string cryptoCode, HistogramType? type = null,
-        CancellationToken token = default)
-    {
-        var queryPayload = type == null ? null : new Dictionary<string, string> { ["type"] = type.ToString() };
-        return await SendHttpRequest<HistogramData>($"api/v1/server/lightning/{cryptoCode}/histogram", queryPayload, HttpMethod.Get, token);
-    }
-
     public virtual async Task ConnectToLightningNode(string cryptoCode, ConnectToNodeRequest request,
         CancellationToken token = default)
     {

BTCPayServer.Client/BTCPayServerClient.Lightning.Store.cs

@@ -21,13 +21,6 @@ public partial class BTCPayServerClient
         return await SendHttpRequest<LightningNodeBalanceData>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/balance", null, HttpMethod.Get, token);
     }
 
-    public virtual async Task<HistogramData> GetLightningNodeHistogram(string storeId, string cryptoCode, HistogramType? type = null,
-        CancellationToken token = default)
-    {
-        var queryPayload = type == null ? null : new Dictionary<string, string> { ["type"] = type.ToString() };
-        return await SendHttpRequest<HistogramData>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/histogram", queryPayload, HttpMethod.Get, token);
-    }
-
     public virtual async Task ConnectToLightningNode(string storeId, string cryptoCode, ConnectToNodeRequest request,
         CancellationToken token = default)
     {

BTCPayServer.Client/BTCPayServerClient.OnChainPaymentMethods.cs

@@ -15,7 +15,7 @@ public partial class BTCPayServerClient
             int amount = 10,
             CancellationToken token = default)
     {
-        return await SendHttpRequest<UpdatePaymentMethodRequest, OnChainPaymentMethodPreviewResultData>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/preview",
+        return await SendHttpRequest<UpdatePaymentMethodRequest, OnChainPaymentMethodPreviewResultData>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/wallet/preview",
             new Dictionary<string, object> { { "offset", offset }, { "amount", amount } },
             new UpdatePaymentMethodRequest { Config = JValue.CreateString(derivationScheme) },
             HttpMethod.Post, token);
@@ -25,7 +25,7 @@ public partial class BTCPayServerClient
         string storeId, string paymentMethodId, int offset = 0, int amount = 10,
         CancellationToken token = default)
     {
-        return await SendHttpRequest<OnChainPaymentMethodPreviewResultData>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/preview",
+        return await SendHttpRequest<OnChainPaymentMethodPreviewResultData>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/wallet/preview",
             new Dictionary<string, object> { { "offset", offset }, { "amount", amount } }, HttpMethod.Get, token);
     }
 
@@ -33,7 +33,7 @@ public partial class BTCPayServerClient
         string paymentMethodId, GenerateOnChainWalletRequest request,
         CancellationToken token = default)
     {
-        return await SendHttpRequest<GenerateOnChainWalletResponse>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/generate", request, HttpMethod.Post, token);
+        return await SendHttpRequest<GenerateOnChainWalletResponse>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/wallet/generate", request, HttpMethod.Post, token);
     }
 
 }

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.Objects.cs

@@ -15,7 +15,7 @@ public partial class BTCPayServerClient
             parameters.Add("includeNeighbourData", v);
         try
         {
-            return await SendHttpRequest<OnChainWalletObjectData>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}", parameters, HttpMethod.Get, token);
+            return await SendHttpRequest<OnChainWalletObjectData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects/{objectId.Type}/{objectId.Id}", parameters, HttpMethod.Get, token);
         }
         catch (GreenfieldAPIException err) when (err.APIError.Code == "wallet-object-not-found")
         {
@@ -31,17 +31,17 @@ public partial class BTCPayServerClient
             parameters.Add("ids", ids);
         if (query?.IncludeNeighbourData is bool v)
             parameters.Add("includeNeighbourData", v);
-        return await SendHttpRequest<OnChainWalletObjectData[]>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", parameters, HttpMethod.Get, token);
+        return await SendHttpRequest<OnChainWalletObjectData[]>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects", parameters, HttpMethod.Get, token);
     }
     public virtual async Task RemoveOnChainWalletObject(string storeId, string cryptoCode, OnChainWalletObjectId objectId,
         CancellationToken token = default)
     {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}", null, HttpMethod.Delete, token);
+        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects/{objectId.Type}/{objectId.Id}", null, HttpMethod.Delete, token);
     }
     public virtual async Task<OnChainWalletObjectData> AddOrUpdateOnChainWalletObject(string storeId, string cryptoCode, AddOnChainWalletObjectRequest request,
         CancellationToken token = default)
     {
-        return await SendHttpRequest<OnChainWalletObjectData>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", request, HttpMethod.Post, token);
+        return await SendHttpRequest<OnChainWalletObjectData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects", request, HttpMethod.Post, token);
     }
 
     public virtual async Task AddOrUpdateOnChainWalletLink(string storeId, string cryptoCode,
@@ -49,7 +49,7 @@ public partial class BTCPayServerClient
         AddOnChainWalletObjectLinkRequest request = null,
         CancellationToken token = default)
     {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links", request, HttpMethod.Post, token);
+        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects/{objectId.Type}/{objectId.Id}/links", request, HttpMethod.Post, token);
     }
 
     public virtual async Task RemoveOnChainWalletLinks(string storeId, string cryptoCode,
@@ -57,6 +57,6 @@ public partial class BTCPayServerClient
         OnChainWalletObjectId link,
         CancellationToken token = default)
     {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links/{link.Type}/{link.Id}", null, HttpMethod.Delete, token);
+        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects/{objectId.Type}/{objectId.Id}/links/{link.Type}/{link.Id}", null, HttpMethod.Delete, token);
     }
 }

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.cs

@@ -14,16 +14,8 @@ public partial class BTCPayServerClient
     public virtual async Task<OnChainWalletOverviewData> ShowOnChainWalletOverview(string storeId, string cryptoCode,
         CancellationToken token = default)
     {
-        return await SendHttpRequest<OnChainWalletOverviewData>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet", null, HttpMethod.Get, token);
+        return await SendHttpRequest<OnChainWalletOverviewData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet", null, HttpMethod.Get, token);
     }
-    
-    public virtual async Task<HistogramData> GetOnChainWalletHistogram(string storeId, string cryptoCode, HistogramType? type = null,
-        CancellationToken token = default)
-    {
-        var queryPayload = type == null ? null : new Dictionary<string, string> { ["type"] = type.ToString() };
-        return await SendHttpRequest<HistogramData>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/histogram", queryPayload, HttpMethod.Get, token);
-    }
-    
     public virtual async Task<OnChainWalletFeeRateData> GetOnChainFeeRate(string storeId, string cryptoCode, int? blockTarget = null,
         CancellationToken token = default)
     {
@@ -32,13 +24,13 @@ public partial class BTCPayServerClient
         {
             queryParams.Add("blockTarget", blockTarget);
         }
-        return await SendHttpRequest<OnChainWalletFeeRateData>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/feeRate", queryParams, HttpMethod.Get, token);
+        return await SendHttpRequest<OnChainWalletFeeRateData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/feerate", queryParams, HttpMethod.Get, token);
     }
 
     public virtual async Task<OnChainWalletAddressData> GetOnChainWalletReceiveAddress(string storeId, string cryptoCode, bool forceGenerate = false,
         CancellationToken token = default)
     {
-        return await SendHttpRequest<OnChainWalletAddressData>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/address", new Dictionary<string, object>
+        return await SendHttpRequest<OnChainWalletAddressData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/address", new Dictionary<string, object>
         {
             {"forceGenerate", forceGenerate}
         }, HttpMethod.Get, token);
@@ -47,7 +39,7 @@ public partial class BTCPayServerClient
     public virtual async Task UnReserveOnChainWalletReceiveAddress(string storeId, string cryptoCode,
         CancellationToken token = default)
     {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/address", null, HttpMethod.Delete, token);
+        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/address", null, HttpMethod.Delete, token);
     }
 
     public virtual async Task<IEnumerable<OnChainWalletTransactionData>> ShowOnChainWalletTransactions(
@@ -67,14 +59,14 @@ public partial class BTCPayServerClient
         {
             query.Add(nameof(skip), skip);
         }
-        return await SendHttpRequest<IEnumerable<OnChainWalletTransactionData>>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions", query, HttpMethod.Get, token);
+        return await SendHttpRequest<IEnumerable<OnChainWalletTransactionData>>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions", query, HttpMethod.Get, token);
     }
 
     public virtual async Task<OnChainWalletTransactionData> GetOnChainWalletTransaction(
         string storeId, string cryptoCode, string transactionId,
         CancellationToken token = default)
     {
-        return await SendHttpRequest<OnChainWalletTransactionData>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions/{transactionId}", null, HttpMethod.Get, token);
+        return await SendHttpRequest<OnChainWalletTransactionData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions/{transactionId}", null, HttpMethod.Get, token);
     }
 
     public virtual async Task<OnChainWalletTransactionData> PatchOnChainWalletTransaction(
@@ -82,7 +74,7 @@ public partial class BTCPayServerClient
         PatchOnChainTransactionRequest request,
         bool force = false, CancellationToken token = default)
     {
-        return await SendHttpRequest<PatchOnChainTransactionRequest, OnChainWalletTransactionData>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions/{transactionId}", 
+        return await SendHttpRequest<PatchOnChainTransactionRequest, OnChainWalletTransactionData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions/{transactionId}", 
             new Dictionary<string, object> { {"force", force} }, request, HttpMethod.Patch, token);
     }
 
@@ -90,7 +82,7 @@ public partial class BTCPayServerClient
         string cryptoCode,
         CancellationToken token = default)
     {
-        return await SendHttpRequest<IEnumerable<OnChainWalletUTXOData>>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/utxos", null, HttpMethod.Get, token);
+        return await SendHttpRequest<IEnumerable<OnChainWalletUTXOData>>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/utxos", null, HttpMethod.Get, token);
     }
 
     public virtual async Task<OnChainWalletTransactionData> CreateOnChainTransaction(string storeId,
@@ -102,7 +94,7 @@ public partial class BTCPayServerClient
             throw new ArgumentOutOfRangeException(nameof(request.ProceedWithBroadcast),
                 "Please use CreateOnChainTransactionButDoNotBroadcast when wanting to only create the transaction");
         }
-        return await SendHttpRequest<OnChainWalletTransactionData>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions", request, HttpMethod.Post, token);
+        return await SendHttpRequest<OnChainWalletTransactionData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions", request, HttpMethod.Post, token);
     }
 
     public virtual async Task<Transaction> CreateOnChainTransactionButDoNotBroadcast(string storeId,
@@ -114,6 +106,6 @@ public partial class BTCPayServerClient
             throw new ArgumentOutOfRangeException(nameof(request.ProceedWithBroadcast),
                 "Please use CreateOnChainTransaction when wanting to also broadcast the transaction");
         }
-        return Transaction.Parse(await SendHttpRequest<string>($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions", request, HttpMethod.Post, token), network);
+        return Transaction.Parse(await SendHttpRequest<string>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions", request, HttpMethod.Post, token), network);
     }
 }

BTCPayServer.Client/Models/AppItemStats.cs

@@ -0,0 +1,15 @@
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Client.Models;
+
+public class AppItemStats
+{
+    public string ItemCode { get; set; }
+    public string Title { get; set; }
+    public int SalesCount { get; set; }
+    
+    [JsonConverter(typeof(NumericStringJsonConverter))]
+    public decimal Total { get; set; }
+    public string TotalFormatted { get; set; }
+}

BTCPayServer.Client/Models/AppSalesStats.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Client.Models;
+
+public class AppSalesStats
+{
+    public int SalesCount { get; set; }
+    public IEnumerable<AppSalesStatsItem> Series { get; set; }
+}
+
+public class AppSalesStatsItem
+{
+    [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+    public DateTime Date { get; set; }
+    public string Label { get; set; }
+    public int SalesCount { get; set; }
+}

BTCPayServer.Client/Models/CreatePayoutRequest.cs

@@ -8,6 +8,6 @@ namespace BTCPayServer.Client.Models
         public string Destination { get; set; }
         [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal? Amount { get; set; }
-        public string PaymentMethod { get; set; }
+        public string PayoutMethodId { get; set; }
     }
 }

BTCPayServer.Client/Models/CreatePullPaymentRequest.cs

@@ -19,7 +19,7 @@ namespace BTCPayServer.Client.Models
         public DateTimeOffset? ExpiresAt { get; set; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset? StartsAt { get; set; }
-        public string[] PaymentMethods { get; set; }
+        public string[] PayoutMethods { get; set; }
         public bool AutoApproveClaims { get; set; }
     }
 }

BTCPayServer.Client/Models/GenerateOnChainWalletRequest.cs

@@ -10,6 +10,7 @@ namespace BTCPayServer.Client
 {
     public class GenerateOnChainWalletRequest
     {
+        public string Label { get; set; }
         public int AccountNumber { get; set; } = 0;
         [JsonConverter(typeof(MnemonicJsonConverter))]
         public Mnemonic ExistingMnemonic { get; set; }
@@ -29,6 +30,7 @@ namespace BTCPayServer.Client
     {
         public class ConfigData
         {
+            public string Label { get; set; }
             public string AccountDerivation { get; set; }
             [JsonExtensionData]
             IDictionary<string, JToken> AdditionalData { get; set; }

BTCPayServer.Client/Models/LightningAutomatedPayoutSettings.cs

@@ -6,7 +6,7 @@ namespace BTCPayServer.Client.Models;
 
 public class LightningAutomatedPayoutSettings
 {
-    public string PaymentMethod { get; set; }
+    public string PayoutMethodId { get; set; }
 
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }

BTCPayServer.Client/Models/OnChainAutomatedPayoutSettings.cs

@@ -6,7 +6,7 @@ namespace BTCPayServer.Client.Models;
 
 public class OnChainAutomatedPayoutSettings
 {
-    public string PaymentMethod { get; set; }
+    public string PayoutMethodId { get; set; }
 
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }

BTCPayServer.Client/Models/PaymentMethodCriteriaData.cs

@@ -5,7 +5,7 @@ namespace BTCPayServer.Client.Models;
 
 public class PaymentMethodCriteriaData
 {
-    public string PaymentMethod { get; set; }
+    public string PaymentMethodId { get; set; }
     public string CurrencyCode { get; set; }
     [JsonConverter(typeof(NumericStringJsonConverter))]
     public decimal Amount { get; set; }

BTCPayServer.Client/Models/PayoutData.cs

@@ -21,12 +21,13 @@ namespace BTCPayServer.Client.Models
         public string Id { get; set; }
         public string PullPaymentId { get; set; }
         public string Destination { get; set; }
-        public string PaymentMethod { get; set; }
-        public string CryptoCode { get; set; }
+        public string PayoutMethodId { get; set; }
         [JsonConverter(typeof(NumericStringJsonConverter))]
-        public decimal Amount { get; set; }
+        public decimal OriginalAmount { get; set; }
+        public string OriginalCurrency { get; set; }
+        public string PayoutCurrency { get; set; }
         [JsonConverter(typeof(NumericStringJsonConverter))]
-        public decimal? PaymentMethodAmount { get; set; }
+        public decimal? PayoutAmount { get; set; }
         [JsonConverter(typeof(StringEnumConverter))]
         public PayoutState State { get; set; }
         public int Revision { get; set; }

BTCPayServer.Client/Models/PayoutProcessorData.cs

@@ -4,6 +4,6 @@ namespace BTCPayServer.Client.Models
     {
         public string Name { get; set; }
         public string FriendlyName { get; set; }
-        public string[] PaymentMethods { get; set; }
+        public string[] PayoutMethods { get; set; }
     }
 }

BTCPayServer.Client/Models/RefundInvoiceRequest.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer.Client.Models
     public class RefundInvoiceRequest
     {
         public string? Name { get; set; } = null;
-        public string? PaymentMethod { get; set; }
+        public string? PayoutMethodId { get; set; }
         public string? Description { get; set; } = null;
         
         [JsonConverter(typeof(StringEnumConverter))]

BTCPayServer.Client/Models/ServerInfoData.cs

@@ -32,7 +32,7 @@ namespace BTCPayServer.Client.Models
 
     public class SyncStatus
     {
-        public string CryptoCode { get; set; }
+        public string PaymentMethodId { get; set; }
         public virtual bool Available { get; set; }
     }
 

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -17,6 +17,7 @@ namespace BTCPayServer.Client.Models
         public string Website { get; set; }
 
         public string BrandColor { get; set; }
+        public bool ApplyBrandColorToBackend { get; set; }
         public string LogoUrl { get; set; }
         public string CssUrl { get; set; }
         public string PaymentSoundUrl { get; set; }

BTCPayServer.Client/Models/WalletHistogramData.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using BTCPayServer.JsonConverters;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace BTCPayServer.Client.Models;
-
-public enum HistogramType
-{
-    Week,
-    Month,
-    Year
-}
-
-public class HistogramData
-{
-    [JsonConverter(typeof(StringEnumConverter))]
-    public HistogramType Type { get; set; }
-    public List<decimal> Series { get; set; }
-    public List<DateTimeOffset> Labels { get; set; }
-    [JsonConverter(typeof(NumericStringJsonConverter))]
-    public decimal Balance { get; set; }
-}

BTCPayServer.Client/Permissions.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Text.RegularExpressions;
 
 namespace BTCPayServer.Client
 {
@@ -16,7 +18,7 @@ namespace BTCPayServer.Client
         public const string CanUseLightningNodeInStore = "btcpay.store.canuselightningnode";
         public const string CanModifyServerSettings = "btcpay.server.canmodifyserversettings";
         public const string CanModifyStoreSettings = "btcpay.store.canmodifystoresettings";
-        public const string CanModifyStoreWebhooks = "btcpay.store.webhooks.canmodifywebhooks";
+        public const string CanModifyWebhooks = "btcpay.store.webhooks.canmodifywebhooks";
         public const string CanModifyStoreSettingsUnscoped = "btcpay.store.canmodifystoresettings:";
         public const string CanViewStoreSettings = "btcpay.store.canviewstoresettings";
         public const string CanViewReports = "btcpay.store.canviewreports";
@@ -48,7 +50,7 @@ namespace BTCPayServer.Client
                 yield return CanViewInvoices;
                 yield return CanCreateInvoice;
                 yield return CanModifyInvoices;
-                yield return CanModifyStoreWebhooks;
+                yield return CanModifyWebhooks;
                 yield return CanModifyServerSettings;
                 yield return CanModifyStoreSettings;
                 yield return CanViewStoreSettings;
@@ -104,6 +106,16 @@ namespace BTCPayServer.Client
         {
             return policy.StartsWith("btcpay.user", StringComparison.OrdinalIgnoreCase);
         }
+
+        private static readonly CultureInfo _culture = new (CultureInfo.InvariantCulture.Name);
+        public static string DisplayName(string policy)
+        {
+            var p = policy.Split(".");
+            if (p.Length < 3 || p[0] != "btcpay") return policy;
+            var constName = typeof(Policies).GetFields().Select(f => f.Name).FirstOrDefault(f => f.Equals(p[^1], StringComparison.OrdinalIgnoreCase));
+            var perm = string.IsNullOrEmpty(constName) ? string.Join(' ', p[2..]) : Regex.Replace(constName, "([A-Z])", " $1", RegexOptions.Compiled).Trim();
+            return $"{_culture.TextInfo.ToTitleCase(p[1])}: {_culture.TextInfo.ToTitleCase(perm)}";
+        }
     }
 
     public class PermissionSet
@@ -247,7 +259,7 @@ namespace BTCPayServer.Client
                 Policies.CanManagePullPayments,
                 Policies.CanModifyInvoices,
                 Policies.CanViewStoreSettings,
-                Policies.CanModifyStoreWebhooks,
+                Policies.CanModifyWebhooks,
                 Policies.CanModifyPaymentRequests,
                 Policies.CanManagePayouts,
                 Policies.CanUseLightningNodeInStore);

BTCPayServer.Common/BTCPayNetwork.cs

@@ -4,6 +4,8 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using BTCPayServer.Common;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.Extensions.DependencyInjection;
 using NBitcoin;
 using NBXplorer;
 using NBXplorer.Models;
@@ -131,7 +133,7 @@ namespace BTCPayServer
 
         public string GetTrackedDestination(Script scriptPubKey)
         {
-            return scriptPubKey.Hash.ToString() + "#" + CryptoCode.ToUpperInvariant();
+            return scriptPubKey.Hash.ToString();
         }
     }
 

BTCPayServer.Common/BTCPayNetworkProvider.cs

@@ -3,9 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using BTCPayServer.Configuration;
 using BTCPayServer.Logging;
+using Microsoft.AspNetCore.DataProtection.KeyManagement;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using NBitcoin;
 using NBXplorer;
+using StandardConfiguration;
 
 namespace BTCPayServer
 {
@@ -30,11 +34,6 @@ namespace BTCPayServer
             Logs logs)
         {
             var networksList = networks.ToList();
-#if !ALTCOINS
-            var onlyBTC = networksList.Count == 1 && networksList.First().IsBTC;
-            if (!onlyBTC)
-                throw new ConfigException($"This build of BTCPay Server does not support altcoins. Configured networks: {string.Join(',', networksList.Select(n => n.CryptoCode).ToArray())}");
-#endif
             _NBXplorerNetworkProvider = nbxplorerNetworkProvider;
             NetworkType = nbxplorerNetworkProvider.NetworkType;
             foreach (var network in networksList)

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
   <Import Project="../Build/Common.csproj" />
+
   <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="NBXplorer.Client" Version="4.3.1" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="2.0.1" />
   </ItemGroup>
-  <ItemGroup Condition="'$(Altcoins)' != 'true'">
-    <Compile Remove="Altcoins\**\*.cs"></Compile>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Altcoins\" />
   </ItemGroup>

BTCPayServer.Common/MultiProcessingQueue.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;

BTCPayServer.Common/SelectedChains.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using BTCPayServer.Logging;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Bson;
 
 namespace BTCPayServer
 {
@@ -11,17 +12,12 @@ namespace BTCPayServer
     {
         HashSet<string> chains = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         bool all = false;
-        public SelectedChains(IConfiguration configuration, Logs logs)
+        public SelectedChains(IConfiguration configuration)
         {
             foreach (var chain in (configuration["chains"] ?? "btc")
                 .Split(',', StringSplitOptions.RemoveEmptyEntries)
                     .Select(t => t.ToUpperInvariant()))
             {
-                if (new[] { "ETH", "USDT20", "FAU" }.Contains(chain, StringComparer.OrdinalIgnoreCase))
-                {
-                    logs.Configuration.LogWarning($"'{chain}' is not anymore supported, please remove it from 'chains'");
-                    continue;
-                }
                 if (chain == "*")
                 {
                     all = true;

BTCPayServer.Data/App/AppStorageItemData.cs

@@ -1,32 +0,0 @@
-using BTCPayServer.Data;
-using Laraue.EfCoreTriggers.Common.Extensions;
-using Microsoft.EntityFrameworkCore;
-
-namespace BTCPayServer.App.BackupStorage;
-
-public class AppStorageItemData
-{
-    public string Key { get; set; }
-    public long Version { get; set; }
-    public byte[] Value { get; set; }
-    public string UserId { get; set; }
-
-    public static void OnModelCreating(ModelBuilder builder)
-    {
-        builder.Entity<AppStorageItemData>()
-            .HasKey(o => new {o.Key, o.Version, o.UserId});
-        builder.Entity<AppStorageItemData>()
-            .HasIndex(o => new {o.Key, o.UserId}).IsUnique();
-        
-        builder.Entity<ApplicationUser>().HasMany(user => user.AppStorageItems).WithOne(data => data.User)
-            .OnDelete(DeleteBehavior.Cascade);
-
-        builder.Entity<AppStorageItemData>()
-            .BeforeInsert(trigger => trigger
-                .Action(group => group
-                    .Delete<AppStorageItemData>((@ref, entity) => @ref.New.UserId == entity.UserId && @ref.New.Key == entity.Key &&
-                                                                  @ref.New.Version > entity.Version)));
-    }
-
-    public ApplicationUser User { get; set; }
-}

BTCPayServer.Data/ApplicationDbContext.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using BTCPayServer.App.BackupStorage;
-using Laraue.EfCoreTriggers.PostgreSql.Extensions;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
@@ -17,7 +15,6 @@ namespace BTCPayServer.Data
             var builder = new DbContextOptionsBuilder<ApplicationDbContext>();
 			// Same as launchsettings.json, it's connecting to the docker's postgres.
             builder.UseNpgsql("User ID=postgres;Include Error Detail=true;Host=127.0.0.1;Port=39372;Database=btcpayserver");
-            builder.UsePostgreSqlTriggers();
             return new ApplicationDbContext(builder.Options);
         }
     }
@@ -28,8 +25,6 @@ namespace BTCPayServer.Data
         {
         }
         public DbSet<AddressInvoiceData> AddressInvoices { get; set; }
-        public DbSet<AppStorageItemData> AppStorageItems { get; set; }
-
         public DbSet<APIKeyData> ApiKeys { get; set; }
         public DbSet<AppData> Apps { get; set; }
         public DbSet<StoredFile> Files { get; set; }
@@ -44,7 +39,6 @@ namespace BTCPayServer.Data
         public DbSet<PaymentRequestData> PaymentRequests { get; set; }
         public DbSet<PaymentData> Payments { get; set; }
         public DbSet<PayoutData> Payouts { get; set; }
-        public DbSet<PendingInvoiceData> PendingInvoices { get; set; }
         public DbSet<PlannedTransaction> PlannedTransactions { get; set; }
         public DbSet<PullPaymentData> PullPayments { get; set; }
         public DbSet<RefundData> Refunds { get; set; }
@@ -73,7 +67,7 @@ namespace BTCPayServer.Data
             base.OnModelCreating(builder);
 
             // some of the data models don't have OnModelCreating for now, commenting them
-            AppStorageItemData.OnModelCreating(builder);
+
             ApplicationUser.OnModelCreating(builder, Database);
             AddressInvoiceData.OnModelCreating(builder);
             APIKeyData.OnModelCreating(builder, Database);
@@ -88,9 +82,8 @@ namespace BTCPayServer.Data
             PairingCodeData.OnModelCreating(builder);
             //PayjoinLock.OnModelCreating(builder);
             PaymentRequestData.OnModelCreating(builder, Database);
-            PaymentData.OnModelCreating(builder, Database);
+            PaymentData.OnModelCreating(builder);
             PayoutData.OnModelCreating(builder, Database);
-            PendingInvoiceData.OnModelCreating(builder);
             //PlannedTransaction.OnModelCreating(builder);
             PullPaymentData.OnModelCreating(builder, Database);
             RefundData.OnModelCreating(builder);

BTCPayServer.Data/ApplicationDbContextFactory.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Models;
-using Laraue.EfCoreTriggers.PostgreSql.Extensions;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
 
@@ -12,20 +10,20 @@ namespace BTCPayServer.Data
 {
     public class ApplicationDbContextFactory : BaseDbContextFactory<ApplicationDbContext>
     {
-        public ApplicationDbContextFactory(IOptions<DatabaseOptions> options) : base(options, "")
+        public ApplicationDbContextFactory(IOptions<DatabaseOptions> options, ILoggerFactory loggerFactory) : base(options, "")
         {
+            LoggerFactory = loggerFactory;
         }
 
+        public ILoggerFactory LoggerFactory { get; }
+
         public override ApplicationDbContext CreateContext(Action<NpgsqlDbContextOptionsBuilder> npgsqlOptionsAction = null)
         {
             var builder = new DbContextOptionsBuilder<ApplicationDbContext>();
-            builder.AddInterceptors(Data.InvoiceData.MigrationInterceptor.Instance);
+            builder.UseLoggerFactory(LoggerFactory);
+            builder.AddInterceptors(MigrationInterceptor.Instance);
             ConfigureBuilder(builder, npgsqlOptionsAction);
-            
-            builder.UsePostgreSqlTriggers();
             return new ApplicationDbContext(builder.Options);
         }
-        
-        
     }
 }

BTCPayServer.Data/BTCPayServer.Data.csproj

@@ -3,7 +3,6 @@
   <Import Project="../Build/Common.csproj" />
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Laraue.EfCoreTriggers.PostgreSql" Version="8.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -18,4 +17,10 @@
   <ItemGroup>
     <EmbeddedResource Include="DBScripts\*.sql" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="DBScripts\001.InvoiceFunctions.sql" />
+    <None Remove="DBScripts\002.RefactorPayouts.sql" />
+    <None Remove="DBScripts\003.RefactorPendingInvoicesPayments.sql" />
+    <None Remove="DBScripts\004.MonitoredInvoices.sql" />
+  </ItemGroup>
 </Project>

BTCPayServer.Data/DBScripts/001.InvoiceFunctions.sql

@@ -0,0 +1,12 @@
+CREATE OR REPLACE FUNCTION get_orderid(invoice_blob jsonb)
+RETURNS text AS $$
+    SELECT invoice_blob->'metadata'->>'orderId';
+$$ LANGUAGE sql IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION get_itemcode(invoice_blob jsonb)
+RETURNS text AS $$
+    SELECT invoice_blob->'metadata'->>'itemCode';
+$$ LANGUAGE sql IMMUTABLE;
+
+CREATE INDEX IF NOT EXISTS "IX_Invoices_Metadata_OrderId" ON "Invoices" (get_orderid("Blob2")) WHERE get_orderid("Blob2") IS NOT NULL;
+CREATE INDEX IF NOT EXISTS "IX_Invoices_Metadata_ItemCode" ON "Invoices" (get_itemcode("Blob2")) WHERE get_itemcode("Blob2") IS NOT NULL;

BTCPayServer.Data/DBScripts/002.RefactorPayouts.sql

@@ -0,0 +1,62 @@
+-- Rename column
+ALTER TABLE "Payouts" RENAME COLUMN "PaymentMethodId" TO "PayoutMethodId";
+
+-- Add Currency column, guessed from the PaymentMethodId
+ALTER TABLE "Payouts" ADD COLUMN "Currency" TEXT;
+UPDATE "Payouts" SET
+    "Currency" = split_part("PayoutMethodId", '_', 1),
+    "PayoutMethodId"=
+        CASE
+            WHEN ("Blob"->>'Amount')::NUMERIC < 0 THEN 'TOPUP'
+            WHEN split_part("PayoutMethodId", '_', 2) = 'LightningLike' THEN split_part("PayoutMethodId", '_', 1) || '-LN'
+            ELSE split_part("PayoutMethodId", '_', 1) || '-CHAIN'
+        END;
+ALTER TABLE "Payouts" ALTER COLUMN "Currency" SET NOT NULL;
+
+-- Remove Currency and Limit from PullPayment Blob, and put it into the columns in the table
+ALTER TABLE "PullPayments" ADD COLUMN "Currency" TEXT;
+UPDATE "PullPayments" SET "Currency" = "Blob"->>'Currency';
+ALTER TABLE "PullPayments" ALTER COLUMN "Currency" SET NOT NULL;
+ALTER TABLE "PullPayments" ADD COLUMN "Limit" NUMERIC;
+UPDATE "PullPayments" SET "Limit" = ("Blob"->>'Limit')::NUMERIC;
+ALTER TABLE "PullPayments" ALTER COLUMN "Limit" SET NOT NULL;
+
+-- Remove unused properties, rename SupportedPaymentMethods, and fix legacy payment methods IDs
+UPDATE "PullPayments" SET 
+    "Blob" = jsonb_set(
+	    "Blob" - 'SupportedPaymentMethods' - 'Limit' - 'Currency' - 'Period',
+	    '{SupportedPayoutMethods}',
+	    (SELECT jsonb_agg(to_jsonb(
+		    CASE
+	                WHEN split_part(value::TEXT, '_', 2) = 'LightningLike' THEN split_part(value::TEXT, '_', 1) || '-LN'
+        	        ELSE split_part(value::TEXT, '_', 1) || '-CHAIN'
+	            END))
+	    FROM jsonb_array_elements_text("Blob"->'SupportedPaymentMethods') AS value
+	));
+
+--Remove "Amount" and "CryptoAmount" from Payout Blob, and put it into the columns in the table
+-- Respectively "OriginalAmount" and "Amount"
+
+ALTER TABLE "Payouts" ADD COLUMN "Amount" NUMERIC;
+UPDATE "Payouts" SET "Amount" = ("Blob"->>'CryptoAmount')::NUMERIC;
+
+ALTER TABLE "Payouts" ADD COLUMN "OriginalAmount" NUMERIC;
+UPDATE "Payouts" SET "OriginalAmount" = ("Blob"->>'Amount')::NUMERIC;
+ALTER TABLE "Payouts" ALTER COLUMN "OriginalAmount" SET NOT NULL;
+
+ALTER TABLE "Payouts" ADD COLUMN "OriginalCurrency" TEXT;
+
+
+UPDATE "Payouts" p
+SET
+    "OriginalCurrency" = "Currency",
+    "Blob" = "Blob" - 'Amount' - 'CryptoAmount'
+WHERE "PullPaymentDataId" IS NULL AND "OriginalCurrency" IS NULL;
+
+UPDATE "Payouts" p
+SET 
+    "OriginalCurrency" = pp."Currency"
+FROM "PullPayments" pp
+WHERE "OriginalCurrency" IS NULL AND pp."Id"=p."PullPaymentDataId";
+
+ALTER TABLE "Payouts" ALTER COLUMN "OriginalCurrency" SET NOT NULL;

BTCPayServer.Data/DBScripts/003.RefactorPendingInvoicesPayments.sql

@@ -0,0 +1,9 @@
+CREATE OR REPLACE FUNCTION is_pending(status TEXT)
+RETURNS BOOLEAN AS $$
+    SELECT status = 'Processing' OR status = 'New';
+$$ LANGUAGE sql IMMUTABLE;
+
+CREATE INDEX "IX_Invoices_Pending" ON "Invoices"((1)) WHERE is_pending("Status");
+CREATE INDEX "IX_Payments_Pending" ON "Payments"((1)) WHERE is_pending("Status");
+DROP TABLE "PendingInvoices";
+ANALYZE "Invoices";

BTCPayServer.Data/DBScripts/004.MonitoredInvoices.sql

@@ -0,0 +1,23 @@
+CREATE OR REPLACE FUNCTION get_prompt(invoice_blob JSONB, payment_method_id TEXT)
+RETURNS JSONB AS $$
+    SELECT invoice_blob->'prompts'->payment_method_id
+$$ LANGUAGE sql IMMUTABLE;
+
+
+CREATE OR REPLACE FUNCTION get_monitored_invoices(arg_payment_method_id TEXT, include_non_activated BOOLEAN)
+RETURNS TABLE (invoice_id TEXT, payment_id TEXT, payment_method_id TEXT) AS $$
+WITH cte AS (
+-- Get all the invoices which are pending. Even if no payments.
+SELECT i."Id" invoice_id, p."Id" payment_id, p."PaymentMethodId" payment_method_id FROM "Invoices" i LEFT JOIN "Payments" p ON i."Id" = p."InvoiceDataId"
+        WHERE is_pending(i."Status")
+UNION ALL
+-- For invoices not pending, take all of those which have pending payments
+SELECT i."Id" invoice_id, p."Id" payment_id, p."PaymentMethodId" payment_method_id FROM "Invoices" i INNER JOIN "Payments" p ON i."Id" = p."InvoiceDataId"
+        WHERE is_pending(p."Status") AND NOT is_pending(i."Status"))
+SELECT cte.* FROM cte
+JOIN "Invoices" i ON cte.invoice_id=i."Id"
+LEFT JOIN "Payments" p ON cte.payment_id=p."Id" AND cte.payment_method_id=p."PaymentMethodId"
+WHERE (p."PaymentMethodId" IS NOT NULL AND p."PaymentMethodId" = arg_payment_method_id) OR
+      (p."PaymentMethodId" IS NULL AND get_prompt(i."Blob2", arg_payment_method_id) IS NOT NULL AND
+        (include_non_activated IS TRUE OR (get_prompt(i."Blob2", arg_payment_method_id)->'inactive')::BOOLEAN IS NOT TRUE));
+$$ LANGUAGE SQL STABLE;

BTCPayServer.Data/Data/AddressInvoiceData.cs

@@ -9,6 +9,7 @@ namespace BTCPayServer.Data
         public string Address { get; set; }
         public InvoiceData InvoiceData { get; set; }
         public string InvoiceDataId { get; set; }
+        public string PaymentMethodId { get; set; }
 
 
         internal static void OnModelCreating(ModelBuilder builder)
@@ -18,7 +19,7 @@ namespace BTCPayServer.Data
                    .WithMany(i => i.AddressInvoices).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<AddressInvoiceData>()
 #pragma warning disable CS0618
-                .HasKey(o => o.Address);
+                .HasKey(o => new { o.Address, o.PaymentMethodId });
 #pragma warning restore CS0618
         }
     }

BTCPayServer.Data/Data/ApplicationUser.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using BTCPayServer.App.BackupStorage;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -30,9 +29,6 @@ namespace BTCPayServer.Data
 
         public List<IdentityUserRole<string>> UserRoles { get; set; }
 
-        public List<AppStorageItemData> AppStorageItems { get; set; }
-
-
         public static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<ApplicationUser>()
@@ -50,5 +46,6 @@ namespace BTCPayServer.Data
         public bool ShowInvoiceStatusChangeHint { get; set; }
         public string ImageUrl { get; set; }
         public string Name { get; set; }
+        public string InvitationToken { get; set; }
     }
 }

BTCPayServer.Data/Data/InvoiceData.Migration.cs

@@ -15,36 +15,13 @@ using Microsoft.EntityFrameworkCore.Diagnostics;
 using BTCPayServer.Migrations;
 using Newtonsoft.Json.Serialization;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace BTCPayServer.Data
 {
-    public partial class InvoiceData
+    public partial class InvoiceData : MigrationInterceptor.IHasMigration
     {
-        /// <summary>
-        /// We have a migration running in the background that will migrate the data from the old blob to the new blob
-        /// Meanwhile, we need to make sure that invoices which haven't been migrated yet are migrated on the fly.
-        /// </summary>
-        public class MigrationInterceptor : IMaterializationInterceptor
-        {
-            public static readonly MigrationInterceptor Instance = new MigrationInterceptor();
-            public object InitializedInstance(MaterializationInterceptionData materializationData, object entity)
-            {
-                if (entity is InvoiceData invoiceData && invoiceData.Currency is null)
-                {
-                    invoiceData.Migrate();
-                }
-                else if (entity is PaymentData paymentData && paymentData.Currency is null)
-                {
-                    paymentData.Migrate();
-                }
-                else if (entity is PayoutData payoutData && payoutData.Currency is null)
-                {
-                    payoutData.Migrate();
-                }
-                return entity;
-            }
-        }
-
         static HashSet<string> superflousProperties = new HashSet<string>()
         {
             "availableAddressHashes",
@@ -78,13 +55,14 @@ namespace BTCPayServer.Data
         };
 
 #pragma warning disable CS0618 // Type or member is obsolete
-        public void Migrate()
+        public bool TryMigrate()
         {
             if (Currency is not null)
-                return;
+                return false;
             if (Blob is not (null or { Length: 0 }))
             {
                 Blob2 = MigrationExtensions.Unzip(Blob);
+                Blob2 = MigrationExtensions.SanitizeJSON(Blob2);
                 Blob = null;
             }
             var blob = JObject.Parse(Blob2);
@@ -232,11 +210,10 @@ namespace BTCPayServer.Data
             }
 
             blob.ConvertNumberToString("price");
-            Currency = blob["currency"].Value<string>();
+            Currency = blob["currency"].Value<string>().ToUpperInvariant();
             var isTopup = blob["type"]?.Value<string>() is "TopUp";
             var amount = decimal.Parse(blob["price"].Value<string>(), CultureInfo.InvariantCulture);
             Amount = isTopup && amount == 0 ? null : decimal.Parse(blob["price"].Value<string>(), CultureInfo.InvariantCulture);
-            CustomerEmail = null;
             foreach (var prop in superflousProperties)
                 blob.Property(prop)?.Remove();
             if (blob["speedPolicy"] is JValue { Type: JTokenType.Integer, Value: 0 or 0L })
@@ -373,7 +350,11 @@ namespace BTCPayServer.Data
             };
             blob["version"] = 3;
             Blob2 = blob.ToString(Formatting.None);
+            return true;
         }
+
+        [NotMapped]
+        public bool Migrated { get; set; }
         static string[] detailsRemoveDefault =
             [
                 "paymentMethodFeeRate",

BTCPayServer.Data/Data/InvoiceData.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Newtonsoft.Json.Linq;
+
 
 namespace BTCPayServer.Data
 {
@@ -20,18 +22,17 @@ namespace BTCPayServer.Data
         [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; }
         public string ExceptionStatus { get; set; }
-		[Obsolete("Unused")]
-        public string CustomerEmail { get; set; }
         public List<AddressInvoiceData> AddressInvoices { get; set; }
         public bool Archived { get; set; }
-        public List<PendingInvoiceData> PendingInvoices { get; set; }
         public List<InvoiceSearchData> InvoiceSearchData { get; set; }
         public List<RefundData> Refunds { get; set; }
 
+		public static string GetOrderId(string blob) => throw new NotSupportedException();
+		public static string GetItemCode(string blob) => throw new NotSupportedException();
+        public static bool IsPending(string status) => throw new NotSupportedException();
+
         [Timestamp]
         // With this, update of InvoiceData will fail if the row was modified by another process
         public uint XMin { get; set; }
@@ -41,7 +42,6 @@ namespace BTCPayServer.Data
                 .HasOne(o => o.StoreData)
                 .WithMany(a => a.Invoices).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<InvoiceData>().HasIndex(o => o.StoreDataId);
-            builder.Entity<InvoiceData>().HasIndex(o => o.OrderId);
             builder.Entity<InvoiceData>().HasIndex(o => o.Created);
             builder.Entity<InvoiceData>()
                     .Property(o => o.Blob2)
@@ -49,6 +49,9 @@ namespace BTCPayServer.Data
             builder.Entity<InvoiceData>()
                     .Property(o => o.Amount)
                     .HasColumnType("NUMERIC");
+			builder.HasDbFunction(typeof(InvoiceData).GetMethod(nameof(GetOrderId), new[] { typeof(string) }), b => b.HasName("get_orderid"));
+			builder.HasDbFunction(typeof(InvoiceData).GetMethod(nameof(GetItemCode), new[] { typeof(string) }), b => b.HasName("get_itemcode"));
+            builder.HasDbFunction(typeof(InvoiceData).GetMethod(nameof(IsPending), new[] { typeof(string) }), b => b.HasName("is_pending"));
         }
     }
 }

BTCPayServer.Data/Data/MigrationExtensions.cs

@@ -147,5 +147,8 @@ namespace BTCPayServer.Data
                 return $"{splitted[0]}-CHAIN";
             throw new NotSupportedException("Unknown payment id " + paymentMethodId);
         }
+
+        // Make postgres happy
+        public static string SanitizeJSON(string json) => json.Replace("\\u0000", string.Empty, StringComparison.OrdinalIgnoreCase);
     }
 }

BTCPayServer.Data/Data/MigrationInterceptor.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore;
+
+namespace BTCPayServer.Data
+{
+    /// <summary>
+    /// We have a migration running in the background that will migrate the data from the old blob to the new blob
+    /// Meanwhile, we need to make sure that invoices which haven't been migrated yet are migrated on the fly.
+    /// </summary>
+    public class MigrationInterceptor : IMaterializationInterceptor, ISaveChangesInterceptor
+    {
+        public interface IHasMigration
+        {
+            bool TryMigrate();
+            bool Migrated { get; set; }
+        }
+        public static readonly MigrationInterceptor Instance = new MigrationInterceptor();
+        public object InitializedInstance(MaterializationInterceptionData materializationData, object entity)
+        {
+            if (entity is IHasMigration hasMigration && hasMigration.TryMigrate())
+            {
+                hasMigration.Migrated = true;
+            }
+            return entity;
+        }
+
+        public ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEventData eventData, InterceptionResult<int> result, CancellationToken cancellationToken = default(CancellationToken))
+        {
+
+            foreach (var entry in eventData.Context.ChangeTracker.Entries())
+            {
+                if (entry is { Entity: IHasMigration { Migrated: true }, State: EntityState.Modified })
+                    // It seems doing nothing, but this actually set all properties as modified
+                    entry.State = EntityState.Modified;
+            }
+            return new ValueTask<InterceptionResult<int>>(result);
+        }
+    }
+}

BTCPayServer.Data/Data/PaymentData.Migration.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Reflection.Metadata;
 using System.Text;
 using System.Threading.Tasks;
 using BTCPayServer.Migrations;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using NBitcoin;
 using NBitcoin.Altcoins;
 using NBitcoin.DataEncoders;
@@ -13,16 +16,17 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Data
 {
-    public partial class PaymentData
+    public partial class PaymentData : MigrationInterceptor.IHasMigration
     {
-        public void Migrate()
+        public bool TryMigrate()
         {
 #pragma warning disable CS0618 // Type or member is obsolete
             if (Currency is not null)
-                return;
+                return false;
             if (Blob is not (null or { Length: 0 }))
             {
                 Blob2 = MigrationExtensions.Unzip(Blob);
+                Blob2 = MigrationExtensions.SanitizeJSON(Blob2);
                 Blob = null;
             }
             var blob = JObject.Parse(Blob2);
@@ -42,9 +46,10 @@ namespace BTCPayServer.Data
             }
 
             var cryptoCode = blob["cryptoCode"].Value<string>();
-            Type = cryptoCode + "_" + blob["cryptoPaymentDataType"].Value<string>();
-            Type = MigrationExtensions.MigratePaymentMethodId(Type);
-            var divisibility = MigrationExtensions.GetDivisibility(Type);
+            MigratedPaymentMethodId = PaymentMethodId;
+            PaymentMethodId = cryptoCode + "_" + blob["cryptoPaymentDataType"].Value<string>();
+            PaymentMethodId = MigrationExtensions.MigratePaymentMethodId(PaymentMethodId);
+            var divisibility = MigrationExtensions.GetDivisibility(PaymentMethodId);
             Currency = blob["cryptoCode"].Value<string>();
             blob.Remove("cryptoCode");
             blob.Remove("cryptoPaymentDataType");
@@ -157,7 +162,13 @@ namespace BTCPayServer.Data
 			Blob2 = blob.ToString(Formatting.None);
             Accounted = null;
 #pragma warning restore CS0618 // Type or member is obsolete
+            return true;
         }
+        [NotMapped]
+        public bool Migrated { get; set; }
+        [NotMapped]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public string MigratedPaymentMethodId { get; set; }
 
         static readonly DateTimeOffset unixRef = new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero);
         public static long DateTimeToMilliUnixTime(in DateTime time)

BTCPayServer.Data/Data/PaymentData.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
@@ -26,13 +27,15 @@ namespace BTCPayServer.Data
         [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
         public string Blob2 { get; set; }
-        public string Type { get; set; }
+        public string PaymentMethodId { get; set; }
         [Obsolete("Use Status instead")]
         public bool? Accounted { get; set; }
         public PaymentStatus? Status { get; set; }
-
-        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
+        public static bool IsPending(PaymentStatus? status) => throw new NotSupportedException();
+        internal static void OnModelCreating(ModelBuilder builder)
         {
+            builder.Entity<PaymentData>()
+                .HasKey(o => new { o.Id, o.PaymentMethodId });
             builder.Entity<PaymentData>()
                    .HasOne(o => o.InvoiceData)
                    .WithMany(i => i.Payments).OnDelete(DeleteBehavior.Cascade);
@@ -47,6 +50,7 @@ namespace BTCPayServer.Data
             builder.Entity<PaymentData>()
                     .Property(o => o.Amount)
                     .HasColumnType("NUMERIC");
+            builder.HasDbFunction(typeof(PaymentData).GetMethod(nameof(IsPending), new[] { typeof(PaymentStatus?) }), b => b.HasName("is_pending"));
         }
     }
 }

BTCPayServer.Data/Data/PaymentRequestData.Migration.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Reflection.Metadata;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Data
+{
+    public partial class PaymentRequestData : MigrationInterceptor.IHasMigration
+    {
+        [NotMapped]
+        public bool Migrated { get; set; }
+
+        public bool TryMigrate()
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            if (Blob is null && Blob2 is not null)
+                return false;
+            if (Blob2 is null)
+            {
+                Blob2 = Blob is not (null or { Length: 0 }) ? MigrationExtensions.Unzip(Blob) : "{}";
+                Blob2 = MigrationExtensions.SanitizeJSON(Blob2);
+            }
+            Blob = null;
+#pragma warning restore CS0618 // Type or member is obsolete
+            var jobj = JObject.Parse(Blob2);
+            // Fixup some legacy payment requests
+            if (jobj["expiryDate"].Type == JTokenType.Date)
+            {
+                jobj["expiryDate"] = new JValue(NBitcoin.Utils.DateTimeToUnixTime(jobj["expiryDate"].Value<DateTime>()));
+                Blob2 = jobj.ToString(Newtonsoft.Json.Formatting.None);
+            }
+            return true;
+        }
+    }
+}

BTCPayServer.Data/Data/PaymentRequestData.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class PaymentRequestData : IHasBlobUntyped
+    public partial class PaymentRequestData : IHasBlobUntyped
     {
         public string Id { get; set; }
         public DateTimeOffset Created { get; set; }

BTCPayServer.Data/Data/PayoutData.Migration.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Data
-{
-    public partial class PayoutData
-    {
-        public void Migrate()
-        {
-            PayoutMethodId = MigrationExtensions.MigratePaymentMethodId(PayoutMethodId);
-            // Could only be BTC-LN or BTC-CHAIN, so we extract the crypto currency
-            Currency = PayoutMethodId.Split('-')[0];
-        }
-    }
-}

BTCPayServer.Data/Data/PayoutData.cs

@@ -18,7 +18,23 @@ namespace BTCPayServer.Data
         public DateTimeOffset Date { get; set; }
         public string PullPaymentDataId { get; set; }
         public string StoreDataId { get; set; }
+        /// <summary>
+        /// The currency of the payout (eg. BTC)
+        /// </summary>
         public string Currency { get; set; }
+        /// <summary>
+        /// The amount of the payout in Currency.
+        /// The Amount only get set when the payout is actually approved.
+        /// </summary>
+        public decimal? Amount { get; set; }
+        /// <summary>
+        /// The original currency of the payout (eg. USD)
+        /// </summary>
+        public string OriginalCurrency { get; set; }
+        /// <summary>
+        /// The amount of the payout in OriginalCurrency
+        /// </summary>
+        public decimal OriginalAmount { get; set; }
         public PullPaymentData PullPaymentData { get; set; }
         [MaxLength(20)]
         public PayoutState State { get; set; }
@@ -28,7 +44,14 @@ namespace BTCPayServer.Data
         public string Blob { get; set; }
         public string Proof { get; set; }
 #nullable enable
-        public string? Destination { get; set; }
+        /// <summary>
+        /// For example, BTC-CHAIN needs to ensure that only a single address is tied to an active payout.
+        /// If `PayoutBlob.Destination` is `bitcoin://1BvBMSeYstWetqTFn5Au4m4GFg7xJaNVN2?amount=0.1`
+        /// Then `DedupId` is `1BvBMSeYstWetqTFn5Au4m4GFg7xJaNVN2`
+        /// For Lightning, Destination could be the lightning address, BOLT11 or LNURL
+        /// But the `DedupId` would be the `PaymentHash`.
+        /// </summary>
+        public string? DedupId { get; set; }
 #nullable restore
         public StoreData StoreData { get; set; }
 
@@ -46,7 +69,7 @@ namespace BTCPayServer.Data
             builder.Entity<PayoutData>()
                 .HasIndex(o => o.State);
             builder.Entity<PayoutData>()
-                .HasIndex(x => new { DestinationId = x.Destination, x.State });
+                .HasIndex(x => new { DestinationId = x.DedupId, x.State });
 
             builder.Entity<PayoutData>()
                 .Property(o => o.Blob)

BTCPayServer.Data/Data/PayoutProcessorData.cs

@@ -16,7 +16,7 @@ public class PayoutProcessorData : IHasBlobUntyped
     public string Id { get; set; }
     public string StoreId { get; set; }
     public StoreData Store { get; set; }
-    public string PaymentMethod { get; set; }
+    public string PayoutMethodId { get; set; }
     public string Processor { get; set; }
 
     [Obsolete("Use Blob2 instead")]
@@ -36,6 +36,6 @@ public class PayoutProcessorData : IHasBlobUntyped
 
     public override string ToString()
     {
-        return $"{Processor} {PaymentMethod} {StoreId}";
+        return $"{Processor} {PayoutMethodId} {StoreId}";
     }
 }

BTCPayServer.Data/Data/PendingInvoiceData.cs

@@ -1,18 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-
-namespace BTCPayServer.Data
-{
-    public class PendingInvoiceData
-    {
-        public string Id { get; set; }
-        public InvoiceData InvoiceData { get; set; }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<PendingInvoiceData>()
-                .HasOne(o => o.InvoiceData)
-                .WithMany(o => o.PendingInvoices)
-                .HasForeignKey(o => o.Id).OnDelete(DeleteBehavior.Cascade);
-        }
-    }
-}

BTCPayServer.Data/Data/PullPaymentData.cs

@@ -24,6 +24,8 @@ namespace BTCPayServer.Data
         public StoreData StoreData { get; set; }
         [MaxLength(50)]
         public string StoreId { get; set; }
+        public string Currency { get; set; }
+        public decimal Limit { get; set; }
         public DateTimeOffset StartDate { get; set; }
         public DateTimeOffset? EndDate { get; set; }
         public bool Archived { get; set; }

BTCPayServer.Data/Migrations/20240405052858_cleanup_address_invoices.cs

@@ -1,30 +0,0 @@
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20240405052858_cleanup_address_invoices")]
-    public partial class cleanup_address_invoices : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(@"
-DELETE FROM ""AddressInvoices"" WHERE ""Address"" LIKE '%_LightningLike';
-ALTER TABLE ""AddressInvoices"" DROP COLUMN IF EXISTS ""CreatedTime"";
-");
-            migrationBuilder.Sql(@"VACUUM (FULL, ANALYZE) ""AddressInvoices"";", true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}

BTCPayServer.Data/Migrations/20240520042729_payoutsmigration.cs

@@ -1,29 +0,0 @@
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20240520042729_payoutsmigration")]
-    public partial class payoutsmigration : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Currency",
-                table: "Payouts",
-                type: "text",
-                nullable: true);
-            migrationBuilder.RenameColumn("PaymentMethodId", "Payouts", "PayoutMethodId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}

BTCPayServer.Data/Migrations/20240726113051_AppStuff.cs

@@ -1,56 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace BTCPayServer.Migrations
-{
-    /// <inheritdoc />
-    public partial class AppStuff : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "AppStorageItems",
-                columns: table => new
-                {
-                    Key = table.Column<string>(type: "text", nullable: false),
-                    Version = table.Column<long>(type: "bigint", nullable: false),
-                    UserId = table.Column<string>(type: "text", nullable: false),
-                    Value = table.Column<byte[]>(type: "bytea", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AppStorageItems", x => new { x.Key, x.Version, x.UserId });
-                    table.ForeignKey(
-                        name: "FK_AppStorageItems_AspNetUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AspNetUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AppStorageItems_Key_UserId",
-                table: "AppStorageItems",
-                columns: new[] { "Key", "UserId" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AppStorageItems_UserId",
-                table: "AppStorageItems",
-                column: "UserId");
-
-            migrationBuilder.Sql("CREATE FUNCTION \"LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA\"() RETURNS trigger as $LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA$\r\nBEGIN\r\n  DELETE FROM \"AppStorageItems\"\r\n  WHERE NEW.\"UserId\" = \"AppStorageItems\".\"UserId\" AND NEW.\"Key\" = \"AppStorageItems\".\"Key\" AND NEW.\"Version\" > \"AppStorageItems\".\"Version\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA BEFORE INSERT\r\nON \"AppStorageItems\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA\"();");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql("DROP FUNCTION \"LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA\"() CASCADE;");
-
-            migrationBuilder.DropTable(
-                name: "AppStorageItems");
-        }
-    }
-}

BTCPayServer.Data/Migrations/20240826065950_removeinvoicecols.cs

@@ -0,0 +1,35 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240826065950_removeinvoicecols")]
+    [DBScript("001.InvoiceFunctions.sql")]
+    public partial class removeinvoicecols : DBScriptsMigration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_Invoices_OrderId",
+                table: "Invoices");
+
+            migrationBuilder.DropColumn(
+                name: "ItemCode",
+                table: "Invoices");
+
+            migrationBuilder.DropColumn(
+                name: "OrderId",
+                table: "Invoices");
+
+            migrationBuilder.DropColumn(
+               name: "CustomerEmail",
+               table: "Invoices");
+            base.Up(migrationBuilder);
+        }
+    }
+}

BTCPayServer.Data/Migrations/20240827034505_migratepayouts.cs

@@ -0,0 +1,40 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240827034505_migratepayouts")]
+    [DBScript("002.RefactorPayouts.sql")]
+    public partial class migratepayouts : DBScriptsMigration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            base.Up(migrationBuilder);
+            migrationBuilder.RenameColumn(
+                name: "Destination",
+                table: "Payouts",
+                newName: "DedupId");
+            migrationBuilder.RenameIndex(
+                name: "IX_Payouts_Destination_State",
+                table: "Payouts",
+                newName: "IX_Payouts_DedupId_State");
+            migrationBuilder.RenameColumn(
+             name: "PaymentMethod",
+             table: "PayoutProcessors",
+             newName: "PayoutMethodId");
+
+            migrationBuilder.Sql("""
+                UPDATE "PayoutProcessors"
+                SET
+                "PayoutMethodId" = CASE WHEN STRPOS("PayoutMethodId", '_') = 0 THEN "PayoutMethodId" || '-CHAIN'
+                                        WHEN STRPOS("PayoutMethodId", '_LightningLike') > 0 THEN split_part("PayoutMethodId", '_LightningLike', 1) || '-LN'
+                                        WHEN STRPOS("PayoutMethodId", '_LNURLPAY') > 0 THEN split_part("PayoutMethodId",'_LNURLPAY', 1) || '-LN'
+                                        ELSE "PayoutMethodId" END
+                """);
+        }
+    }
+}

BTCPayServer.Data/Migrations/20240904092905_UpdateStoreOwnerRole.cs

@@ -0,0 +1,54 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Newtonsoft.Json;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240904092905_UpdateStoreOwnerRole")]
+    public partial class UpdateStoreOwnerRole : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                "StoreRoles",
+                keyColumns: new[] { "Id" },
+                keyColumnTypes: new[] { "TEXT" },
+                keyValues: new[] { "Owner" },
+                columns: new[] { "Permissions" },
+                columnTypes: new[] { "TEXT[]" },
+                values: new object[]
+                {
+                    new[]
+                    {
+                        "btcpay.store.canmodifystoresettings"
+                    }
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                "StoreRoles",
+                keyColumns: new[] { "Id" },
+                keyColumnTypes: new[] { "TEXT" },
+                keyValues: new[] { "Owner" },
+                columns: new[] { "Permissions" },
+                columnTypes: new[] { "TEXT[]" },
+                values: new object[]
+                {
+                    new[]
+                    {
+                        "btcpay.store.canmodifystoresettings",
+                        "btcpay.store.cantradecustodianaccount",
+                        "btcpay.store.canwithdrawfromcustodianaccount",
+                        "btcpay.store.candeposittocustodianaccount"
+                    }
+                });
+        }
+    }
+}

BTCPayServer.Data/Migrations/20240913034505_refactorpendinginvoicespayments.cs

@@ -0,0 +1,15 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240913034505_refactorpendinginvoicespayments")]
+    [DBScript("003.RefactorPendingInvoicesPayments.sql")]
+    public partial class refactorpendinginvoicespayments : DBScriptsMigration
+    {
+    }
+}

BTCPayServer.Data/Migrations/20240919085726_refactorinvoiceaddress.cs

@@ -0,0 +1,80 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240919085726_refactorinvoiceaddress")]
+    public partial class refactorinvoiceaddress : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_AddressInvoices",
+                table: "AddressInvoices");
+
+            migrationBuilder.AddColumn<string>(
+                name: "PaymentMethodId",
+                table: "AddressInvoices",
+                type: "text",
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.Sql("""
+                UPDATE "AddressInvoices"
+                SET 
+                "Address" = (string_to_array("Address", '#'))[1],
+                "PaymentMethodId" = CASE WHEN (string_to_array("Address", '#'))[2] IS NULL THEN 'BTC-CHAIN'
+                                         WHEN STRPOS((string_to_array("Address", '#'))[2], '_') = 0 THEN (string_to_array("Address", '#'))[2] || '-CHAIN'
+                                         WHEN STRPOS((string_to_array("Address", '#'))[2], '_MoneroLike') > 0 THEN replace((string_to_array("Address", '#'))[2],'_MoneroLike','-CHAIN')
+                                         WHEN STRPOS((string_to_array("Address", '#'))[2], '_ZcashLike') > 0 THEN replace((string_to_array("Address", '#'))[2],'_ZcashLike','-CHAIN')
+                                         ELSE '' END;
+                ALTER TABLE "AddressInvoices" DROP COLUMN IF EXISTS "CreatedTime";
+                DELETE FROM "AddressInvoices" WHERE "PaymentMethodId" = '';
+                """);
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_AddressInvoices",
+                table: "AddressInvoices",
+                columns: new[] { "Address", "PaymentMethodId" });
+            migrationBuilder.Sql("VACUUM (ANALYZE) \"AddressInvoices\";", true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_AddressInvoices",
+                table: "AddressInvoices");
+
+            migrationBuilder.DropColumn(
+                name: "PaymentMethodId",
+                table: "AddressInvoices");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_AddressInvoices",
+                table: "AddressInvoices",
+                column: "Address");
+
+            migrationBuilder.CreateTable(
+                name: "PendingInvoices",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PendingInvoices", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_PendingInvoices_Invoices_Id",
+                        column: x => x.Id,
+                        principalTable: "Invoices",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+    }
+}

BTCPayServer.Data/Migrations/20240923065254_refactorpayments.cs

@@ -0,0 +1,38 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240923065254_refactorpayments")]
+    public partial class refactorpayments : DBScriptsMigration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_Payments",
+                table: "Payments");
+
+            migrationBuilder.RenameColumn(
+                name: "Type",
+                table: "Payments",
+                newName: "PaymentMethodId");
+            migrationBuilder.Sql("UPDATE \"Payments\" SET \"PaymentMethodId\"='' WHERE \"PaymentMethodId\" IS NULL;");
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_Payments",
+                table: "Payments",
+                columns: new[] { "Id", "PaymentMethodId" });
+            base.Up(migrationBuilder);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

BTCPayServer.Data/Migrations/20240924065254_monitoredinvoices.cs

@@ -0,0 +1,15 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240924065254_monitoredinvoices")]
+    [DBScript("004.MonitoredInvoices.sql")]
+    public partial class monitoredinvoices : DBScriptsMigration
+    {
+    }
+}

BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -23,35 +23,6 @@ namespace BTCPayServer.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("BTCPayServer.App.BackupStorage.AppStorageItemData", b =>
-                {
-                    b.Property<string>("Key")
-                        .HasColumnType("text");
-
-                    b.Property<long>("Version")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<byte[]>("Value")
-                        .HasColumnType("bytea");
-
-                    b.HasKey("Key", "Version", "UserId");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("Key", "UserId")
-                        .IsUnique();
-
-                    b.ToTable("AppStorageItems", t =>
-                        {
-                            t.HasTrigger("LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA");
-                        });
-
-                    b.HasAnnotation("LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA", "CREATE FUNCTION \"LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA\"() RETURNS trigger as $LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA$\r\nBEGIN\r\n  DELETE FROM \"AppStorageItems\"\r\n  WHERE NEW.\"UserId\" = \"AppStorageItems\".\"UserId\" AND NEW.\"Key\" = \"AppStorageItems\".\"Key\" AND NEW.\"Version\" > \"AppStorageItems\".\"Version\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA BEFORE INSERT\r\nON \"AppStorageItems\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"LC_TRIGGER_BEFORE_INSERT_APPSTORAGEITEMDATA\"();");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
                 {
                     b.Property<string>("Id")
@@ -92,10 +63,13 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("Address")
                         .HasColumnType("text");
 
+                    b.Property<string>("PaymentMethodId")
+                        .HasColumnType("text");
+
                     b.Property<string>("InvoiceDataId")
                         .HasColumnType("text");
 
-                    b.HasKey("Address");
+                    b.HasKey("Address", "PaymentMethodId");
 
                     b.HasIndex("InvoiceDataId");
 
@@ -296,18 +270,9 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("Currency")
                         .HasColumnType("text");
 
-                    b.Property<string>("CustomerEmail")
-                        .HasColumnType("text");
-
                     b.Property<string>("ExceptionStatus")
                         .HasColumnType("text");
 
-                    b.Property<string>("ItemCode")
-                        .HasColumnType("text");
-
-                    b.Property<string>("OrderId")
-                        .HasColumnType("text");
-
                     b.Property<string>("Status")
                         .HasColumnType("text");
 
@@ -324,8 +289,6 @@ namespace BTCPayServer.Migrations
 
                     b.HasIndex("Created");
 
-                    b.HasIndex("OrderId");
-
                     b.HasIndex("StoreDataId");
 
                     b.ToTable("Invoices");
@@ -519,6 +482,9 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("Id")
                         .HasColumnType("text");
 
+                    b.Property<string>("PaymentMethodId")
+                        .HasColumnType("text");
+
                     b.Property<bool?>("Accounted")
                         .HasColumnType("boolean");
 
@@ -543,10 +509,7 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("Status")
                         .HasColumnType("text");
 
-                    b.Property<string>("Type")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
+                    b.HasKey("Id", "PaymentMethodId");
 
                     b.HasIndex("InvoiceDataId");
 
@@ -593,6 +556,9 @@ namespace BTCPayServer.Migrations
                         .HasMaxLength(30)
                         .HasColumnType("character varying(30)");
 
+                    b.Property<decimal?>("Amount")
+                        .HasColumnType("numeric");
+
                     b.Property<string>("Blob")
                         .HasColumnType("JSONB");
 
@@ -602,7 +568,13 @@ namespace BTCPayServer.Migrations
                     b.Property<DateTimeOffset>("Date")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<string>("Destination")
+                    b.Property<string>("DedupId")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("OriginalAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("OriginalCurrency")
                         .HasColumnType("text");
 
                     b.Property<string>("PayoutMethodId")
@@ -632,7 +604,7 @@ namespace BTCPayServer.Migrations
 
                     b.HasIndex("StoreDataId");
 
-                    b.HasIndex("Destination", "State");
+                    b.HasIndex("DedupId", "State");
 
                     b.ToTable("Payouts");
                 });
@@ -649,7 +621,7 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("Blob2")
                         .HasColumnType("JSONB");
 
-                    b.Property<string>("PaymentMethod")
+                    b.Property<string>("PayoutMethodId")
                         .HasColumnType("text");
 
                     b.Property<string>("Processor")
@@ -665,16 +637,6 @@ namespace BTCPayServer.Migrations
                     b.ToTable("PayoutProcessors");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("PendingInvoices");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.PlannedTransaction", b =>
                 {
                     b.Property<string>("Id")
@@ -704,9 +666,15 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("Blob")
                         .HasColumnType("JSONB");
 
+                    b.Property<string>("Currency")
+                        .HasColumnType("text");
+
                     b.Property<DateTimeOffset?>("EndDate")
                         .HasColumnType("timestamp with time zone");
 
+                    b.Property<decimal>("Limit")
+                        .HasColumnType("numeric");
+
                     b.Property<DateTimeOffset>("StartDate")
                         .HasColumnType("timestamp with time zone");
 
@@ -1181,17 +1149,6 @@ namespace BTCPayServer.Migrations
                     b.ToTable("AspNetUserTokens", (string)null);
                 });
 
-            modelBuilder.Entity("BTCPayServer.App.BackupStorage.AppStorageItemData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.ApplicationUser", "User")
-                        .WithMany("AppStorageItems")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
@@ -1367,17 +1324,6 @@ namespace BTCPayServer.Migrations
                     b.Navigation("Store");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("PendingInvoices")
-                        .HasForeignKey("Id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("InvoiceData");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.PullPaymentData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
@@ -1587,8 +1533,6 @@ namespace BTCPayServer.Migrations
                 {
                     b.Navigation("APIKeys");
 
-                    b.Navigation("AppStorageItems");
-
                     b.Navigation("Fido2Credentials");
 
                     b.Navigation("Notifications");
@@ -1610,8 +1554,6 @@ namespace BTCPayServer.Migrations
 
                     b.Navigation("Payments");
 
-                    b.Navigation("PendingInvoices");
-
                     b.Navigation("Refunds");
                 });
 

BTCPayServer.Rating/Currencies.json

@@ -1175,13 +1175,6 @@
       "symbol":null,
       "crypto":true
    },
-   {
-      "name":"USDt",
-      "code":"USDT",
-      "divisibility":8,
-      "symbol":null,
-      "crypto":true
-   },
    {
       "name":"LCAD",
       "code":"LCAD",
@@ -1315,13 +1308,6 @@
        "symbol": null,
        "crypto": true
    },
-   {
-       "name":"USDt",
-       "code":"USDT20",
-       "divisibility":6,
-       "symbol":null,
-       "crypto":true
-   },
    {
        "name":"FaucetToken",
        "code":"FAU",

BTCPayServer.Rating/CurrencyNameTable.cs

@@ -5,6 +5,9 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using NBitcoin;
 using Newtonsoft.Json;
 
@@ -18,14 +21,74 @@ namespace BTCPayServer.Services.Rates
         public string Symbol { get; set; }
         public bool Crypto { get; set; }
     }
-    public class CurrencyNameTable
+    public interface CurrencyDataProvider
     {
-        public static CurrencyNameTable Instance = new();
-        public CurrencyNameTable()
+        Task<CurrencyData[]> LoadCurrencyData(CancellationToken cancellationToken);
+    }
+    public class InMemoryCurrencyDataProvider : CurrencyDataProvider
+    {
+        private readonly CurrencyData[] _currencyData;
+
+        public InMemoryCurrencyDataProvider(CurrencyData[] currencyData)
         {
-            _Currencies = LoadCurrency().ToDictionary(k => k.Code, StringComparer.InvariantCultureIgnoreCase);
+            _currencyData = currencyData;
         }
 
+        public Task<CurrencyData[]> LoadCurrencyData(CancellationToken cancellationToken) => Task.FromResult(_currencyData);
+    }
+    public class AssemblyCurrencyDataProvider : CurrencyDataProvider
+    {
+        private readonly Assembly _assembly;
+        private readonly string _manifestResourceStream;
+
+        public AssemblyCurrencyDataProvider(Assembly assembly, string manifestResourceStream)
+        {
+            _assembly = assembly;
+            _manifestResourceStream = manifestResourceStream;
+        }
+        public Task<CurrencyData[]> LoadCurrencyData(CancellationToken cancellationToken)
+        {
+            var stream = _assembly.GetManifestResourceStream(_manifestResourceStream);
+            if (stream is null)
+                throw new InvalidOperationException("Unknown manifestResourceStream");
+            string content = null;
+            using (var reader = new StreamReader(stream, Encoding.UTF8))
+            {
+                content = reader.ReadToEnd();
+            }
+
+            var currencies = JsonConvert.DeserializeObject<CurrencyData[]>(content);
+            return Task.FromResult(currencies.ToArray());
+        }
+    }
+    public class CurrencyNameTable
+    {
+        public CurrencyNameTable(IEnumerable<CurrencyDataProvider> currencyDataProviders, ILogger<CurrencyNameTable> logger)
+        {
+            _currencyDataProviders = currencyDataProviders;
+            _logger = logger;
+        }
+
+        public async Task ReloadCurrencyData(CancellationToken cancellationToken)
+        {
+            var currencies = new Dictionary<string, CurrencyData>(StringComparer.InvariantCultureIgnoreCase);
+            var loadings = _currencyDataProviders.Select(c => (Task: c.LoadCurrencyData(cancellationToken), Prov: c)).ToList();
+            foreach (var loading in loadings)
+            {
+                try
+                {
+                    foreach (var curr in await loading.Task)
+                    {
+                        currencies.TryAdd(curr.Code, curr);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning(ex, "Error loading currency data for " + loading.Prov.GetType().FullName);
+                }
+            }
+            _Currencies = currencies;
+        }
         static readonly Dictionary<string, IFormatProvider> _CurrencyProviders = new();
 
         public NumberFormatInfo GetNumberFormatInfo(string currency, bool useFallback)
@@ -123,20 +186,9 @@ namespace BTCPayServer.Services.Rates
             currencyProviders.TryAdd(code, number);
         }
 
-        readonly Dictionary<string, CurrencyData> _Currencies;
-
-        static CurrencyData[] LoadCurrency()
-        {
-            var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("BTCPayServer.Rating.Currencies.json");
-            string content = null;
-            using (var reader = new StreamReader(stream, Encoding.UTF8))
-            {
-                content = reader.ReadToEnd();
-            }
-
-            var currencies = JsonConvert.DeserializeObject<CurrencyData[]>(content);
-            return currencies;
-        }
+        Dictionary<string, CurrencyData> _Currencies = new();
+        private readonly IEnumerable<CurrencyDataProvider> _currencyDataProviders;
+        private readonly ILogger<CurrencyNameTable> _logger;
 
         public IEnumerable<CurrencyData> Currencies => _Currencies.Values;
 

BTCPayServer.Rating/CurrencyPair.cs

@@ -1,11 +1,22 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using BTCPayServer.Services.Rates;
 
 namespace BTCPayServer.Rating
 {
     public class CurrencyPair
     {
+        private static readonly HashSet<string> _knownCurrencies;
+
+        static CurrencyPair()
+        {
+            var prov = new AssemblyCurrencyDataProvider(typeof(BTCPayServer.Rating.BidAsk).Assembly, "BTCPayServer.Rating.Currencies.json");
+            // It's OK this is sync function
+            _knownCurrencies = prov.LoadCurrencyData(default).GetAwaiter().GetResult()
+                .Select(c => c.Code).ToHashSet(StringComparer.OrdinalIgnoreCase);
+        }
         public CurrencyPair(string left, string right)
         {
             ArgumentNullException.ThrowIfNull(right);
@@ -49,10 +60,9 @@ namespace BTCPayServer.Rating
                 for (int i = 3; i < 5; i++)
                 {
                     var potentialCryptoName = currencyPair.Substring(0, i);
-                    var currency = CurrencyNameTable.Instance.GetCurrencyData(potentialCryptoName, false);
-                    if (currency != null)
+                    if (_knownCurrencies.Contains(potentialCryptoName))
                     {
-                        value = new CurrencyPair(currency.Code, currencyPair.Substring(i));
+                        value = new CurrencyPair(potentialCryptoName, currencyPair.Substring(i));
                         return true;
                     }
                 }

BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs

@@ -320,10 +320,10 @@ namespace BTCPayServer.Tests
 
                 var controller = tester.PayTester.GetController<UIInvoiceController>(null);
                 var checkout =
-                    (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id)
+                    (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id)
                         .GetAwaiter().GetResult()).Value;
-                Assert.Single(checkout.AvailableCryptos);
-                Assert.Equal("LTC", checkout.CryptoCode);
+                Assert.Single(checkout.AvailablePaymentMethods);
+                Assert.Equal("LTC", checkout.PaymentMethodCurrency);
 
                 //////////////////////
 
@@ -337,7 +337,7 @@ namespace BTCPayServer.Tests
                 {
                     invoice = user.BitPay.GetInvoice(invoice.Id);
                     Assert.Equal("paid", invoice.Status);
-                    checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id)
+                    checkout = (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id)
                         .GetAwaiter().GetResult()).Value;
                     Assert.Equal("Processing", checkout.Status);
                 });
@@ -475,10 +475,10 @@ namespace BTCPayServer.Tests
 
                 var controller = tester.PayTester.GetController<UIInvoiceController>(null);
                 var checkout =
-                    (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, null)
+                    (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id, null)
                         .GetAwaiter().GetResult()).Value;
-                Assert.Single(checkout.AvailableCryptos);
-                Assert.Equal("BTC", checkout.CryptoCode);
+                Assert.Single(checkout.AvailablePaymentMethods);
+                Assert.Equal("BTC", checkout.PaymentMethodCurrency);
 
                 Assert.Single(invoice.PaymentCodes);
                 Assert.Single(invoice.SupportedTransactionCurrencies);
@@ -536,10 +536,10 @@ namespace BTCPayServer.Tests
                 });
 
                 controller = tester.PayTester.GetController<UIInvoiceController>(null);
-                checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, "LTC")
+                checkout = (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id, "LTC")
                     .GetAwaiter().GetResult()).Value;
-                Assert.Equal(2, checkout.AvailableCryptos.Count);
-                Assert.Equal("LTC", checkout.CryptoCode);
+                Assert.Equal(2, checkout.AvailablePaymentMethods.Count);
+                Assert.Equal("LTC", checkout.PaymentMethodCurrency);
 
                 Assert.Equal(2, invoice.PaymentCodes.Count());
                 Assert.Equal(2, invoice.SupportedTransactionCurrencies.Count());

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -7,6 +7,15 @@
     <!--https://devblogs.microsoft.com/aspnet/testing-asp-net-core-mvc-web-apps-in-memory/-->
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="BTCPayServer.Tests.OutputPathAttribute">
+      <!-- _Parameter1, _Parameter2, etc. correspond to the
+        matching parameter of a constructor of that .NET attribute type -->
+      <_Parameter1>$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '$(OutputPath)'))</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
   <!--https://devblogs.microsoft.com/aspnet/testing-asp-net-core-mvc-web-apps-in-memory/-->
   <Target Name="CopyAditionalFiles" AfterTargets="Build" Condition="'$(TargetFramework)'!=''">
     <ItemGroup>
@@ -34,16 +43,13 @@
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
     <PackageReference Include="Selenium.Support" Version="4.1.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.22.0" />
-	<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="125.0.6422.14100" />
+	<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="128.0.6613.11900" />
 	<PackageReference Include="xunit" Version="2.6.6" />
 	<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(Altcoins)' != 'true'">
-    <Compile Remove="AltcoinTests\**\*.cs"></Compile>
-  </ItemGroup>
   <ItemGroup>
     <None Update=".dockerignore">
       <DependentUpon>Dockerfile</DependentUpon>
@@ -64,4 +70,7 @@
     <ProjectReference Include="..\BTCPayServer\BTCPayServer.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="obj\Debug\net8.0\" />
+  </ItemGroup>
 </Project>

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -31,12 +31,6 @@ using AuthenticationSchemes = BTCPayServer.Abstractions.Constants.Authentication
 
 namespace BTCPayServer.Tests
 {
-    public enum TestDatabases
-    {
-        Postgres,
-        MySQL,
-    }
-
     public class BTCPayServerTester : IDisposable
     {
         internal readonly string _Directory;
@@ -69,11 +63,6 @@ namespace BTCPayServer.Tests
             set;
         }
 
-        public string MySQL
-        {
-            get; set;
-        }
-
         public string Postgres
         {
             get; set;
@@ -89,11 +78,6 @@ namespace BTCPayServer.Tests
             get; set;
         }
 
-        public TestDatabases TestDatabase
-        {
-            get; set;
-        }
-
         public async Task RestartStartupTask<T>()
         {
             var startupTask = GetService<IServiceProvider>().GetServices<Abstractions.Contracts.IStartupTask>()
@@ -164,9 +148,7 @@ namespace BTCPayServer.Tests
             if (!string.IsNullOrEmpty(SSHConnection))
                 config.AppendLine($"sshconnection={SSHConnection}");
 
-            if (TestDatabase == TestDatabases.MySQL && !String.IsNullOrEmpty(MySQL))
-                config.AppendLine($"mysql=" + MySQL);
-            else if (!String.IsNullOrEmpty(Postgres))
+            if (!String.IsNullOrEmpty(Postgres))
                 config.AppendLine($"postgres=" + Postgres);
 
             if (!string.IsNullOrEmpty(ExplorerPostgres))
@@ -180,6 +162,8 @@ namespace BTCPayServer.Tests
             HttpClient.BaseAddress = ServerUri;
             Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development");
             var confBuilder = new DefaultConfiguration() { Logger = LoggerProvider.CreateLogger("Console") }.CreateConfigurationBuilder(new[] { "--datadir", _Directory, "--conf", confPath, "--disable-registration", DisableRegistration ? "true" : "false" });
+            // This make sure that tests work outside of this assembly (ie, test project it a plugin)
+            confBuilder.SetBasePath(TestUtils.TestDirectory);
 #if DEBUG
             confBuilder.AddJsonFile("appsettings.dev.json", true, false);
 #endif
@@ -195,7 +179,7 @@ namespace BTCPayServer.Tests
                             l.AddFilter("System.Net.Http.HttpClient", LogLevel.Critical);
                             l.SetMinimumLevel(LogLevel.Information)
                             .AddFilter("Microsoft", LogLevel.Error)
-                            .AddFilter("Hangfire", LogLevel.Error)
+                            .AddFilter("Microsoft.EntityFrameworkCore.Migrations", LogLevel.Information)
                             .AddFilter("Fido2NetLib.DistributedCacheMetadataService", LogLevel.Error)
                             .AddProvider(LoggerProvider);
                         });
@@ -283,7 +267,7 @@ namespace BTCPayServer.Tests
 
         private string FindBTCPayServerDirectory()
         {
-            var solutionDirectory = TestUtils.TryGetSolutionDirectoryInfo(Directory.GetCurrentDirectory());
+            var solutionDirectory = TestUtils.TryGetSolutionDirectoryInfo();
             return Path.Combine(solutionDirectory.FullName, "BTCPayServer");
         }
 

BTCPayServer.Tests/CheckoutUITests.cs

@@ -58,8 +58,8 @@ namespace BTCPayServer.Tests
             var qrValue = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-qr-value");
             var clipboard = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
             var payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
-            var address = s.Driver.FindElement(By.CssSelector("#Address_BTC-CHAIN .truncate-center-start")).Text;
-            Assert.StartsWith("bcrt", s.Driver.FindElement(By.CssSelector("#Address_BTC-CHAIN .truncate-center-start")).Text);
+            var address = s.Driver.FindElement(By.CssSelector("#Address_BTC-CHAIN .truncate-center")).GetAttribute("data-text");
+            Assert.StartsWith("bcrt", address);
             Assert.DoesNotContain("lightning=", payUrl);
             Assert.Equal($"bitcoin:{address}", payUrl);
             Assert.Equal($"bitcoin:{address}", clipboard);
@@ -80,7 +80,7 @@ namespace BTCPayServer.Tests
             {
                 payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
                 Assert.StartsWith("lightning:lnurl", payUrl);
-                Assert.StartsWith("lnurl", s.Driver.WaitForElement(By.CssSelector("#Lightning_BTC-CHAIN .truncate-center-start")).Text);
+                Assert.StartsWith("lnurl", s.Driver.WaitForElement(By.CssSelector("#Lightning_BTC-CHAIN .truncate-center")).GetAttribute("data-text"));
                 s.Driver.ElementDoesNotExist(By.Id("Address_BTC-CHAIN"));
             });
 
@@ -94,7 +94,7 @@ namespace BTCPayServer.Tests
             qrValue = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-qr-value");
             clipboard = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
             payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
-            address = s.Driver.FindElement(By.CssSelector("#Lightning_BTC-LN .truncate-center-start")).Text;
+            address = s.Driver.FindElement(By.CssSelector("#Lightning_BTC-LN .truncate-center")).GetAttribute("data-text");
             Assert.Equal($"lightning:{address}", payUrl);
             Assert.Equal($"lightning:{address}", clipboard);
             Assert.Equal($"lightning:{address.ToUpperInvariant()}", qrValue);
@@ -147,7 +147,7 @@ namespace BTCPayServer.Tests
             invoiceId = s.CreateInvoice(2100, "EUR");
             s.GoToInvoiceCheckout(invoiceId);
             await Task.Delay(200);
-            address = s.Driver.FindElement(By.CssSelector("#Address_BTC-CHAIN .truncate-center-start")).Text;
+            address = s.Driver.FindElement(By.CssSelector("#Address_BTC-CHAIN .truncate-center")).GetAttribute("data-text");
             var amountFraction = "0.00001";
             await s.Server.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create(address, Network.RegTest),
                 Money.Parse(amountFraction));
@@ -261,8 +261,8 @@ namespace BTCPayServer.Tests
             qrValue = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-qr-value");
             clipboard = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
             payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
-            var copyAddressOnchain = s.Driver.FindElement(By.CssSelector("#Address_BTC-CHAIN .truncate-center-start")).Text;
-            var copyAddressLightning = s.Driver.FindElement(By.CssSelector("#Lightning_BTC-CHAIN .truncate-center-start")).Text;
+            var copyAddressOnchain = s.Driver.FindElement(By.CssSelector("#Address_BTC-CHAIN .truncate-center")).GetAttribute("data-text");
+            var copyAddressLightning = s.Driver.FindElement(By.CssSelector("#Lightning_BTC-CHAIN .truncate-center")).GetAttribute("data-text");
             Assert.StartsWith($"bitcoin:{copyAddressOnchain}?amount=", payUrl);
             Assert.Contains("?amount=", payUrl);
             Assert.Contains("&lightning=", payUrl);
@@ -327,8 +327,8 @@ namespace BTCPayServer.Tests
             qrValue = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-qr-value");
             clipboard = s.Driver.FindElement(By.CssSelector(".qr-container")).GetAttribute("data-clipboard");
             payUrl = s.Driver.FindElement(By.Id("PayInWallet")).GetAttribute("href");
-            copyAddressOnchain = s.Driver.FindElement(By.CssSelector("#Address_BTC-CHAIN .truncate-center-start")).Text;
-            copyAddressLightning = s.Driver.FindElement(By.CssSelector("#Lightning_BTC-CHAIN .truncate-center-start")).Text;
+            copyAddressOnchain = s.Driver.FindElement(By.CssSelector("#Address_BTC-CHAIN .truncate-center")).GetAttribute("data-text");
+            copyAddressLightning = s.Driver.FindElement(By.CssSelector("#Lightning_BTC-CHAIN .truncate-center")).GetAttribute("data-text");
             Assert.StartsWith($"bitcoin:{copyAddressOnchain}", payUrl);
             Assert.Contains("?lightning=lnurl", payUrl);
             Assert.DoesNotContain("amount=", payUrl);

BTCPayServer.Tests/CrowdfundTests.cs

@@ -39,6 +39,8 @@ namespace BTCPayServer.Tests
             await user.GrantAccessAsync();
             var user2 = tester.NewAccount();
             await user2.GrantAccessAsync();
+            await user.RegisterDerivationSchemeAsync("BTC");
+            await user2.RegisterDerivationSchemeAsync("BTC");
             var apps = user.GetController<UIAppsController>();
             var apps2 = user2.GetController<UIAppsController>();
             var crowdfund = user.GetController<UICrowdfundController>();
@@ -79,7 +81,7 @@ namespace BTCPayServer.Tests
             Assert.False(app.Archived);
             var crowdfundViewModel = await crowdfund.UpdateCrowdfund(app.Id).AssertViewModelAsync<UpdateCrowdfundViewModel>();
             crowdfundViewModel.Enabled = true;
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
             Assert.IsType<ViewResult>(await crowdfund.ViewCrowdfund(app.Id));
             // Delete
             Assert.IsType<NotFoundResult>(apps2.DeleteApp(app.Id));
@@ -119,7 +121,7 @@ namespace BTCPayServer.Tests
             crowdfundViewModel.Enabled = false;
             crowdfundViewModel.EndDate = null;
 
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
 
             var anonAppPubsController = tester.PayTester.GetController<UICrowdfundController>();
             var crowdfundController = user.GetController<UICrowdfundController>();
@@ -144,7 +146,7 @@ namespace BTCPayServer.Tests
             crowdfundViewModel.StartDate = DateTime.Today.AddDays(2);
             crowdfundViewModel.Enabled = true;
 
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
             Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(app.Id, new ContributeToCrowdfund()
             {
                 Amount = new decimal(0.01)
@@ -155,7 +157,7 @@ namespace BTCPayServer.Tests
             crowdfundViewModel.EndDate = DateTime.Today.AddDays(-1);
             crowdfundViewModel.Enabled = true;
 
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
             Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(app.Id, new ContributeToCrowdfund()
             {
                 Amount = new decimal(0.01)
@@ -168,7 +170,7 @@ namespace BTCPayServer.Tests
             crowdfundViewModel.TargetAmount = 1;
             crowdfundViewModel.TargetCurrency = "BTC";
             crowdfundViewModel.EnforceTargetAmount = true;
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
             Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(app.Id, new ContributeToCrowdfund()
             {
                 Amount = new decimal(1.01)
@@ -212,7 +214,7 @@ namespace BTCPayServer.Tests
             crowdfundViewModel.TargetCurrency = "BTC";
             crowdfundViewModel.UseAllStoreInvoices = true;
             crowdfundViewModel.EnforceTargetAmount = true;
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
 
             var publicApps = user.GetController<UICrowdfundController>();
 
@@ -266,7 +268,7 @@ namespace BTCPayServer.Tests
             Assert.Contains(AppService.GetAppInternalTag(app.Id), invoiceEntity.InternalTags);
 
             crowdfundViewModel.UseAllStoreInvoices = false;
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
 
             TestLogs.LogInformation("Because UseAllStoreInvoices is false, let's make sure the invoice is not tagged");
             invoice = await user.BitPay.CreateInvoiceAsync(new Invoice
@@ -285,7 +287,7 @@ namespace BTCPayServer.Tests
             TestLogs.LogInformation("After turning setting a softcap, let's check that only actual payments are counted");
             crowdfundViewModel.EnforceTargetAmount = false;
             crowdfundViewModel.UseAllStoreInvoices = true;
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
             invoice = await user.BitPay.CreateInvoiceAsync(new Invoice
             {
                 Buyer = new Buyer { email = "test@fwf.com" },
@@ -354,7 +356,7 @@ namespace BTCPayServer.Tests
             crowdfundViewModel.FormId = lstForms[0].Id;
             crowdfundViewModel.TargetCurrency = "BTC";
             crowdfundViewModel.Enabled = true;
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
 
             var vm2 = await crowdfund.CrowdfundForm(app.Id, (decimal?)0.01).AssertViewModelAsync<FormViewModel>();
             var res = await crowdfund.CrowdfundFormSubmit(app.Id, (decimal)0.01, "", vm2);
@@ -409,7 +411,7 @@ namespace BTCPayServer.Tests
             crowdfundViewModel.TargetCurrency = "BTC";
             crowdfundViewModel.Enabled = true;
             crowdfundViewModel.PerksTemplate = "[{\"id\": \"xxx\",\"title\": \"Perk 1\",\"priceType\": \"Fixed\",\"price\": \"0.001\",\"image\": \"\",\"description\": \"\",\"categories\": [],\"disabled\": false}]";
-            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel).Result);
 
             var vm2 = await crowdfund.CrowdfundForm(app.Id, (decimal?)0.01, "xxx").AssertViewModelAsync<FormViewModel>();
             var res = await crowdfund.CrowdfundFormSubmit(app.Id, (decimal)0.01, "xxx", vm2);

BTCPayServer.Tests/DatabaseTester.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Abstractions.Models;
+using BTCPayServer.Data;
+using BTCPayServer.Services.Invoices;
+using BTCPayServer.Tests.Logging;
+using Dapper;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using NBitcoin;
+using Npgsql;
+
+namespace BTCPayServer.Tests
+{
+    public class DatabaseTester
+    {
+        private readonly ILoggerFactory _loggerFactory;
+        private readonly string dbname;
+        private string[] notAppliedMigrations;
+
+        public DatabaseTester(ILog log, ILoggerFactory loggerFactory)
+        {
+            var connStr = Environment.GetEnvironmentVariable("TESTS_POSTGRES");
+            if (string.IsNullOrEmpty(connStr))
+                connStr = ServerTester.DefaultConnectionString;
+            var r = RandomUtils.GetUInt32();
+            dbname = $"btcpayserver{r}";
+            connStr = connStr.Replace("btcpayserver", dbname);
+            log.LogInformation("DB: " + dbname);
+            ConnectionString = connStr;
+            _loggerFactory = loggerFactory;
+        }
+
+        public ApplicationDbContextFactory CreateContextFactory()
+        {
+            return new ApplicationDbContextFactory(new OptionsWrapper<DatabaseOptions>(new DatabaseOptions()
+            {
+                ConnectionString = ConnectionString
+            }), _loggerFactory);
+        }
+
+        public InvoiceRepository GetInvoiceRepository()
+        {
+            var logs = new BTCPayServer.Logging.Logs();
+            logs.Configure(_loggerFactory);
+            return new InvoiceRepository(CreateContextFactory(), new EventAggregator(logs));
+        }
+
+        public ApplicationDbContext CreateContext() => CreateContextFactory().CreateContext();
+
+        public async Task MigrateAsync()
+        {
+            using var ctx = CreateContext();
+            await EnsureCreatedAsync();
+            await ctx.Database.MigrateAsync();
+        }
+
+        private async Task EnsureCreatedAsync()
+        {
+            var builder = new Npgsql.NpgsqlConnectionStringBuilder(ConnectionString);
+            builder.Database = null;
+            NpgsqlConnection conn = new NpgsqlConnection(builder.ToString());
+            await conn.ExecuteAsync($"CREATE DATABASE \"{dbname}\";");
+        }
+
+        public async Task MigrateUntil(string migration = null)
+        {
+            using var ctx = CreateContext();
+            var db = ctx.Database.GetDbConnection();
+            await EnsureCreatedAsync();
+            var migrations = ctx.Database.GetMigrations().ToArray();
+            if (migration is not null)
+            {
+                var untilMigrationIdx = Array.IndexOf(migrations, migration);
+                if (untilMigrationIdx == -1)
+                    throw new InvalidOperationException($"Migration {migration} not found");
+                notAppliedMigrations = migrations[untilMigrationIdx..];
+                await db.ExecuteAsync("CREATE TABLE IF NOT EXISTS \"__EFMigrationsHistory\" (\"MigrationId\" TEXT, \"ProductVersion\" TEXT)");
+                await db.ExecuteAsync("INSERT INTO \"__EFMigrationsHistory\" VALUES (@migration, '8.0.0')", notAppliedMigrations.Select(m => new { migration = m }).ToArray());
+            }
+            await ctx.Database.MigrateAsync();
+        }
+
+        public async Task ContinueMigration()
+        {
+            if (notAppliedMigrations is null)
+                throw new InvalidOperationException("Call MigrateUpTo first");
+            using var ctx = CreateContext();
+            var db = ctx.Database.GetDbConnection();
+            await db.ExecuteAsync("DELETE FROM \"__EFMigrationsHistory\" WHERE \"MigrationId\" = ANY (@migrations)", new { migrations = notAppliedMigrations });
+            await ctx.Database.MigrateAsync();
+            notAppliedMigrations = null;
+        }
+
+        public string ConnectionString { get; }
+    }
+}

BTCPayServer.Tests/DatabaseTests.cs

@@ -0,0 +1,217 @@
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Payments;
+using Dapper;
+using Microsoft.EntityFrameworkCore;
+using NBitcoin;
+using NBitcoin.Altcoins;
+using NBitpayClient;
+using Newtonsoft.Json.Linq;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace BTCPayServer.Tests
+{
+    [Trait("Integration", "Integration")]
+    public class DatabaseTests : UnitTestBase
+    {
+
+        public DatabaseTests(ITestOutputHelper helper):base(helper)
+        {
+        }
+
+        [Fact]
+        public async Task CanQueryMonitoredInvoices()
+        {
+            var tester = CreateDBTester();
+            await tester.MigrateUntil();
+            var invoiceRepository = tester.GetInvoiceRepository();
+            using var ctx = tester.CreateContext();
+            var conn = ctx.Database.GetDbConnection();
+
+            async Task AddPrompt(string invoiceId, string paymentMethodId, bool activated = true)
+            {
+                JObject prompt = new JObject();
+                if (!activated)
+                    prompt["inactive"] = true;
+                prompt["currency"] = "USD";
+                var query = """
+                UPDATE "Invoices" SET "Blob2" = jsonb_set('{"prompts": {}}'::JSONB || COALESCE("Blob2",'{}'), ARRAY['prompts','@paymentMethodId'], '@prompt'::JSONB)
+                WHERE "Id" = '@invoiceId'
+                """;
+                query = query.Replace("@paymentMethodId", paymentMethodId);
+                query = query.Replace("@prompt", prompt.ToString());
+                query = query.Replace("@invoiceId", invoiceId);
+                Assert.Equal(1, await conn.ExecuteAsync(query));
+            }
+
+            await conn.ExecuteAsync("""
+                INSERT INTO "Invoices" ("Id", "Created", "Status","Currency") VALUES 
+                ('BTCOnly', NOW(), 'New', 'USD'),
+                ('LTCOnly', NOW(), 'New', 'USD'),
+                ('LTCAndBTC', NOW(), 'New', 'USD'),
+                ('LTCAndBTCLazy', NOW(), 'New', 'USD')
+                """);
+            foreach (var invoiceId in new string[] { "LTCOnly", "LTCAndBTCLazy", "LTCAndBTC" })
+            {
+                await AddPrompt(invoiceId, "LTC-CHAIN", true);
+            }
+            foreach (var invoiceId in new string[] { "BTCOnly", "LTCAndBTC" })
+            {
+                await AddPrompt(invoiceId, "BTC-CHAIN", true);
+            }
+            await AddPrompt("LTCAndBTCLazy", "BTC-CHAIN", false);
+
+            var btc = PaymentMethodId.Parse("BTC-CHAIN");
+            var ltc = PaymentMethodId.Parse("LTC-CHAIN");
+            var invoices = await invoiceRepository.GetMonitoredInvoices(btc);
+            Assert.Equal(2, invoices.Length);
+            foreach (var invoiceId in new[] { "BTCOnly", "LTCAndBTC" })
+            {
+                Assert.Contains(invoices, i => i.Id == invoiceId);
+            }
+            invoices = await invoiceRepository.GetMonitoredInvoices(btc, true);
+            Assert.Equal(3, invoices.Length);
+            foreach (var invoiceId in new[] { "BTCOnly", "LTCAndBTC", "LTCAndBTCLazy" })
+            {
+                Assert.Contains(invoices, i => i.Id == invoiceId);
+            }
+
+            invoices = await invoiceRepository.GetMonitoredInvoices(ltc);
+            Assert.Equal(3, invoices.Length);
+            foreach (var invoiceId in new[] { "LTCAndBTC", "LTCAndBTC", "LTCAndBTCLazy" })
+            {
+                Assert.Contains(invoices, i => i.Id == invoiceId);
+            }
+
+            await conn.ExecuteAsync("""
+                INSERT INTO "Payments" ("Id", "InvoiceDataId", "PaymentMethodId", "Status", "Blob2", "Created", "Amount", "Currency") VALUES
+                ('1','LTCAndBTC', 'LTC-CHAIN', 'Processing', '{}'::JSONB, NOW(), 123, 'USD'),
+                ('2','LTCAndBTC', 'BTC-CHAIN', 'Processing', '{}'::JSONB, NOW(), 123, 'USD'),
+                ('3','LTCAndBTC', 'BTC-CHAIN', 'Processing', '{}'::JSONB, NOW(), 123, 'USD'),
+                ('4','LTCAndBTC', 'BTC-CHAIN', 'Settled', '{}'::JSONB, NOW(), 123, 'USD');
+
+                INSERT INTO "AddressInvoices" ("InvoiceDataId", "Address", "PaymentMethodId") VALUES
+                ('LTCAndBTC', 'BTC1', 'BTC-CHAIN'),
+                ('LTCAndBTC', 'BTC2', 'BTC-CHAIN'),
+                ('LTCAndBTC', 'LTC1', 'LTC-CHAIN');
+                """);
+
+            var invoice = Assert.Single(await invoiceRepository.GetMonitoredInvoices(ltc), i => i.Id == "LTCAndBTC");
+            var payment = Assert.Single(invoice.GetPayments(false));
+            Assert.Equal("1", payment.Id);
+
+            foreach (var includeNonActivated in new[] { true, false })
+            {
+                invoices = await invoiceRepository.GetMonitoredInvoices(btc, includeNonActivated);
+                invoice = Assert.Single(invoices, i => i.Id == "LTCAndBTC");
+                var payments = invoice.GetPayments(false);
+                Assert.Equal(3, payments.Count);
+
+                foreach (var paymentId in new[] { "2", "3", "4" })
+                {
+                    Assert.Contains(payments, p => p.Id == paymentId);
+                }
+                Assert.Equal(2, invoice.Addresses.Count);
+                foreach (var addr in new[] { "BTC1", "BTC2" })
+                {
+                    Assert.Contains(invoice.Addresses, p => p.Address == addr);
+                }
+                if (!includeNonActivated)
+                    Assert.DoesNotContain(invoices, i => i.Id == "LTCAndBTCLazy");
+                else
+                    Assert.Contains(invoices, i => i.Id == "LTCAndBTCLazy");
+            }
+        }
+
+        [Fact]
+        public async Task CanMigrateInvoiceAddresses()
+        {
+            var tester = CreateDBTester();
+            await tester.MigrateUntil("20240919085726_refactorinvoiceaddress");
+            using var ctx = tester.CreateContext();
+            var conn = ctx.Database.GetDbConnection();
+            await conn.ExecuteAsync("INSERT INTO \"Invoices\" (\"Id\", \"Created\") VALUES ('i', NOW())");
+            await conn.ExecuteAsync(
+                "INSERT INTO \"AddressInvoices\" VALUES ('aaa#BTC', 'i'),('bbb','i'),('ccc#BTC_LNU', 'i'),('ddd#XMR_MoneroLike', 'i'),('eee#ZEC_ZcashLike', 'i')");
+            await tester.ContinueMigration();
+            foreach (var v in new[] { ("aaa", "BTC-CHAIN"), ("bbb", "BTC-CHAIN"), ("ddd", "XMR-CHAIN") , ("eee", "ZEC-CHAIN") })
+            {
+                var ok = await conn.ExecuteScalarAsync<bool>("SELECT 't'::BOOLEAN FROM \"AddressInvoices\" WHERE \"Address\"=@a AND \"PaymentMethodId\"=@b", new { a = v.Item1, b = v.Item2 });
+                Assert.True(ok);
+            }
+            var notok = await conn.ExecuteScalarAsync<bool>("SELECT 't'::BOOLEAN FROM \"AddressInvoices\" WHERE \"Address\"='ccc'");
+            Assert.False(notok);
+        }
+
+        [Fact]
+        public async Task CanMigratePayoutsAndPullPayments()
+        {
+            var tester = CreateDBTester();
+            await tester.MigrateUntil("20240827034505_migratepayouts");
+
+            using var ctx = tester.CreateContext();
+            var conn = ctx.Database.GetDbConnection();
+            await conn.ExecuteAsync("INSERT INTO \"Stores\"(\"Id\", \"SpeedPolicy\") VALUES (@store, 0)", new { store = "store1" });
+            var param = new
+            {
+                Id = "pp1",
+                StoreId = "store1",
+                Blob = "{\"Name\": \"CoinLottery\", \"View\": {\"Email\": null, \"Title\": \"\", \"Description\": \"\", \"EmbeddedCSS\": null, \"CustomCSSLink\": null}, \"Limit\": \"10.00\", \"Period\": null, \"Currency\": \"GBP\", \"Description\": \"\", \"Divisibility\": 0, \"MinimumClaim\": \"0\", \"AutoApproveClaims\": false, \"SupportedPaymentMethods\": [\"BTC\", \"BTC_LightningLike\"]}"
+            };
+            await conn.ExecuteAsync("INSERT INTO \"PullPayments\"(\"Id\", \"StoreId\", \"Blob\", \"StartDate\", \"Archived\") VALUES (@Id, @StoreId, @Blob::JSONB, NOW(), 'f')", param);
+            var parameters = new[]
+            {
+                new
+                {
+                    Id = "p1",
+                    StoreId = "store1",
+                    PullPaymentDataId = "pp1",
+                    PaymentMethodId = "BTC",
+                    Blob = "{\"Amount\": \"10.0\", \"Revision\": 0, \"Destination\": \"address\", \"CryptoAmount\": \"0.00012225\", \"MinimumConfirmation\": 1}"
+                },
+                new
+                {
+                    Id = "p2",
+                    StoreId = "store1",
+                    PullPaymentDataId = "pp1",
+                    PaymentMethodId = "BTC_LightningLike",
+                    Blob = "{\"Amount\": \"10.0\", \"Revision\": 0, \"Destination\": \"address\", \"CryptoAmount\": null, \"MinimumConfirmation\": 1}"
+                },
+                new
+                {
+                    Id = "p3",
+                    StoreId = "store1",
+                    PullPaymentDataId = null as string,
+                    PaymentMethodId = "BTC_LightningLike",
+                    Blob = "{\"Amount\": \"10.0\", \"Revision\": 0, \"Destination\": \"address\", \"CryptoAmount\": null, \"MinimumConfirmation\": 1}"
+                },
+                new
+                {
+                    Id = "p4",
+                    StoreId = "store1",
+                    PullPaymentDataId = null as string,
+                    PaymentMethodId = "BTC_LightningLike",
+                    Blob = "{\"Amount\": \"-10.0\", \"Revision\": 0, \"Destination\": \"address\", \"CryptoAmount\": null, \"MinimumConfirmation\": 1}"
+                }
+            };
+            await conn.ExecuteAsync("INSERT INTO \"Payouts\"(\"Id\", \"StoreDataId\", \"PullPaymentDataId\", \"PaymentMethodId\", \"Blob\", \"State\", \"Date\") VALUES (@Id, @StoreId, @PullPaymentDataId, @PaymentMethodId, @Blob::JSONB, 'state', NOW())", parameters);
+            await tester.ContinueMigration();
+
+            var migrated = await conn.ExecuteScalarAsync<bool>("SELECT 't'::BOOLEAN FROM \"PullPayments\" WHERE \"Id\"='pp1' AND \"Limit\"=10.0 AND \"Currency\"='GBP' AND \"Blob\"->>'SupportedPayoutMethods'='[\"BTC-CHAIN\", \"BTC-LN\"]'");
+            Assert.True(migrated);
+
+            migrated = await conn.ExecuteScalarAsync<bool>("SELECT 't'::BOOLEAN FROM \"Payouts\" WHERE \"Id\"='p1' AND \"Amount\"= 0.00012225 AND \"OriginalAmount\"=10.0 AND \"OriginalCurrency\"='GBP' AND \"PayoutMethodId\"='BTC-CHAIN'");
+            Assert.True(migrated);
+
+            migrated = await conn.ExecuteScalarAsync<bool>("SELECT 't'::BOOLEAN FROM \"Payouts\" WHERE \"Id\"='p2' AND \"Amount\" IS NULL AND \"OriginalAmount\"=10.0 AND \"OriginalCurrency\"='GBP' AND \"PayoutMethodId\"='BTC-LN'");
+            Assert.True(migrated);
+
+            migrated = await conn.ExecuteScalarAsync<bool>("SELECT 't'::BOOLEAN FROM \"Payouts\" WHERE \"Id\"='p3' AND \"Amount\" IS NULL AND \"OriginalAmount\"=10.0 AND \"OriginalCurrency\"='BTC'");
+            Assert.True(migrated);
+
+            migrated = await conn.ExecuteScalarAsync<bool>("SELECT 't'::BOOLEAN FROM \"Payouts\" WHERE \"Id\"='p4' AND \"Amount\" IS NULL AND \"OriginalAmount\"=-10.0 AND \"OriginalCurrency\"='BTC' AND \"PayoutMethodId\"='TOPUP'");
+            Assert.True(migrated);
+        }
+    }
+}

BTCPayServer.Tests/FastTests.cs

@@ -3,14 +3,15 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection.Metadata;
 using System.Runtime.CompilerServices;
 using System.Security;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using BTCPayServer.Abstractions.Converters;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Configuration;
@@ -19,21 +20,32 @@ using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Hosting;
 using BTCPayServer.JsonConverters;
+using BTCPayServer.Lightning;
+using BTCPayServer.Logging;
 using BTCPayServer.Payments;
+using BTCPayServer.Payments.Bitcoin;
+using BTCPayServer.Payments.Lightning;
+using BTCPayServer.Plugins;
+using BTCPayServer.Plugins.Bitcoin;
 using BTCPayServer.Rating;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Fees;
 using BTCPayServer.Services.Invoices;
+using BTCPayServer.Services.Labels;
 using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
 using BTCPayServer.Validation;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.Memory;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using NBitcoin;
+using NBitcoin.DataEncoders;
 using NBitcoin.Scripting.Parser;
+using NBXplorer;
 using NBXplorer.DerivationStrategy;
 using NBXplorer.Models;
 using Newtonsoft.Json;
@@ -41,6 +53,7 @@ using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 using Xunit;
 using Xunit.Abstractions;
+using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Tests
 {
@@ -239,12 +252,10 @@ namespace BTCPayServer.Tests
             Assert.Equal(id, id1);
             Assert.Equal(id, id2);
             Assert.Equal("LTC-LN", id.ToString());
-#if ALTCOINS
             id = PaymentMethodId.Parse("XMR");
             id1 = PaymentMethodId.Parse("XMR-MoneroLike");
             Assert.Equal(id, id1);
             Assert.Equal("XMR-CHAIN", id.ToString());
-#endif
         }
 
         [Fact]
@@ -476,7 +487,7 @@ namespace BTCPayServer.Tests
 
 #pragma warning restore CS0618
         }
-#if ALTCOINS
+
         [Fact]
         public void CanCalculateCryptoDue()
         {
@@ -496,7 +507,6 @@ namespace BTCPayServer.Tests
 
             var paymentMethod = entity.GetPaymentPrompts().TryGet(PaymentTypes.CHAIN.GetPaymentMethodId("BTC"));
             var accounting = paymentMethod.Calculate();
-            Assert.Equal(1.0m, accounting.ToSmallestUnit(Money.Satoshis(1.0m).ToDecimal(MoneyUnit.BTC)));
             Assert.Equal(1.1m, accounting.Due);
             Assert.Equal(1.1m, accounting.TotalDue);
 
@@ -647,7 +657,6 @@ namespace BTCPayServer.Tests
             Assert.Equal(accounting.Paid, accounting.TotalDue);
 #pragma warning restore CS0618
         }
-#endif
 
         [Fact]
         public void DeterministicUTXOSorter()
@@ -673,7 +682,6 @@ namespace BTCPayServer.Tests
         [Fact]
         public void CanAcceptInvoiceWithTolerance()
         {
-            var networkProvider = CreateNetworkProvider(ChainName.Regtest);
             var entity = new InvoiceEntity() { Currency = "USD" };
 #pragma warning disable CS0618
             entity.Payments = new List<PaymentEntity>();
@@ -730,10 +738,29 @@ namespace BTCPayServer.Tests
             Assert.True(FileTypeDetector.IsAudio(new byte[] { 0xFF, 0xF3, 0xE4, 0x64, 0x00, 0x20, 0xAD, 0xBD, 0x04, 0x00 }, "music.mp3"));
         }
 
+        CurrencyNameTable GetCurrencyNameTable()
+        {
+            ServiceCollection services = new ServiceCollection();
+            services.AddLogging(o => o.AddProvider(this.TestLogProvider));
+            BTCPayServerServices.RegisterCurrencyData(services);
+            // One test fail without.
+            services.AddCurrencyData(new CurrencyData()
+            {
+                Code = "USDt",
+                Name = "USDt",
+                Divisibility = 8,
+                Symbol = null,
+                Crypto = true
+            });
+            var table = services.BuildServiceProvider().GetRequiredService<CurrencyNameTable>();
+            table.ReloadCurrencyData(default).GetAwaiter().GetResult();
+            return table;
+        }
+
         [Fact]
         public void RoundupCurrenciesCorrectly()
         {
-            DisplayFormatter displayFormatter = new(CurrencyNameTable.Instance);
+            DisplayFormatter displayFormatter = new(GetCurrencyNameTable());
             foreach (var test in new[]
             {
                 (0.0005m, "0.0005 USD", "USD"), (0.001m, "0.001 USD", "USD"), (0.01m, "0.01 USD", "USD"),
@@ -746,8 +773,8 @@ namespace BTCPayServer.Tests
                 actual = actual.Replace("￥", "¥"); // Hack so JPY test pass on linux as well
                 Assert.Equal(test.Item2, actual);
             }
-            Assert.Equal(0, CurrencyNameTable.Instance.GetNumberFormatInfo("ARS").CurrencyDecimalDigits);
-            Assert.Equal(0, CurrencyNameTable.Instance.GetNumberFormatInfo("COP").CurrencyDecimalDigits);
+            Assert.Equal(0, GetCurrencyNameTable().GetNumberFormatInfo("ARS").CurrencyDecimalDigits);
+            Assert.Equal(0, GetCurrencyNameTable().GetNumberFormatInfo("COP").CurrencyDecimalDigits);
         }
 
         [Fact]
@@ -1369,7 +1396,7 @@ bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
             var btcPayNetworkProvider = CreateNetworkProvider(ChainName.Regtest);
             foreach (var network in btcPayNetworkProvider.GetAll())
             {
-                var cd = CurrencyNameTable.Instance.GetCurrencyData(network.CryptoCode, false);
+                var cd = GetCurrencyNameTable().GetCurrencyData(network.CryptoCode, false);
                 Assert.NotNull(cd);
                 Assert.Equal(network.Divisibility, cd.Divisibility);
                 Assert.True(cd.Crypto);
@@ -1437,8 +1464,8 @@ bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
             Assert.True(CurrencyValue.TryParse("1usd", out result));
             Assert.Equal("1 USD", result.ToString());
             Assert.True(CurrencyValue.TryParse("1.501 usd", out result));
-            Assert.Equal("1.50 USD", result.ToString());
-            Assert.False(CurrencyValue.TryParse("1.501 WTFF", out result));
+            Assert.Equal("1.501 USD", result.ToString());
+            Assert.True(CurrencyValue.TryParse("1.501 WTFF", out result));
             Assert.False(CurrencyValue.TryParse("1,501 usd", out result));
             Assert.False(CurrencyValue.TryParse("1.501", out result));
         }
@@ -1617,7 +1644,7 @@ bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
 
             testCases.ForEach(tuple =>
             {
-                Assert.Equal(tuple.expectedOutput, PosDataParser.ParsePosData(string.IsNullOrEmpty(tuple.input) ? null : JToken.Parse(tuple.input)));
+                Assert.Equal(tuple.expectedOutput, UIInvoiceController.PosDataParser.ParsePosData(string.IsNullOrEmpty(tuple.input) ? null : JToken.Parse(tuple.input)));
             });
         }
         [Fact]
@@ -2238,7 +2265,7 @@ bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
                     Data.InvoiceData data = new Data.InvoiceData();
                     obj = data;
                     data.Blob2 = v.Input.ToString();
-                    data.Migrate();
+                    data.TryMigrate();
                     var actual = JObject.Parse(data.Blob2);
                     AssertSameJson(v.Expected, actual);
                     if (!v.SkipRountripTest)
@@ -2258,7 +2285,7 @@ bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
                     //data.
                     obj = data;
                     data.Blob2 = v.Input.ToString();
-                    data.Migrate();
+                    data.TryMigrate();
                     var actual = JObject.Parse(data.Blob2);
                     AssertSameJson(v.Expected, actual);
                     if (!v.SkipRountripTest)
@@ -2373,7 +2400,7 @@ bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
                 });
                 var data = new Data.InvoiceData();
                 data.Blob2 = o.ToString();
-                data.Migrate();
+                data.TryMigrate();
                 var migrated = JObject.Parse(data.Blob2);
                 return migrated["prompts"]["BTC-CHAIN"]["details"]["accountDerivation"].Value<string>();
             })

BTCPayServer.Tests/GreenfieldAPITests.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Net.Http;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
@@ -13,9 +14,14 @@ using BTCPayServer.Events;
 using BTCPayServer.Lightning;
 using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.NTag424;
+using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
 using BTCPayServer.PayoutProcessors;
+using BTCPayServer.Plugins.PointOfSale.Controllers;
+using BTCPayServer.Plugins.PointOfSale.Models;
 using BTCPayServer.Services;
+using BTCPayServer.Services.Apps;
+using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Notifications;
 using BTCPayServer.Services.Notifications.Blobs;
 using BTCPayServer.Services.Stores;
@@ -30,6 +36,7 @@ using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 using CreateApplicationUserRequest = BTCPayServer.Client.Models.CreateApplicationUserRequest;
+using PosViewType = BTCPayServer.Plugins.PointOfSale.PosViewType;
 
 namespace BTCPayServer.Tests
 {
@@ -90,6 +97,9 @@ namespace BTCPayServer.Tests
             Assert.NotNull(e.APIError.Message);
             GreenfieldPermissionAPIError permissionError = Assert.IsType<GreenfieldPermissionAPIError>(e.APIError);
             Assert.Equal(Policies.CanModifyStoreSettings, permissionError.MissingPermission);
+
+            var client = await user.CreateClient(Policies.CanViewStoreSettings);
+            await AssertAPIError("unsupported-in-v2", () => client.SendHttpRequest<object>($"api/v1/stores/{user.StoreId}/payment-methods/LightningNetwork"));
         }
 
         [Fact(Timeout = TestTimeout)]
@@ -361,6 +371,27 @@ namespace BTCPayServer.Tests
                     }
                 )
             );
+            var template = @"[
+              {
+                ""description"": ""Lovely, fresh and tender, Meng Ding Gan Lu ('sweet dew') is grown in the lush Meng Ding Mountains of the southwestern province of Sichuan where it has been cultivated for over a thousand years."",
+                ""id"": ""green-tea"",
+                ""image"": ""~/img/pos-sample/green-tea.jpg"",
+                ""priceType"": ""Fixed"",
+                ""price"": ""1"",
+                ""title"": ""Green Tea"",
+                ""disabled"": false
+              }
+            ]";
+            await AssertValidationError(new[] { "Template" },
+                async () => await client.CreatePointOfSaleApp(
+                    user.StoreId,
+                    new PointOfSaleAppRequest
+                    {
+                        AppName = "good name",
+                        Template = template.Replace(@"""id"": ""green-tea"",", "")
+                    }
+                )
+            );
 
             // Test creating a POS app successfully
             var app = await client.CreatePointOfSaleApp(
@@ -369,7 +400,8 @@ namespace BTCPayServer.Tests
                 {
                     AppName = "test app from API",
                     Currency = "JPY",
-                    Title = "test app title"
+                    Title = "test app title",
+                    Template = template
                 }
             );
             Assert.Equal("test app from API", app.AppName);
@@ -552,6 +584,27 @@ namespace BTCPayServer.Tests
                     }
                 )
             );
+            var template = @"[
+              {
+                ""description"": ""Lovely, fresh and tender, Meng Ding Gan Lu ('sweet dew') is grown in the lush Meng Ding Mountains of the southwestern province of Sichuan where it has been cultivated for over a thousand years."",
+                ""id"": ""green-tea"",
+                ""image"": ""~/img/pos-sample/green-tea.jpg"",
+                ""priceType"": ""Fixed"",
+                ""price"": ""1"",
+                ""title"": ""Green Tea"",
+                ""disabled"": false
+              }
+            ]";
+            await AssertValidationError(new[] { "PerksTemplate" },
+                async () => await client.CreateCrowdfundApp(
+                    user.StoreId,
+                    new CrowdfundAppRequest
+                    {
+                        AppName = "good name",
+                        PerksTemplate = template.Replace(@"""id"": ""green-tea"",", "")
+                    }
+                )
+            );
 
             // Test creating a crowdfund app
             var app = await client.CreateCrowdfundApp(
@@ -559,7 +612,8 @@ namespace BTCPayServer.Tests
                 new CrowdfundAppRequest
                 {
                     AppName = "test app from API",
-                    Title = "test app title"
+                    Title = "test app title",
+                    PerksTemplate = template
                 }
             );
             Assert.Equal("test app from API", app.AppName);
@@ -678,6 +732,93 @@ namespace BTCPayServer.Tests
             Assert.False(apps[2].Archived);
         }
 
+        [Fact(Timeout = TestTimeout)]
+        [Trait("Integration", "Integration")]
+        public async Task CanGetAppStats()
+        {
+            using var tester = CreateServerTester();
+            await tester.StartAsync();
+            var user = tester.NewAccount();
+            await user.GrantAccessAsync(true);
+            await user.MakeAdmin();
+            await user.RegisterDerivationSchemeAsync("BTC");
+            var client = await user.CreateClient();
+
+            var item1 = new ViewPointOfSaleViewModel.Item { Id = "item1", Title = "Item 1", Price = 1, PriceType = ViewPointOfSaleViewModel.ItemPriceType.Fixed };
+            var item2 = new ViewPointOfSaleViewModel.Item { Id = "item2", Title = "Item 2", Price = 2, PriceType = ViewPointOfSaleViewModel.ItemPriceType.Fixed };
+            var item3 = new ViewPointOfSaleViewModel.Item { Id = "item3", Title = "Item 3", Price = 3, PriceType = ViewPointOfSaleViewModel.ItemPriceType.Fixed };
+            var posItems = AppService.SerializeTemplate([item1, item2, item3]);
+            var posApp = await client.CreatePointOfSaleApp(user.StoreId, new PointOfSaleAppRequest { AppName = "test pos", Template = posItems, });
+            var crowdfundApp = await client.CreateCrowdfundApp(user.StoreId, new CrowdfundAppRequest { AppName = "test crowdfund" });
+            
+            // empty states
+            var posSales = await client.GetAppSales(posApp.Id);
+            Assert.NotNull(posSales);
+            Assert.Equal(0, posSales.SalesCount);
+            Assert.Equal(7, posSales.Series.Count());
+
+            var crowdfundSales = await client.GetAppSales(crowdfundApp.Id);
+            Assert.NotNull(crowdfundSales);
+            Assert.Equal(0, crowdfundSales.SalesCount);
+            Assert.Equal(7, crowdfundSales.Series.Count());
+
+            var posTopItems = await client.GetAppTopItems(posApp.Id);
+            Assert.Empty(posTopItems);
+
+            var crowdfundItems = await client.GetAppTopItems(crowdfundApp.Id);
+            Assert.Empty(crowdfundItems);
+
+            // with sales - fiddle invoices via the UI controller
+            var uiPosController = tester.PayTester.GetController<UIPointOfSaleController>();
+            
+            var action = Assert.IsType<RedirectToActionResult>(uiPosController.ViewPointOfSale(posApp.Id, PosViewType.Static, 1, choiceKey: item1.Id).GetAwaiter().GetResult());
+            Assert.Equal(nameof(UIInvoiceController.Checkout), action.ActionName);
+            Assert.True(action.RouteValues!.TryGetValue("invoiceId", out var i1Id));
+            
+            var cart = new JObject {
+                ["cart"] = new JArray
+                {
+                    new JObject { ["id"] = item2.Id, ["count"] = 4 },
+                    new JObject { ["id"] = item3.Id, ["count"] = 2 }
+                },
+                ["subTotal"] = 14,
+                ["total"] = 14,
+                ["amounts"] = new JArray()
+            }.ToString();
+            action = Assert.IsType<RedirectToActionResult>(uiPosController.ViewPointOfSale(posApp.Id, PosViewType.Cart, 7, posData: cart).GetAwaiter().GetResult());
+            Assert.Equal(nameof(UIInvoiceController.Checkout), action.ActionName);
+            Assert.True(action.RouteValues!.TryGetValue("invoiceId", out var i2Id));
+            
+            await user.PayInvoice(i1Id!.ToString());
+            await user.PayInvoice(i2Id!.ToString());
+            
+            posSales = await client.GetAppSales(posApp.Id);
+            Assert.Equal(7, posSales.SalesCount);
+            Assert.Equal(7, posSales.Series.Count());
+            Assert.Equal(0, posSales.Series.First().SalesCount);
+            Assert.Equal(7, posSales.Series.Last().SalesCount);
+
+            posTopItems = await client.GetAppTopItems(posApp.Id);
+            Assert.Equal(3, posTopItems.Count);
+            Assert.Equal(item2.Id, posTopItems[0].ItemCode);
+            Assert.Equal(4, posTopItems[0].SalesCount);
+            
+            Assert.Equal(item3.Id, posTopItems[1].ItemCode);
+            Assert.Equal(2, posTopItems[1].SalesCount);
+
+            Assert.Equal(item1.Id, posTopItems[2].ItemCode);
+            Assert.Equal(1, posTopItems[2].SalesCount);
+            
+            // with count and offset
+            posTopItems = await client.GetAppTopItems(posApp.Id,1, 5);
+            Assert.Equal(2, posTopItems.Count);
+            Assert.Equal(item3.Id, posTopItems[0].ItemCode);
+            Assert.Equal(2, posTopItems[0].SalesCount);
+            
+            Assert.Equal(item1.Id, posTopItems[1].ItemCode);
+            Assert.Equal(1, posTopItems[1].SalesCount);
+        }
+
         [Fact(Timeout = TestTimeout)]
         [Trait("Integration", "Integration")]
         public async Task CanDeleteUsersViaApi()
@@ -1010,7 +1151,7 @@ namespace BTCPayServer.Tests
                 Description = "Test description",
                 Amount = 12.3m,
                 Currency = "BTC",
-                PaymentMethods = new[] { "BTC" }
+                PayoutMethods = new[] { "BTC" }
             });
 
             void VerifyResult()
@@ -1041,7 +1182,7 @@ namespace BTCPayServer.Tests
                 Name = "Test 2",
                 Amount = 12.3m,
                 Currency = "BTC",
-                PaymentMethods = new[] { "BTC" },
+                PayoutMethods = new[] { "BTC" },
                 BOLT11Expiration = TimeSpan.FromDays(31.0)
             });
             Assert.Equal(TimeSpan.FromDays(31.0), test2.BOLT11Expiration);
@@ -1071,30 +1212,30 @@ namespace BTCPayServer.Tests
             {
                 Destination = destination,
                 Amount = 1_000_000m,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
             }));
 
             await this.AssertAPIError("archived", async () => await unauthenticated.CreatePayout(pps[1].Id, new CreatePayoutRequest()
             {
                 Destination = destination,
-                PaymentMethod = "BTC"
+                PayoutMethodId = "BTC"
             }));
 
             var payout = await unauthenticated.CreatePayout(pps[0].Id, new CreatePayoutRequest()
             {
                 Destination = destination,
-                PaymentMethod = "BTC"
+                PayoutMethodId = "BTC"
             });
 
             payouts = await unauthenticated.GetPayouts(pps[0].Id);
             var payout2 = Assert.Single(payouts);
-            Assert.Equal(payout.Amount, payout2.Amount);
+            Assert.Equal(payout.OriginalAmount, payout2.OriginalAmount);
             Assert.Equal(payout.Id, payout2.Id);
             Assert.Equal(destination, payout2.Destination);
             Assert.Equal(PayoutState.AwaitingApproval, payout.State);
-            Assert.Equal("BTC-CHAIN", payout2.PaymentMethod);
-            Assert.Equal("BTC", payout2.CryptoCode);
-            Assert.Null(payout.PaymentMethodAmount);
+            Assert.Equal("BTC-CHAIN", payout2.PayoutMethodId);
+            Assert.Equal("BTC", payout2.PayoutCurrency);
+            Assert.Null(payout.PayoutAmount);
 
             TestLogs.LogInformation("Can't overdraft");
 
@@ -1103,14 +1244,14 @@ namespace BTCPayServer.Tests
             {
                 Destination = destination2,
                 Amount = 0.00001m,
-                PaymentMethod = "BTC"
+                PayoutMethodId = "BTC"
             }));
 
             TestLogs.LogInformation("Can't create too low payout");
             await this.AssertAPIError("amount-too-low", async () => await unauthenticated.CreatePayout(pps[0].Id, new CreatePayoutRequest()
             {
                 Destination = destination2,
-                PaymentMethod = "BTC"
+                PayoutMethodId = "BTC"
             }));
 
             TestLogs.LogInformation("Can archive payout");
@@ -1126,7 +1267,7 @@ namespace BTCPayServer.Tests
             payout = await unauthenticated.CreatePayout(pps[0].Id, new CreatePayoutRequest()
             {
                 Destination = destination,
-                PaymentMethod = "BTC"
+                PayoutMethodId = "BTC"
             });
 
             var start = RoundSeconds(DateTimeOffset.Now + TimeSpan.FromDays(7.0));
@@ -1136,7 +1277,7 @@ namespace BTCPayServer.Tests
                 Amount = 12.3m,
                 StartsAt = start,
                 Currency = "BTC",
-                PaymentMethods = new[] { "BTC" }
+                PayoutMethods = new[] { "BTC" }
             });
             Assert.Equal(start, inFuture.StartsAt);
             Assert.Null(inFuture.ExpiresAt);
@@ -1144,7 +1285,7 @@ namespace BTCPayServer.Tests
             {
                 Amount = 1.0m,
                 Destination = destination,
-                PaymentMethod = "BTC"
+                PayoutMethodId = "BTC"
             }));
 
             var expires = RoundSeconds(DateTimeOffset.Now - TimeSpan.FromDays(7.0));
@@ -1154,13 +1295,13 @@ namespace BTCPayServer.Tests
                 Amount = 12.3m,
                 ExpiresAt = expires,
                 Currency = "BTC",
-                PaymentMethods = new[] { "BTC" }
+                PayoutMethods = new[] { "BTC" }
             });
             await this.AssertAPIError("expired", async () => await unauthenticated.CreatePayout(inPast.Id, new CreatePayoutRequest()
             {
                 Amount = 1.0m,
                 Destination = destination,
-                PaymentMethod = "BTC"
+                PayoutMethodId = "BTC"
             }));
 
             await this.AssertValidationError(new[] { "ExpiresAt" }, async () => await client.CreatePullPayment(storeId, new Client.Models.CreatePullPaymentRequest()
@@ -1178,7 +1319,7 @@ namespace BTCPayServer.Tests
                 Name = "Test USD",
                 Amount = 5000m,
                 Currency = "USD",
-                PaymentMethods = new[] { "BTC" }
+                PayoutMethods = new[] { "BTC" }
             });
 
             await this.AssertAPIError("lnurl-not-supported", async () => await unauthenticated.GetPullPaymentLNURL(pp.Id));
@@ -1188,7 +1329,7 @@ namespace BTCPayServer.Tests
             payout = await unauthenticated.CreatePayout(pp.Id, new CreatePayoutRequest()
             {
                 Destination = destination,
-                PaymentMethod = "BTC"
+                PayoutMethodId = "BTC"
             });
             await this.AssertAPIError("old-revision", async () => await client.ApprovePayout(storeId, payout.Id, new ApprovePayoutRequest()
             {
@@ -1203,8 +1344,8 @@ namespace BTCPayServer.Tests
                 Revision = payout.Revision
             });
             Assert.Equal(PayoutState.AwaitingPayment, payout.State);
-            Assert.NotNull(payout.PaymentMethodAmount);
-            Assert.Equal(1.0m, payout.PaymentMethodAmount); // 1 BTC == 5000 USD in tests
+            Assert.NotNull(payout.PayoutAmount);
+            Assert.Equal(1.0m, payout.PayoutAmount); // 1 BTC == 5000 USD in tests
             await this.AssertAPIError("invalid-state", async () => await client.ApprovePayout(storeId, payout.Id, new ApprovePayoutRequest()
             {
                 Revision = payout.Revision
@@ -1216,18 +1357,18 @@ namespace BTCPayServer.Tests
                 Name = "Test 2",
                 Amount = 12.303228134m,
                 Currency = "BTC",
-                PaymentMethods = new[] { "BTC" }
+                PayoutMethods = new[] { "BTC" }
             });
             destination = (await tester.ExplorerNode.GetNewAddressAsync()).ToString();
             payout = await unauthenticated.CreatePayout(test3.Id, new CreatePayoutRequest()
             {
                 Destination = destination,
-                PaymentMethod = "BTC"
+                PayoutMethodId = "BTC"
             });
             payout = await client.ApprovePayout(storeId, payout.Id, new ApprovePayoutRequest());
             // The payout should round the value of the payment down to the network of the payment method
-            Assert.Equal(12.30322814m, payout.PaymentMethodAmount);
-            Assert.Equal(12.303228134m, payout.Amount);
+            Assert.Equal(12.30322814m, payout.PayoutAmount);
+            Assert.Equal(12.303228134m, payout.OriginalAmount);
 
             await client.MarkPayoutPaid(storeId, payout.Id);
             payout = (await client.GetPayouts(payout.PullPaymentId)).First(data => data.Id == payout.Id);
@@ -1240,7 +1381,7 @@ namespace BTCPayServer.Tests
                 Name = "Test 3",
                 Amount = 12.303228134m,
                 Currency = "BTC",
-                PaymentMethods = new[] { "BTC", "BTC-LightningNetwork", "BTC_LightningLike" }
+                PayoutMethods = new[] { "BTC", "BTC-LightningNetwork", "BTC_LightningLike" }
             });
             var lnrURLs = await unauthenticated.GetPullPaymentLNURL(test4.Id);
             Assert.IsType<string>(lnrURLs.LNURLBech32);
@@ -1315,7 +1456,7 @@ namespace BTCPayServer.Tests
                 Name = "Test SATS",
                 Amount = 21000,
                 Currency = "SATS",
-                PaymentMethods = new[] { "BTC", "BTC-LightningNetwork", "BTC_LightningLike" }
+                PayoutMethods = new[] { "BTC", "BTC-LightningNetwork", "BTC_LightningLike" }
             });
             lnrURLs = await unauthenticated.GetPullPaymentLNURL(testSats.Id);
             Assert.IsType<string>(lnrURLs.LNURLBech32);
@@ -1333,7 +1474,7 @@ namespace BTCPayServer.Tests
                     Amount = 100,
                     Currency = "USD",
                     Name = "pull payment",
-                    PaymentMethods = new[] { "BTC" },
+                    PayoutMethods = new[] { "BTC" },
                     AutoApproveClaims = true
                 });
             });
@@ -1342,7 +1483,7 @@ namespace BTCPayServer.Tests
                 await nonApproved.CreatePayout(acc.StoreId, new CreatePayoutThroughStoreRequest()
                 {
                     Amount = 100,
-                    PaymentMethod = "BTC",
+                    PayoutMethodId = "BTC",
                     Approved = true,
                     Destination = new Key().GetAddress(ScriptPubKeyType.TaprootBIP86, Network.RegTest).ToString()
                 });
@@ -1353,14 +1494,14 @@ namespace BTCPayServer.Tests
                 Amount = 100,
                 Currency = "USD",
                 Name = "pull payment",
-                PaymentMethods = new[] { "BTC" },
+                PayoutMethods = new[] { "BTC" },
                 AutoApproveClaims = true
             });
 
             await approved.CreatePayout(acc.StoreId, new CreatePayoutThroughStoreRequest()
             {
                 Amount = 100,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Approved = true,
                 Destination = new Key().GetAddress(ScriptPubKeyType.TaprootBIP86, Network.RegTest).ToString()
             });
@@ -1381,7 +1522,7 @@ namespace BTCPayServer.Tests
             var payout = await client.CreatePayout(storeId, new CreatePayoutThroughStoreRequest()
             {
                 Approved = false,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Amount = 0.0001m,
                 Destination = address.ToString(),
 
@@ -1408,7 +1549,7 @@ namespace BTCPayServer.Tests
             payout = await client.CreatePayout(storeId, new CreatePayoutThroughStoreRequest()
             {
                 Approved = true,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Amount = 0.0001m,
                 Destination = address.ToString()
             });
@@ -1529,13 +1670,14 @@ namespace BTCPayServer.Tests
                 CssUrl = "https://example.org/style.css",
                 LogoUrl = "https://example.org/logo.svg",
                 BrandColor = "#003366",
+                ApplyBrandColorToBackend = true,
                 PaymentMethodCriteria = new List<PaymentMethodCriteriaData>
             {
                 new()
                 {
                     Amount = 10,
                     Above = true,
-                    PaymentMethod = "BTC",
+                    PaymentMethodId = "BTC",
                     CurrencyCode = "USD"
                 }
              }
@@ -1544,13 +1686,14 @@ namespace BTCPayServer.Tests
             Assert.Equal("https://example.org/style.css", updatedStore.CssUrl);
             Assert.Equal("https://example.org/logo.svg", updatedStore.LogoUrl);
             Assert.Equal("#003366", updatedStore.BrandColor);
+            Assert.True(updatedStore.ApplyBrandColorToBackend);
             var s = (await client.GetStore(newStore.Id));
             Assert.Equal("B", s.Name);
             var pmc = Assert.Single(s.PaymentMethodCriteria);
             //check that pmc equals the one we set
             Assert.Equal(10, pmc.Amount);
             Assert.True(pmc.Above);
-            Assert.Equal("BTC-CHAIN", pmc.PaymentMethod);
+            Assert.Equal("BTC-CHAIN", pmc.PaymentMethodId);
             Assert.Equal("USD", pmc.CurrencyCode);
             updatedStore = await client.UpdateStore(newStore.Id, new UpdateStoreRequest() { Name = "B" });
             Assert.Empty(newStore.PaymentMethodCriteria);
@@ -1711,7 +1854,7 @@ namespace BTCPayServer.Tests
             var user = tester.NewAccount();
             user.GrantAccess();
             user.RegisterDerivationScheme("BTC");
-            var clientProfile = await user.CreateClient(Policies.CanModifyStoreWebhooks, Policies.CanCreateInvoice);
+            var clientProfile = await user.CreateClient(Policies.CanModifyWebhooks, Policies.CanCreateInvoice);
             var hook = await clientProfile.CreateWebhook(user.StoreId, new CreateStoreWebhookRequest()
             {
                 Url = fakeServer.ServerUri.AbsoluteUri,
@@ -1836,7 +1979,7 @@ namespace BTCPayServer.Tests
             Assert.Contains("BTC-CHAIN", serverInfoData.SupportedPaymentMethods);
             Assert.Contains("BTC-LN", serverInfoData.SupportedPaymentMethods);
             Assert.NotNull(serverInfoData.SyncStatus);
-            Assert.Single(serverInfoData.SyncStatus.Select(s => s.CryptoCode == "BTC"));
+            Assert.Single(serverInfoData.SyncStatus.Select(s => s.PaymentMethodId == "BTC-CHAIN"));
         }
 
         [Fact(Timeout = TestTimeout)]
@@ -2138,7 +2281,7 @@ namespace BTCPayServer.Tests
             {
                 await client.RefundInvoice(user.StoreId, "lol fake invoice id", new RefundInvoiceRequest()
                 {
-                    PaymentMethod = method.PaymentMethodId,
+                    PayoutMethodId = method.PaymentMethodId,
                     RefundVariant = RefundVariant.RateThen
                 });
             });
@@ -2146,7 +2289,7 @@ namespace BTCPayServer.Tests
             // test validation error for when invoice is not yet in the state in which it can be refunded
             var apiError = await AssertAPIError("non-refundable", () => client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest()
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.RateThen
             }));
             Assert.Equal("Cannot refund this invoice", apiError.Message);
@@ -2164,20 +2307,20 @@ namespace BTCPayServer.Tests
             });
 
             // test validation for the payment method
-            var validationError = await AssertValidationError(new[] { "PaymentMethod" }, async () =>
+            var validationError = await AssertValidationError(new[] { "PayoutMethodId" }, async () =>
             {
                 await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest()
                 {
-                    PaymentMethod = "fake payment method",
+                    PayoutMethodId = "fake payment method",
                     RefundVariant = RefundVariant.RateThen
                 });
             });
-            Assert.Contains("PaymentMethod: Please select one of the payment methods which were available for the original invoice", validationError.Message);
+            Assert.Contains("PayoutMethodId: Please select one of the payment methods which were available for the original invoice", validationError.Message);
 
             // test RefundVariant.RateThen
             var pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest()
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.RateThen
             });
             Assert.Equal("BTC", pp.Currency);
@@ -2188,7 +2331,7 @@ namespace BTCPayServer.Tests
             // test RefundVariant.CurrentRate
             pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest()
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.CurrentRate
             });
             Assert.Equal("BTC", pp.Currency);
@@ -2198,7 +2341,7 @@ namespace BTCPayServer.Tests
             // test RefundVariant.Fiat
             pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest()
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.Fiat,
                 Name = "my test name"
             });
@@ -2212,7 +2355,7 @@ namespace BTCPayServer.Tests
             {
                 await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest()
                 {
-                    PaymentMethod = method.PaymentMethodId,
+                    PayoutMethodId = method.PaymentMethodId,
                     RefundVariant = RefundVariant.Custom,
                 });
             });
@@ -2221,7 +2364,7 @@ namespace BTCPayServer.Tests
 
             pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest()
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.Custom,
                 CustomAmount = 69420,
                 CustomCurrency = "JPY"
@@ -2233,7 +2376,7 @@ namespace BTCPayServer.Tests
             // should auto-approve if currencies match
             pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest()
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.Custom,
                 CustomAmount = 0.00069420m,
                 CustomCurrency = "BTC"
@@ -2245,7 +2388,7 @@ namespace BTCPayServer.Tests
             {
                 await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
                 {
-                    PaymentMethod = method.PaymentMethodId,
+                    PayoutMethodId = method.PaymentMethodId,
                     RefundVariant = RefundVariant.RateThen,
                     SubtractPercentage = 101
                 });
@@ -2255,7 +2398,7 @@ namespace BTCPayServer.Tests
             // should auto-approve
             pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.RateThen,
                 SubtractPercentage = 6.15m
             });
@@ -2268,7 +2411,7 @@ namespace BTCPayServer.Tests
             {
                 await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
                 {
-                    PaymentMethod = method.PaymentMethodId,
+                    PayoutMethodId = method.PaymentMethodId,
                     RefundVariant = RefundVariant.OverpaidAmount
                 });
             });
@@ -2278,6 +2421,14 @@ namespace BTCPayServer.Tests
             invoice = await client.CreateInvoice(user.StoreId, new CreateInvoiceRequest { Amount = 5000.0m, Currency = "USD" });
             methods = await client.GetInvoicePaymentMethods(user.StoreId, invoice.Id);
             method = methods.First();
+            Assert.Equal(JTokenType.Null, method.AdditionalData["accountDerivation"].Type);
+            Assert.NotNull(method.AdditionalData["keyPath"]);
+
+            methods = await client.GetInvoicePaymentMethods(user.StoreId, invoice.Id, includeSensitive: true);
+            method = methods.First();
+            Assert.Equal(JTokenType.String, method.AdditionalData["accountDerivation"].Type);
+            var clientViewOnly = await user.CreateClient(Policies.CanViewInvoices);
+            await AssertApiError(403, "missing-permission", () => clientViewOnly.GetInvoicePaymentMethods(user.StoreId, invoice.Id, includeSensitive: true));
 
             await tester.WaitForEvent<NewOnChainTransactionEvent>(async () =>
             {
@@ -2298,7 +2449,7 @@ namespace BTCPayServer.Tests
 
             pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.OverpaidAmount
             });
             Assert.Equal("BTC", pp.Currency);
@@ -2308,7 +2459,7 @@ namespace BTCPayServer.Tests
             // once more with subtract percentage
             pp = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.OverpaidAmount,
                 SubtractPercentage = 21m
             });
@@ -2321,7 +2472,7 @@ namespace BTCPayServer.Tests
             await client.MarkInvoiceStatus(user.StoreId, invoice.Id, new MarkInvoiceStatusRequest { Status = InvoiceStatus.Settled });
             var refund = await client.RefundInvoice(user.StoreId, invoice.Id, new RefundInvoiceRequest
             {
-                PaymentMethod = method.PaymentMethodId,
+                PayoutMethodId = method.PaymentMethodId,
                 RefundVariant = RefundVariant.CurrentRate
             });
             Assert.Equal(1.0m, refund.Amount);
@@ -2582,7 +2733,7 @@ namespace BTCPayServer.Tests
 
             Assert.EndsWith($"/i/{newInvoice.Id}", newInvoice.CheckoutLink);
             var controller = tester.PayTester.GetController<UIInvoiceController>(user.UserId, user.StoreId);
-            var model = (PaymentModel)((ViewResult)await controller.Checkout(newInvoice.Id)).Model;
+            var model = (CheckoutModel)((ViewResult)await controller.Checkout(newInvoice.Id)).Model;
             Assert.Equal("it-IT", model.DefaultLang);
             Assert.Equal("http://toto.com/lol", model.MerchantRefLink);
 
@@ -2616,6 +2767,14 @@ namespace BTCPayServer.Tests
             invoiceObject = await client.GetOnChainWalletObject(user.StoreId, "BTC", new OnChainWalletObjectId("invoice", invoice.Id), false);
             Assert.DoesNotContain(invoiceObject.Links.Select(l => l.Type), t => t == "address");
 
+            // Check if we can get the monitored invoice
+            var invoiceRepo = tester.PayTester.GetService<InvoiceRepository>();
+            var includeNonActivated = true;
+            Assert.Single(await invoiceRepo.GetMonitoredInvoices(PaymentMethodId.Parse("BTC-CHAIN"), includeNonActivated), i => i.Id == invoice.Id);
+            includeNonActivated = false;
+            Assert.DoesNotContain(await invoiceRepo.GetMonitoredInvoices(PaymentMethodId.Parse("BTC-CHAIN"), includeNonActivated), i => i.Id == invoice.Id);
+            Assert.DoesNotContain(await invoiceRepo.GetMonitoredInvoices(PaymentMethodId.Parse("BTC-CHAIN")), i => i.Id == invoice.Id);
+            //
 
             paymentMethods = await client.GetInvoicePaymentMethods(store.Id, invoice.Id);
             Assert.Single(paymentMethods);
@@ -3105,6 +3264,8 @@ namespace BTCPayServer.Tests
             });
 
             Assert.Equal(firstAddress, (await viewOnlyClient.PreviewProposedStoreOnChainPaymentMethodAddresses(store.Id, "BTC", xpub)).Addresses.First().Address);
+            // Testing if the rewrite rule to old API path is working
+            await viewOnlyClient.SendHttpRequest($"api/v1/stores/{store.Id}/payment-methods/onchain/BTC/preview", new JObject() { ["config"] = xpub.ToString() }, HttpMethod.Post);
 
             var method = await client.UpdateStorePaymentMethod(store.Id, "BTC-CHAIN", new UpdatePaymentMethodRequest() { Enabled = true, Config = JValue.CreateString(xpub.ToString())});
 
@@ -3158,8 +3319,8 @@ namespace BTCPayServer.Tests
 
             await client.RemoveStorePaymentMethod(store.Id, "BTC-CHAIN");
             generateResponse = await client.GenerateOnChainWallet(store.Id, "BTC",
-                new GenerateOnChainWalletRequest() { ExistingMnemonic = allMnemonic, AccountNumber = 1 });
-
+                new GenerateOnChainWalletRequest() { ExistingMnemonic = allMnemonic, AccountNumber = 1, Label = "test" });
+            Assert.Equal("test", generateResponse.Config.Label);
             Assert.Equal(generateResponse.Mnemonic.ToString(), allMnemonic.ToString());
 
             Assert.Equal(new Mnemonic("all all all all all all all all all all all all").DeriveExtKey()
@@ -3384,6 +3545,12 @@ namespace BTCPayServer.Tests
             {
                 await viewOnlyClient.GetOnChainWalletReceiveAddress(walletId.StoreId, walletId.CryptoCode);
             });
+
+            // Testing if the rewrite rule to old API path is working
+            await AssertHttpError(403, async () =>
+            {
+                await viewOnlyClient.SendHttpRequest($"api/v1/stores/{walletId.StoreId}/payment-methods/onchain/{walletId.CryptoCode}/wallet/address", null as object);
+            });
             var address = await client.GetOnChainWalletReceiveAddress(walletId.StoreId, walletId.CryptoCode);
             var address2 = await client.GetOnChainWalletReceiveAddress(walletId.StoreId, walletId.CryptoCode);
             var address3 = await client.GetOnChainWalletReceiveAddress(walletId.StoreId, walletId.CryptoCode, true);
@@ -3609,7 +3776,7 @@ namespace BTCPayServer.Tests
             {
 
                 await tester.ExplorerNode.GenerateAsync(1);
-            }, bevent => bevent.CryptoCode.Equals("BTC", StringComparison.Ordinal));
+            }, bevent => bevent.PaymentMethodId == PaymentTypes.CHAIN.GetPaymentMethodId("BTC"));
 
             Assert.Contains(
                 await client.ShowOnChainWalletTransactions(walletId.StoreId, walletId.CryptoCode,
@@ -4010,7 +4177,12 @@ namespace BTCPayServer.Tests
             var resp = await tester.CustomerLightningD.Pay(inv.BOLT11);
             Assert.Equal(PayResult.Ok, resp.Result);
 
-
+            var store = tester.PayTester.GetService<StoreRepository>();
+            Assert.True(await store.InternalNodePayoutAuthorized(admin.StoreId));
+            Assert.False(await store.InternalNodePayoutAuthorized("blah"));
+            await admin.MakeAdmin(false);
+            Assert.False(await store.InternalNodePayoutAuthorized(admin.StoreId));
+            await admin.MakeAdmin(true);
 
             var customerInvoice = await tester.CustomerLightningD.CreateInvoice(LightMoney.FromUnit(10, LightMoneyUnit.Satoshi),
                 Guid.NewGuid().ToString(), TimeSpan.FromDays(40));
@@ -4018,7 +4190,7 @@ namespace BTCPayServer.Tests
                 new CreatePayoutThroughStoreRequest()
                 {
                     Approved = true,
-                    PaymentMethod = "BTC_LightningNetwork",
+                    PayoutMethodId = "BTC_LightningNetwork",
                     Destination = customerInvoice.BOLT11
                 });
             Assert.Equal(payout.Metadata.ToString(), new JObject().ToString()); //empty
@@ -4037,7 +4209,7 @@ namespace BTCPayServer.Tests
                 new CreatePayoutThroughStoreRequest()
                 {
                     Approved = true,
-                    PaymentMethod = "BTC",
+                    PayoutMethodId = "BTC",
                     Destination = (await tester.ExplorerNode.GetNewAddressAsync()).ToString(),
                     Amount = 0.0001m,
                     Metadata = JObject.FromObject(new
@@ -4068,10 +4240,10 @@ namespace BTCPayServer.Tests
                 {
                     Approved = true,
                     Amount = new Money(100, MoneyUnit.Satoshi).ToDecimal(MoneyUnit.BTC),
-                    PaymentMethod = "BTC_LightningNetwork",
+                    PayoutMethodId = "BTC_LightningNetwork",
                     Destination = customerInvoice.BOLT11
                 });
-            Assert.Equal(payout2.Amount, new Money(100, MoneyUnit.Satoshi).ToDecimal(MoneyUnit.BTC));
+            Assert.Equal(payout2.OriginalAmount, new Money(100, MoneyUnit.Satoshi).ToDecimal(MoneyUnit.BTC));
         }
 
         [Fact(Timeout = 60 * 2 * 1000)]
@@ -4098,7 +4270,7 @@ namespace BTCPayServer.Tests
             {
                 Amount = 0.0001m,
                 Approved = true,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
             });
 
@@ -4106,7 +4278,7 @@ namespace BTCPayServer.Tests
             {
                 Amount = 0.00001m,
                 Approved = false,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
             });
 
@@ -4115,7 +4287,7 @@ namespace BTCPayServer.Tests
                 Amount = 100,
                 Currency = "USD",
                 Name = "pull payment",
-                PaymentMethods = new[] { "BTC" }
+                PayoutMethods = new[] { "BTC" }
             });
 
             var notapprovedPayoutWithPullPayment = await adminClient.CreatePayout(admin.StoreId, new CreatePayoutThroughStoreRequest()
@@ -4123,7 +4295,7 @@ namespace BTCPayServer.Tests
                 PullPaymentId = pullPayment.Id,
                 Amount = 10,
                 Approved = false,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
             });
             await adminClient.ApprovePayout(admin.StoreId, notapprovedPayoutWithPullPayment.Id,
@@ -4141,7 +4313,7 @@ namespace BTCPayServer.Tests
 
             Assert.Equal(3, payouts.Length);
             Assert.Empty(payouts.Where(data => data.State == PayoutState.AwaitingApproval));
-            Assert.Empty(payouts.Where(data => data.PaymentMethodAmount is null));
+            Assert.Empty(payouts.Where(data => data.PayoutAmount is null));
 
             Assert.Empty(await adminClient.ShowOnChainWalletTransactions(admin.StoreId, "BTC"));
 
@@ -4154,12 +4326,12 @@ namespace BTCPayServer.Tests
             Assert.Equal(3600, Assert.Single(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC")).IntervalSeconds.TotalSeconds);
 
             var tpGen = Assert.Single(await adminClient.GetPayoutProcessors(admin.StoreId));
-            Assert.Equal("BTC-CHAIN", Assert.Single(tpGen.PaymentMethods));
+            Assert.Equal("BTC-CHAIN", Assert.Single(tpGen.PayoutMethods));
             //still too poor to process any payouts
             Assert.Empty(await adminClient.ShowOnChainWalletTransactions(admin.StoreId, "BTC"));
 
 
-            await adminClient.RemovePayoutProcessor(admin.StoreId, tpGen.Name, tpGen.PaymentMethods.First());
+            await adminClient.RemovePayoutProcessor(admin.StoreId, tpGen.Name, tpGen.PayoutMethods.First());
 
             Assert.Empty(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC"));
             Assert.Empty(await adminClient.GetPayoutProcessors(admin.StoreId));
@@ -4254,7 +4426,7 @@ namespace BTCPayServer.Tests
                 PullPaymentId = pullPayment.Id,
                 Amount = 0.5m,
                 Approved = true,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
             });
             TestLogs.LogInformation("Waiting before hook...");
@@ -4300,7 +4472,7 @@ namespace BTCPayServer.Tests
             {
                 Amount = 0.1m,
                 Approved = true,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
             });
 
@@ -4316,7 +4488,7 @@ namespace BTCPayServer.Tests
             {
                 Amount = 0.3m,
                 Approved = true,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
             });
 
@@ -4333,7 +4505,7 @@ namespace BTCPayServer.Tests
             {
                 Amount = 0.3m,
                 Approved = true,
-                PaymentMethod = "BTC",
+                PayoutMethodId = "BTC",
                 Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
             });
 

BTCPayServer.Tests/LanguageServiceTests.cs

@@ -50,10 +50,8 @@ namespace BTCPayServer.Tests
             tester.Driver.FindElement(By.Name("Name")).SendKeys("English (Custom)");
             tester.ClickPagePrimary();
             var translations = tester.Driver.FindElement(By.Name("Translations"));
-            var text = translations.Text;
-            text = text.Replace("Password => Password", "Password => Mot de passe");
             translations.Clear();
-            translations.SendKeys("Password => Mot de passe");
+            translations.SendKeys("{ \"Password\": \"Mot de passe\" }");
             tester.ClickPagePrimary();
 
             // Check English (Custom) can be selected
@@ -64,7 +62,7 @@ namespace BTCPayServer.Tests
             // Check if we can remove English (Custom)
             tester.LogIn();
             tester.GoToServer(Views.Server.ServerNavPages.Translations);
-            text = tester.Driver.PageSource;
+            var text = tester.Driver.PageSource;
             Assert.Contains("Select-Cypherpunk", text);
             Assert.DoesNotContain("Select-English (Custom)", text);
             // Cypherpunk is loaded from file, can't edit

BTCPayServer.Tests/OutputPathAttribute.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace BTCPayServer.Tests
+{
+    public class OutputPathAttribute : Attribute
+    {
+        public OutputPathAttribute(string builtPath)
+        {
+            BuiltPath = builtPath;
+        }
+        public string BuiltPath { get; }
+    }
+}

BTCPayServer.Tests/POSTests.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 using BTCPayServer.Client;
 using BTCPayServer.Controllers;
@@ -90,6 +91,54 @@ fruit tea:
         Assert.Null( parsedDefault[4].AdditionalData);
         Assert.Null( parsedDefault[4].PaymentMethods);
         }
+
+        [Fact]
+        [Trait("Fast", "Fast")]
+        public void CanParseAppTemplate()
+        {
+            var template = @"[
+              {
+                ""description"": ""Lovely, fresh and tender, Meng Ding Gan Lu ('sweet dew') is grown in the lush Meng Ding Mountains of the southwestern province of Sichuan where it has been cultivated for over a thousand years."",
+                ""id"": ""green-tea"",
+                ""image"": ""~/img/pos-sample/green-tea.jpg"",
+                ""priceType"": ""Fixed"",
+                ""price"": ""1"",
+                ""title"": ""Green Tea"",
+                ""disabled"": false
+              },
+              {
+                ""description"": ""Tian Jian Tian Jian means 'heavenly tippy tea' in Chinese, and it describes the finest grade of dark tea. Our Tian Jian dark tea is from Hunan province which is famous for making some of the best dark teas available."",
+                ""id"": ""black-tea"",
+                ""image"": ""~/img/pos-sample/black-tea.jpg"",
+                ""priceType"": ""Fixed"",
+                ""price"": ""1"",
+                ""title"": ""Black Tea"",
+                ""disabled"": false
+              }
+            ]";
+
+            var items = AppService.Parse(template);
+            Assert.Equal(2, items.Length);
+            Assert.Equal("green-tea", items[0].Id);
+            Assert.Equal("black-tea", items[1].Id);
+
+            // Fails gracefully for missing ID
+            var missingId = template.Replace(@"""id"": ""green-tea"",", "");
+            items = AppService.Parse(missingId);
+            Assert.Single(items);
+            Assert.Equal("black-tea", items[0].Id);
+            
+            // Throws for missing ID
+            Assert.Throws<ArgumentException>(() => AppService.Parse(missingId, true, true));
+
+            // Fails gracefully for duplicate IDs
+            var duplicateId = template.Replace(@"""id"": ""green-tea"",", @"""id"": ""black-tea"",");
+            items = AppService.Parse(duplicateId);
+            Assert.Empty(items);
+            
+            // Throws for duplicate IDs
+            Assert.Throws<ArgumentException>(() => AppService.Parse(duplicateId, true, true));
+        }
         
         [Fact(Timeout = LongRunningTestTimeout)]
         [Trait("Integration", "Integration")]

BTCPayServer.Tests/PSBTTests.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -121,13 +122,6 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("SignTransaction")).Click();
         }
 
-        private static string ExtractPSBT(SeleniumTester s)
-        {
-            var pageSource = s.Driver.PageSource;
-            var start = pageSource.IndexOf("id=\"psbt-base64\">");
-            start += "id=\"psbt-base64\">".Length;
-            var end = pageSource.IndexOf("<", start);
-            return pageSource[start..end];
-        }
+        private string ExtractPSBT(SeleniumTester s) => s.Driver.FindElement(By.Id("psbt-base64")).GetAttribute("innerText");
     }
 }