Do not enable receipts for payment requests

Payment requests have a receipt-ish style by default. Receipts for each individual invoice of a payment request can be quite confusing as individually they do not prove the pay request was settled.

.circleci/config.yml

@@ -41,9 +41,10 @@ jobs:
       - run:
           command: |
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
+            GIT_COMMIT=$(git rev-parse HEAD)
             #
-            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-amd64 -f amd64.Dockerfile .
-            sudo docker build --pull --build-arg CONFIGURATION_NAME=Altcoins-Release -t $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64 -f amd64.Dockerfile .
+            sudo docker build --build-arg GIT_COMMIT=${GIT_COMMIT} --pull -t $DOCKERHUB_REPO:$LATEST_TAG-amd64 -f amd64.Dockerfile .
+            sudo docker build --build-arg GIT_COMMIT=${GIT_COMMIT} --pull --build-arg CONFIGURATION_NAME=Altcoins-Release -t $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64 -f amd64.Dockerfile .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-amd64
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64
@@ -57,9 +58,10 @@ jobs:
           command: |
             sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
+            GIT_COMMIT=$(git rev-parse HEAD)
             #
-            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f arm32v7.Dockerfile .
-            sudo docker build --pull --build-arg CONFIGURATION_NAME=Altcoins-Release -t $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7 -f arm32v7.Dockerfile .
+            sudo docker build --build-arg GIT_COMMIT=${GIT_COMMIT} --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f arm32v7.Dockerfile .
+            sudo docker build --build-arg GIT_COMMIT=${GIT_COMMIT} --pull --build-arg CONFIGURATION_NAME=Altcoins-Release -t $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7 -f arm32v7.Dockerfile .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm32v7
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7
@@ -73,9 +75,10 @@ jobs:
           command: |
             sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
+            GIT_COMMIT=$(git rev-parse HEAD)
             #
-            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 -f arm64v8.Dockerfile .
-            sudo docker build --build-arg CONFIGURATION_NAME=Altcoins-Release --pull -t $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8 -f arm64v8.Dockerfile .
+            sudo docker build --build-arg GIT_COMMIT=${GIT_COMMIT} --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 -f arm64v8.Dockerfile .
+            sudo docker build --build-arg GIT_COMMIT=${GIT_COMMIT} --build-arg CONFIGURATION_NAME=Altcoins-Release --pull -t $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8 -f arm64v8.Dockerfile .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm64v8
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8

.circleci/run-tests.sh

@@ -4,6 +4,15 @@ set -e
 cd ../BTCPayServer.Tests
 docker-compose -v
 docker-compose -f "docker-compose.altcoins.yml" down --v
-docker-compose -f "docker-compose.altcoins.yml" pull
+
+# For some reason, docker-compose pull fails time to time, so we try several times
+n=0
+until [ "$n" -ge 10 ]
+do
+   docker-compose -f "docker-compose.altcoins.yml" pull && break
+   n=$((n+1)) 
+   sleep 5
+done
+
 docker-compose -f "docker-compose.altcoins.yml" build
 docker-compose -f "docker-compose.altcoins.yml" run -e "TEST_FILTERS=$1" tests

.editorconfig

@@ -12,7 +12,7 @@ indent_style = space
 indent_size = 4
 charset = utf-8
 
-[launchSettings.json]
+[*.json]
 indent_size = 2
 
 # C# files

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,63 +0,0 @@
----
-name: "\U0001F41B Bug report"
-about: Report a bug or a technical issue
-
----
-
-<!--
-Thank you for reporting a technical issue.
-
-This issue tracker is only for bug reports and problems. 
-
-For general questions please read our documentation docs.btcpayserver.org. You can ask technical questions in discussions https://github.com/btcpayserver/btcpayserver/discussions and general support on our community chat chat.btcpayserver.org
-
-Please fill in as much of the template below as you're able. 
--->
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce the bug**
-Steps to reproduce the reported bug:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-
-<!--
-A clear and concise description of what you expected to happen.
--->
-
-**Screenshots**
-
-
-<!--
-If applicable, add screenshots to help explain your problem.
--->
-
-**Your BTCPay Environment (please complete the following information):**
-- BTCPay Server Version:    <!--[available in the right bottom corner of footer] -->
-- Deployment Method:        <!--[e.g. Docker, Manual, Third-Party-host]-->
-- Browser:                  <!--[e.g. Chrome, Safari]-->
-
-**Logs (if applicable)**
-
-
-<!--
-Basic logs can be found in Server Settings > Logs. 
-More logs https://docs.btcpayserver.org/Troubleshooting/#2-looking-through-the-logs
--->
-
-**Setup Parameters**
-
-<!--
-If you're reporting a deployment issue run `. btcpay-setup.sh -i` and paste the setup parameters here with your private information removed or obscured.
--->
-
-**Additional context**
-
-<!--
-Add any other context about the problem here.
--->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,68 @@
+name: 🐛 Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! Please provide as much information as you can. It helps us better understand the problem and fix it faster.
+  - type: textarea
+    id: version
+    attributes:
+      label: What is your BTCPay version?
+      description: You can see the version in the footer's bottom right corner
+      placeholder: I'm running BTCPay v1.X.X.X
+    validations:
+      required: true
+  - type: textarea
+    id: deployment
+    attributes:
+      label: How did you deploy BTCPay Server?
+      description: Docker, manual, third-party host? Read more on deployment methods [here](https://docs.btcpayserver.org/Deployment/)
+      placeholder: I'm running BTCPay Server on a...
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: A clear and concise description of what the bug is.
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: How did you encounter this bug?
+      description: Step by step describe how did you encounter the bug?
+      placeholder: 1. I clicked X 2. Then I clicked Y 3. See error
+    validations:
+      required: true
+  - type: textarea
+    id: logoutput
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. Logs can be found in Server Settings > Logs. Here's how you can [troubleshoot an issue](https://docs.btcpayserver.org/Troubleshooting/)
+      render: shell
+  - type: textarea
+    id: browser
+    attributes:
+      label: What browser do you use?
+      description: Provide your browser and it's version. If you replicated issues on multiple browsers, let us know which ones.
+      placeholder: For example Safari 15.00, Chrome 10.0, Tor, Edge, etc
+    validations:
+      required: false
+  - type: textarea
+    id: additonal
+    attributes:
+      label: Additional information
+      description: Feel free to provide additional information. Screenshots are always helpful.
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Are you sure this is a bug report?
+      description: By submitting this report, you agree that this is not a support or a feature request. For general questions please read our [documentation](https://docs.btcpayserver.org). You can ask questions in [discussions](https://github.com/btcpayserver/btcpayserver/discussions) and [on our community chat](https://chat.btcpayserver.org)
+      options:
+        - label: I confirm this is a bug report
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,11 @@
-blank_issues_enabled: false
-contact_links: 
-  - name: 🚀 Discussions  
+blank_issues_enabled: true
+contact_links:
+  - name: 🚀 Discussions
     url: https://github.com/btcpayserver/btcpayserver/discussions
-    about: Technical discussions, questions and feature requests    
+    about: Technical discussions, questions and feature requests
   - name: 📝 Official Documentation
     url: https://docs.btcpayserver.org
-    about: Check our documentation for answers to common questions 
-  - name: 💬 Community Support Chat  
+    about: Check our documentation for answers to common questions
+  - name: 💬 Community Support Chat
     url: https://chat.btcpayserver.org/
     about: Ask general questions and get community support in real-time

.gitignore

@@ -288,10 +288,6 @@ __pycache__/
 *.xsd.cs
 /BTCPayServer/Build/dockerfiles
 
-# Bundling JS/CSS
-BTCPayServer/wwwroot/bundles/*
-!BTCPayServer/wwwroot/bundles/.gitignore
-
 .vscode/*
 !.vscode/launch.json
 !.vscode/tasks.json
@@ -300,3 +296,5 @@ BTCPayServer/testpwd
 .DS_Store
 Packed Plugins
 Plugins/packed
+
+BTCPayServer/wwwroot/swagger/v1/openapi.json

BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj

@@ -32,10 +32,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="5.0.372" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.7" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BTCPayServer.Client\BTCPayServer.Client.csproj" />

BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs

@@ -25,7 +25,7 @@ namespace BTCPayServer.Abstractions.Contracts
         class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator
         {
 #pragma warning disable EF1001 // Internal EF Core API usage.
-            public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies, Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.INpgsqlOptions opts) : base(dependencies, opts)
+            public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies, Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.INpgsqlSingletonOptions opts) : base(dependencies, opts)
 #pragma warning restore EF1001 // Internal EF Core API usage.
             {
             }

BTCPayServer.Abstractions/Contracts/IScopeProvider.cs

@@ -0,0 +1,7 @@
+#nullable enable
+namespace BTCPayServer.Abstractions.Contracts;
+
+public interface IScopeProvider
+{
+    string? GetCurrentStoreId();
+}

BTCPayServer.Abstractions/Contracts/IStoreRepository.cs

@@ -0,0 +1,12 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Abstractions.Contracts;
+
+public interface IStoreRepository
+{
+    Task<T?> GetSettingAsync<T>(string storeId, string name) where T : class;
+    Task<Dictionary<string, T?>> GetSettingsAsync<T>(string name) where T : class;
+    Task UpdateSetting<T>(string storeId, string name, T obj) where T : class;
+}

BTCPayServer.Abstractions/Contracts/IUTXOLocker.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using NBitcoin;
+
+namespace BTCPayServer.Payments.PayJoin;
+
+public interface IUTXOLocker
+{
+    Task<bool> TryLock(OutPoint outpoint);
+    Task<bool> TryUnlock(params OutPoint[] outPoints);
+    Task<bool> TryLockInputs(OutPoint[] outPoints);
+    Task<HashSet<OutPoint>> FindLocks(OutPoint[] outpoints);
+}

BTCPayServer.Abstractions/Custodians/Client/AssetQuoteResult.cs

@@ -1,18 +1,19 @@
-namespace BTCPayServer.Abstractions.Custodians;
+namespace BTCPayServer.Abstractions.Custodians.Client;
 
 public class AssetQuoteResult
 {
-    public string FromAsset { get; }
-    
-    public string ToAsset { get; }
-    public decimal Bid { get; }
-    public decimal Ask { get; }
+    public string FromAsset { get; set; }
+    public string ToAsset { get; set; }
+    public decimal Bid { get; set; }
+    public decimal Ask { get; set; }
+
+    public AssetQuoteResult() { }
 
     public AssetQuoteResult(string fromAsset, string toAsset,decimal bid, decimal ask)
     {
-        this.FromAsset = fromAsset;
-        this.ToAsset = toAsset;
-        this.Bid = bid;
-        this.Ask = ask;
+        FromAsset = fromAsset;
+        ToAsset = toAsset;
+        Bid = bid;
+        Ask = ask;
     }
 }

BTCPayServer.Abstractions/Custodians/Client/MarketTradeResult.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Abstractions.Custodians;
+namespace BTCPayServer.Abstractions.Custodians.Client;
 
 /**
  * The result of a market trade. Used as a return type for custodians implementing ICanTrade

BTCPayServer.Abstractions/Custodians/Client/WithdrawResult.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Abstractions.Custodians;
+namespace BTCPayServer.Abstractions.Custodians.Client;
 
 public class WithdrawResult
 {

BTCPayServer.Abstractions/Custodians/ICanTrade.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using BTCPayServer.Abstractions.Custodians.Client;
 using BTCPayServer.Client.Models;
 using Newtonsoft.Json.Linq;
 

BTCPayServer.Abstractions/Custodians/ICanWithdraw.cs

@@ -1,5 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
+using BTCPayServer.Abstractions.Custodians.Client;
 using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Abstractions.Custodians;

BTCPayServer.Abstractions/Custodians/ICustodian.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
 using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Abstractions.Custodians;
@@ -18,4 +19,8 @@ public interface ICustodian
      * Get a list of assets and their qty in custody.
      */
     Task<Dictionary<string, decimal>> GetAssetBalancesAsync(JObject config, CancellationToken cancellationToken);
+
+    public Task<Form.Form> GetConfigForm(JObject config, string locale,
+        CancellationToken cancellationToken = default);
+
 }

BTCPayServer.Abstractions/Extensions/CustodianExtensions.cs

@@ -0,0 +1,14 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using BTCPayServer.Abstractions.Custodians;
+
+namespace BTCPayServer.Abstractions.Extensions;
+
+public static class CustodianExtensions
+{
+    public static ICustodian? GetCustodianByCode(this IEnumerable<ICustodian> custodians, string code)
+    {
+        return custodians.FirstOrDefault(custodian => custodian.Code == code);
+    }
+}

BTCPayServer.Abstractions/Extensions/ViewsRazor.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
@@ -10,6 +12,13 @@ namespace BTCPayServer.Abstractions.Extensions
         private const string ACTIVE_CATEGORY_KEY = "ActiveCategory";
         private const string ACTIVE_PAGE_KEY = "ActivePage";
         private const string ACTIVE_ID_KEY = "ActiveId";
+        private const string ActivePageClass = "active";
+
+        public enum DateDisplayFormat
+        {
+            Localized,
+            Relative
+        }
 
         public static void SetActivePage<T>(this ViewDataDictionary viewData, T activePage, string title = null, string activeId = null)
             where T : IConvertible
@@ -52,7 +61,7 @@ namespace BTCPayServer.Abstractions.Extensions
             var activeCategory = viewData[ACTIVE_CATEGORY_KEY]?.ToString();
             var categoryMatch = category.Equals(activeCategory, StringComparison.InvariantCultureIgnoreCase);
             var idMatch = id == null || activeId == null || id.Equals(activeId);
-            return categoryMatch && idMatch ? "active" : null;
+            return categoryMatch && idMatch ? ActivePageClass : null;
         }
 
         public static string IsActivePage<T>(this ViewDataDictionary viewData, T page, object id = null)
@@ -60,6 +69,14 @@ namespace BTCPayServer.Abstractions.Extensions
         {
             return IsActivePage(viewData, page.ToString(), page.GetType().ToString(), id);
         }
+
+        public static string IsActivePage<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null)
+            where T : IConvertible
+        {
+            return pages.Any(page => IsActivePage(viewData, page.ToString(), page.GetType().ToString(), id) == ActivePageClass)
+                ? ActivePageClass
+                : null;
+        }
         
         public static string IsActivePage(this ViewDataDictionary viewData, string page, string category, object id = null)
         {
@@ -72,29 +89,32 @@ namespace BTCPayServer.Abstractions.Extensions
             var activeCategory = viewData[ACTIVE_CATEGORY_KEY]?.ToString();
             var categoryAndPageMatch = (category == null || activeCategory.Equals(category, StringComparison.InvariantCultureIgnoreCase)) && page.Equals(activePage, StringComparison.InvariantCultureIgnoreCase);
             var idMatch = id == null || activeId == null || id.Equals(activeId);
-            return categoryAndPageMatch && idMatch ? "active" : null;
+            return categoryAndPageMatch && idMatch ? ActivePageClass : null;
         }
 
-        public static HtmlString ToBrowserDate(this DateTimeOffset date)
+        public static HtmlString ToBrowserDate(this DateTimeOffset date, DateDisplayFormat format = DateDisplayFormat.Localized)
         {
-            var displayDate = date.ToString("o", CultureInfo.InvariantCulture);
-            return new HtmlString($"<span class='localizeDate'>{displayDate}</span>");
+            var relative = date.ToTimeAgo();
+            var initial = format.ToString().ToLower();
+            var dateTime = date.ToString("o", CultureInfo.InvariantCulture);
+            var displayDate = format == DateDisplayFormat.Relative ? relative : date.ToString("g", CultureInfo.InvariantCulture);
+            return new HtmlString($"<time datetime=\"{dateTime}\" data-relative=\"{relative}\" data-initial=\"{initial}\">{displayDate}</time>");
         }
 
-        public static HtmlString ToBrowserDate(this DateTime date)
+        public static HtmlString ToBrowserDate(this DateTime date, DateDisplayFormat format = DateDisplayFormat.Localized)
         {
-            var displayDate = date.ToString("o", CultureInfo.InvariantCulture);
-            return new HtmlString($"<span class='localizeDate'>{displayDate}</span>");
+            var relative = date.ToTimeAgo();
+            var initial = format.ToString().ToLower();
+            var dateTime = date.ToString("o", CultureInfo.InvariantCulture);
+            var displayDate = format == DateDisplayFormat.Relative ? relative : date.ToString("g", CultureInfo.InvariantCulture);
+            return new HtmlString($"<time datetime=\"{dateTime}\" data-relative=\"{relative}\" data-initial=\"{initial}\">{displayDate}</time>");
         }
 
-        public static string ToTimeAgo(this DateTimeOffset date)
-        {
-            var diff = DateTimeOffset.UtcNow - date;
-            var formatted = diff.TotalSeconds > 0
-                ? $"{diff.TimeString()} ago"
-                : $"in {diff.Negate().TimeString()}";
-            return formatted;
-        }
+        public static string ToTimeAgo(this DateTimeOffset date) => (DateTimeOffset.UtcNow - date).ToTimeAgo();
+
+        public static string ToTimeAgo(this DateTime date) => (DateTimeOffset.UtcNow - date).ToTimeAgo();
+
+        public static string ToTimeAgo(this TimeSpan diff) => diff.TotalSeconds > 0 ? $"{diff.TimeString()} ago" : $"in {diff.Negate().TimeString()}";
 
         public static string TimeString(this TimeSpan timeSpan)
         {
@@ -106,16 +126,14 @@ namespace BTCPayServer.Abstractions.Extensions
             {
                 return $"{(int)timeSpan.TotalMinutes} minute{Plural((int)timeSpan.TotalMinutes)}";
             }
-            if (timeSpan.Days < 1)
-            {
-                return $"{(int)timeSpan.TotalHours} hour{Plural((int)timeSpan.TotalHours)}";
-            }
-            return $"{(int)timeSpan.TotalDays} day{Plural((int)timeSpan.TotalDays)}";
+            return timeSpan.Days < 1 
+                ? $"{(int)timeSpan.TotalHours} hour{Plural((int)timeSpan.TotalHours)}"
+                : $"{(int)timeSpan.TotalDays} day{Plural((int)timeSpan.TotalDays)}";
         }
 
         private static string Plural(int value)
         {
-            return value > 1 ? "s" : string.Empty;
+            return value == 1 ? string.Empty : "s";
         }
     }
 }

BTCPayServer.Abstractions/Form/AlertMessage.cs

@@ -0,0 +1,37 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace BTCPayServer.Abstractions.Form;
+
+public class AlertMessage
+{
+    // Corresponds to the Bootstrap CSS "alert alert-xxx" messages:
+    // Success = green
+    // Warning = orange
+    // Danger = red
+    // Info = blue
+    public enum AlertMessageType
+    {
+        Success,
+        Warning,
+        Danger,
+        Info
+    }
+    
+    [JsonConverter(typeof(StringEnumConverter))]
+    public AlertMessageType Type;
+    
+    // The translated message to be shown to the user
+    public string Message;
+
+    public AlertMessage()
+    {
+        
+    }
+
+    public AlertMessage(AlertMessageType type, string message)
+    {
+        this.Type = type;
+        this.Message = message;
+    }
+}

BTCPayServer.Abstractions/Form/Field.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+
+namespace BTCPayServer.Abstractions.Form;
+
+public abstract class Field
+{
+    // HTML5 compatible type string like "text", "textarea", "email", "password", etc. Each type is a class and may contain more fields (i.e. "select" would have options).
+    public string Type;
+    
+    // The name of the HTML5 node. Should be used as the key for the posted data.
+    public string Name;
+    
+    // The translated label of the field.
+    public string Label;
+    
+    // The value field is what is currently in the DB or what the user entered, but possibly not saved yet due to validation errors.
+    // If this is the first the user sees the form, then value and original value are the same. Value changes as the user starts interacting with the form.
+    public string Value;
+
+    // The original value is the value that is currently saved in the backend. A "reset" button can be used to revert back to this. Should only be set from the constructor.
+    public string OriginalValue;
+
+    // A useful note shown below the field or via a tooltip / info icon. Should be translated for the user.
+    public string HelpText;
+    
+    // The field is considered "valid" if there are no validation errors
+    public List<string> ValidationErrors = new List<string>();
+
+    public bool Required = false;
+
+    public bool IsValid()
+    {
+        return ValidationErrors.Count == 0;
+    }
+}

BTCPayServer.Abstractions/Form/Fieldset.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace BTCPayServer.Abstractions.Form;
+
+public class Fieldset
+{
+    public Fieldset()
+    {
+        this.Fields = new List<Field>();
+    }
+
+    public string Label { get; set; }
+    public List<Field> Fields { get; set; }
+}

BTCPayServer.Abstractions/Form/Form.cs

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+
+namespace BTCPayServer.Abstractions.Form;
+
+public class Form
+{
+
+    // Messages to be shown at the top of the form indicating user feedback like "Saved successfully" or "Please change X because of Y." or a warning, etc...
+    public List<AlertMessage> TopMessages { get; set; } = new();
+    
+    // Groups of fields in the form
+    public List<Fieldset> Fieldsets { get; set; } = new();
+    
+
+    // Are all the fields valid in the form?
+    public bool IsValid()
+    {
+        foreach (var fieldset in Fieldsets)
+        {
+            foreach (var field in fieldset.Fields)
+            {
+                if (!field.IsValid())
+                {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public Field GetFieldByName(string name)
+    {
+        foreach (var fieldset in Fieldsets)
+        {
+            foreach (var field in fieldset.Fields)
+            {
+                if (name.Equals(field.Name))
+                {
+                    return field;
+                }
+            }
+        }
+        return null;
+    }
+
+    public List<string> GetAllNames()
+    {
+        var names = new List<string>();
+        foreach (var fieldset in Fieldsets)
+        {
+            foreach (var field in fieldset.Fields)
+            {
+                names.Add(field.Name);
+            }
+        }
+
+        return names;
+    }
+}

BTCPayServer.Abstractions/Form/TextField.cs

@@ -0,0 +1,19 @@
+namespace BTCPayServer.Abstractions.Form;
+
+public class TextField : Field
+{
+    public TextField(string label, string name, string value, bool required, string helpText)
+    {
+        this.Label = label;
+        this.Name = name;
+        this.Value = value;
+        this.OriginalValue = value;
+        this.Required = required;
+        this.HelpText = helpText;
+        this.Type = "text";
+    }
+
+    // TODO JSON parsing from string to objects again probably won't work out of the box because of the different field types. 
+    
+
+}

BTCPayServer.Abstractions/Models/ConfirmModel.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BTCPayServer.Models
+namespace BTCPayServer.Abstractions.Models
 {
     public class ConfirmModel
     {

BTCPayServer.Abstractions/Security/AuthorizationFilterHandle.cs

@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+
+namespace BTCPayServer.Security;
+
+public class AuthorizationFilterHandle
+{
+    public AuthorizationHandlerContext Context { get; }
+    public PolicyRequirement Requirement { get; }
+    public HttpContext HttpContext { get; }
+    public bool Success { get; private set;  }
+
+    public AuthorizationFilterHandle(
+        AuthorizationHandlerContext context,
+        PolicyRequirement requirement,
+        HttpContext httpContext)
+    {
+        Context = context;
+        Requirement = requirement;
+        HttpContext = httpContext;
+    }
+
+    public void MarkSuccessful()
+    {
+        Success = true;
+    }
+}

BTCPayServer.Abstractions/TagHelpers/CSPA.cs

@@ -1,7 +1,8 @@
 using System;
 using BTCPayServer.Security;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-namespace BTCPayServer.TagHelpers;
+
+namespace BTCPayServer.Abstractions.TagHelpers;
 
 /// <summary>
 /// Add sha256- to allow inline event handlers in a:href=javascript:

BTCPayServer.Abstractions/TagHelpers/CSPEventTagHelper.cs

@@ -2,8 +2,8 @@ using System.Collections.Generic;
 using System.Linq;
 using BTCPayServer.Security;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-namespace BTCPayServer.TagHelpers;
 
+namespace BTCPayServer.Abstractions.TagHelpers;
 
 /// <summary>
 /// Add 'unsafe-hashes' and sha256- to allow inline event handlers in CSP

BTCPayServer.Abstractions/TagHelpers/CSPInlineScriptTagHelper.cs

@@ -1,8 +1,8 @@
 using BTCPayServer.Security;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using NBitcoin;
-namespace BTCPayServer.TagHelpers;
 
+namespace BTCPayServer.Abstractions.TagHelpers;
 
 /// <summary>
 /// Add a nonce-* so the inline-script can pass CSP rule when they are rendered server-side

BTCPayServer.Abstractions/TagHelpers/CSPTemplate.cs

@@ -1,7 +1,8 @@
 using System.Threading.Tasks;
 using BTCPayServer.Security;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-namespace BTCPayServer.TagHelpers;
+
+namespace BTCPayServer.Abstractions.TagHelpers;
 
 /// <summary>
 /// Add sha256- to allow inline event handlers in CSP

BTCPayServer.Abstractions/TagHelpers/PermissionTagHelper.cs

@@ -3,8 +3,8 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Logging;
-namespace BTCPayServer.TagHelpers;
 
+namespace BTCPayServer.Abstractions.TagHelpers;
 
 [HtmlTargetElement(Attributes = nameof(Permission))]
 public class PermissionTagHelper : TagHelper

BTCPayServer.Abstractions/TagHelpers/SVGUse.cs

@@ -1,11 +1,10 @@
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
-using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace BTCPayServer.TagHelpers;
+namespace BTCPayServer.Abstractions.TagHelpers;
 
 // Make sure that <svg><use href=/ are correctly working if rootpath is present
 [HtmlTargetElement("use", Attributes = "href")]

BTCPayServer.Abstractions/TagHelpers/SrvModel.cs

@@ -1,9 +1,9 @@
 using BTCPayServer.Abstractions.Services;
 using BTCPayServer.Security;
-using BTCPayServer.Services;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using NBitcoin;
-namespace BTCPayServer.TagHelpers;
+
+namespace BTCPayServer.Abstractions.TagHelpers;
 
 [HtmlTargetElement("srv-model")]
 public class SrvModel : TagHelper

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -28,8 +28,8 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.3.4" />
-      <PackageReference Include="NBitcoin" Version="7.0.1" />
+      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.3.15" />
+      <PackageReference Include="NBitcoin" Version="7.0.14" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
   <ItemGroup>

BTCPayServer.Client/BTCPayServerClient.Apps.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
+
+namespace BTCPayServer.Client
+{
+    public partial class BTCPayServerClient
+    {
+
+        public virtual async Task<PointOfSaleAppData> CreatePointOfSaleApp(string storeId,
+            CreatePointOfSaleAppRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/apps/pos", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<PointOfSaleAppData>(response);
+        }
+        
+        public virtual async Task<CrowdfundAppData> CreateCrowdfundApp(string storeId,
+            CreateCrowdfundAppRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/apps/crowdfund", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<CrowdfundAppData>(response);
+        }
+
+        public virtual async Task<PointOfSaleAppData> UpdatePointOfSaleApp(string appId,
+            CreatePointOfSaleAppRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/apps/pos/{appId}", bodyPayload: request,
+                    method: HttpMethod.Put), token);
+            return await HandleResponse<PointOfSaleAppData>(response);
+        }
+
+        public virtual async Task<AppDataBase> GetApp(string appId, CancellationToken token = default)
+        {
+            if (appId == null)
+                throw new ArgumentNullException(nameof(appId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/apps/{appId}",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<AppDataBase>(response);
+        }
+
+        public virtual async Task DeleteApp(string appId, CancellationToken token = default)
+        {
+            if (appId == null)
+                throw new ArgumentNullException(nameof(appId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/apps/{appId}",
+                    method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
+    }
+}

BTCPayServer.Client/BTCPayServerClient.CustodianAccounts.cs

@@ -56,9 +56,14 @@ namespace BTCPayServer.Client
             return await HandleResponse<DepositAddressData>(response);
         }
 
-        public virtual async Task<MarketTradeResponseData> TradeMarket(string storeId, string accountId, TradeRequestData request, CancellationToken token = default)
+        public virtual async Task<MarketTradeResponseData> MarketTradeCustodianAccountAsset(string storeId, string accountId, TradeRequestData request, CancellationToken token = default)
         {
-            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/market", bodyPayload: request, method: HttpMethod.Post), token);
+            
+            //var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/users", null, request, HttpMethod.Post), token);
+            //return await HandleResponse<ApplicationUserData>(response);
+            var internalRequest = CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/market", null,
+                    request, HttpMethod.Post);
+            var response = await _httpClient.SendAsync(internalRequest, token);
             return await HandleResponse<MarketTradeResponseData>(response);
         }
 
@@ -73,7 +78,6 @@ namespace BTCPayServer.Client
             var queryPayload = new Dictionary<string, object>();
             queryPayload.Add("fromAsset", fromAsset);
             queryPayload.Add("toAsset", toAsset);
-
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/quote", queryPayload), token);
             return await HandleResponse<TradeQuoteResponseData>(response);
         }

BTCPayServer.Client/BTCPayServerClient.Lightning.Internal.cs

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

BTCPayServer.Client/BTCPayServerClient.Lightning.Store.cs

@@ -17,6 +17,15 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Get), token);
             return await HandleResponse<LightningNodeInformationData>(response);
         }
+        
+        public virtual async Task<LightningNodeBalanceData> GetLightningNodeBalance(string storeId, string cryptoCode,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/balance",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningNodeBalanceData>(response);
+        }
 
         public virtual async Task ConnectToLightningNode(string storeId, string cryptoCode, ConnectToNodeRequest request,
             CancellationToken token = default)
@@ -56,7 +65,7 @@ namespace BTCPayServer.Client
             return await HandleResponse<string>(response);
         }
 
-        public virtual async Task PayLightningInvoice(string storeId, string cryptoCode, PayLightningInvoiceRequest request,
+        public virtual async Task<LightningPaymentData> PayLightningInvoice(string storeId, string cryptoCode, PayLightningInvoiceRequest request,
             CancellationToken token = default)
         {
             if (request == null)
@@ -64,7 +73,7 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices/pay", bodyPayload: request,
                     method: HttpMethod.Post), token);
-            await HandleResponse(response);
+            return await HandleResponse<LightningPaymentData>(response);
         }
 
         public virtual async Task<LightningPaymentData> GetLightningPayment(string storeId, string cryptoCode,
@@ -88,6 +97,24 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Get), token);
             return await HandleResponse<LightningInvoiceData>(response);
         }
+        
+        public virtual async Task<LightningInvoiceData[]> GetLightningInvoices(string storeId, string cryptoCode,
+            bool? pendingOnly = null, long? offsetIndex = null, CancellationToken token = default)
+        {
+            var queryPayload = new Dictionary<string, object>();
+            if (pendingOnly is bool v)
+            {
+                queryPayload.Add("pendingOnly", v.ToString());
+            }
+            if (offsetIndex is > 0)
+            {
+                queryPayload.Add("offsetIndex", offsetIndex);
+            }
+
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices", queryPayload), token);
+            return await HandleResponse<LightningInvoiceData[]>(response);
+        }
 
         public virtual async Task<LightningInvoiceData> CreateLightningInvoice(string storeId, string cryptoCode,
             CreateLightningInvoiceRequest request, CancellationToken token = default)

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.Objects.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
+using NBitcoin;
+
+namespace BTCPayServer.Client
+{
+    public partial class BTCPayServerClient
+    {
+        public virtual async Task<OnChainWalletObjectData> GetOnChainWalletObject(string storeId, string cryptoCode, OnChainWalletObjectId objectId, bool? includeNeighbourData = null, CancellationToken token = default)
+        {
+            Dictionary<string, object> parameters = new Dictionary<string, object>();
+            if (includeNeighbourData is bool v)
+                parameters.Add("includeNeighbourData", v);
+            var response =
+            await _httpClient.SendAsync(
+            CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}", parameters, method: HttpMethod.Get), token);
+            try
+            {
+                return await HandleResponse<OnChainWalletObjectData>(response);
+            }
+            catch (GreenfieldAPIException err) when (err.APIError.Code == "wallet-object-not-found")
+            {
+                return null;
+            }
+        }
+        public virtual async Task<OnChainWalletObjectData[]> GetOnChainWalletObjects(string storeId, string cryptoCode, GetWalletObjectsRequest query = null, CancellationToken token = default)
+        {
+            Dictionary<string, object> parameters = new Dictionary<string, object>();
+            if (query?.Type is string s)
+                parameters.Add("type", s);
+            if (query?.Ids is string[] ids)
+                parameters.Add("ids", ids);
+            if (query?.IncludeNeighbourData is bool v)
+                parameters.Add("includeNeighbourData", v);
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", parameters, method:HttpMethod.Get), token);
+            return await HandleResponse<OnChainWalletObjectData[]>(response);
+        }
+        public virtual async Task RemoveOnChainWalletObject(string storeId, string cryptoCode, OnChainWalletObjectId objectId,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}", method:HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
+        public virtual async Task<OnChainWalletObjectData> AddOrUpdateOnChainWalletObject(string storeId, string cryptoCode, AddOnChainWalletObjectRequest request,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", method:HttpMethod.Post, bodyPayload: request), token);
+            return await HandleResponse<OnChainWalletObjectData>(response);
+        }
+        public virtual async Task AddOrUpdateOnChainWalletLink(string storeId, string cryptoCode,
+            OnChainWalletObjectId objectId,
+            AddOnChainWalletObjectLinkRequest request = null,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links", method:HttpMethod.Post, bodyPayload: request), token);
+            await HandleResponse(response);
+        }
+        public virtual async Task RemoveOnChainWalletLinks(string storeId, string cryptoCode,
+            OnChainWalletObjectId objectId,
+            OnChainWalletObjectId link,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links/{link.Type}/{link.Id}", method:HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
+    }
+}

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.cs

@@ -85,11 +85,14 @@ namespace BTCPayServer.Client
         public virtual async Task<OnChainWalletTransactionData> PatchOnChainWalletTransaction(
             string storeId, string cryptoCode, string transactionId,
             PatchOnChainTransactionRequest request,
-            CancellationToken token = default)
+            bool force = false, CancellationToken token = default)
         {
             var response =
                 await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions/{transactionId}", queryPayload: null, bodyPayload: request, HttpMethod.Patch), token);
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions/{transactionId}", queryPayload: new Dictionary<string, object>()
+                    {
+                        {"force", force}
+                    }, bodyPayload: request, HttpMethod.Patch), token);
             return await HandleResponse<OnChainWalletTransactionData>(response);
         }
 

BTCPayServer.Client/BTCPayServerClient.PaymentRequests.cs

@@ -37,6 +37,20 @@ namespace BTCPayServer.Client
             await HandleResponse(response);
         }
 
+        public virtual async Task<Client.Models.InvoiceData> PayPaymentRequest(string storeId, string paymentRequestId, PayPaymentRequestRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            if (storeId is null)
+                throw new ArgumentNullException(nameof(storeId));
+            if (paymentRequestId is null)
+                throw new ArgumentNullException(nameof(paymentRequestId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}/pay", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<Client.Models.InvoiceData>(response);
+        }
+
         public virtual async Task<PaymentRequestData> CreatePaymentRequest(string storeId,
             CreatePaymentRequestRequest request, CancellationToken token = default)
         {

BTCPayServer.Client/BTCPayServerClient.PullPayments.cs

@@ -53,6 +53,16 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts", bodyPayload: payoutRequest, method: HttpMethod.Post), cancellationToken);
             return await HandleResponse<PayoutData>(response);
         } 
+        public virtual async Task<PayoutData> GetPullPaymentPayout(string pullPaymentId, string payoutId, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts/{payoutId}", method: HttpMethod.Get), cancellationToken);
+            return await HandleResponse<PayoutData>(response);
+        } 
+        public virtual async Task<PayoutData> GetStorePayout(string storeId, string payoutId, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payouts/{payoutId}", method: HttpMethod.Get), cancellationToken);
+            return await HandleResponse<PayoutData>(response);
+        } 
         public virtual async Task<PayoutData> CreatePayout(string storeId, CreatePayoutThroughStoreRequest payoutRequest, CancellationToken cancellationToken = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payouts", bodyPayload: payoutRequest, method: HttpMethod.Post), cancellationToken);
@@ -69,7 +79,7 @@ namespace BTCPayServer.Client
             return await HandleResponse<PayoutData>(response);
         }
 
-        public async Task MarkPayoutPaid(string storeId, string payoutId,
+        public virtual async Task MarkPayoutPaid(string storeId, string payoutId,
             CancellationToken cancellationToken = default)
         {
             var response = await _httpClient.SendAsync(
@@ -78,5 +88,14 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Post), cancellationToken);
             await HandleResponse(response);
         }
+        public virtual async Task MarkPayout(string storeId, string payoutId, MarkPayoutRequest request,
+            CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest(
+                    $"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}/mark",
+                    method: HttpMethod.Post, bodyPayload: request), cancellationToken);
+            await HandleResponse(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.StoreRatesConfiguration.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
+
+namespace BTCPayServer.Client
+{
+    public partial class BTCPayServerClient
+    {
+        public virtual async Task<StoreRateConfiguration> GetStoreRateConfiguration(string storeId,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/rates/configuration", method: HttpMethod.Get),
+                token);
+            return await HandleResponse<StoreRateConfiguration>(response);
+        }
+
+        public virtual async Task<List<RateSource>> GetRateSources(
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"misc/rate-sources", method: HttpMethod.Get),
+                token);
+            return await HandleResponse<List<RateSource>>(response);
+        }
+
+        public virtual async Task<StoreRateConfiguration> UpdateStoreRateConfiguration(string storeId,
+            StoreRateConfiguration request,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/rates/configuration", bodyPayload: request,
+                    method: HttpMethod.Put),
+                token);
+            return await HandleResponse<StoreRateConfiguration>(response);
+        }
+
+        public virtual async Task<List<StoreRatePreviewResult>> PreviewUpdateStoreRateConfiguration(string storeId,
+            StoreRateConfiguration request,
+            string[] currencyPair,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/rates/configuration/preview", bodyPayload: request,
+                    queryPayload: new Dictionary<string, object>() {{"currencyPair", currencyPair}},
+                    method: HttpMethod.Post),
+                token);
+            return await HandleResponse<List<StoreRatePreviewResult>>(response);
+        }
+    }
+}

BTCPayServer.Client/Models/AssetPairData.cs

@@ -1,22 +1,32 @@
+using Newtonsoft.Json;
+
 namespace BTCPayServer.Client.Models;
 
+[JsonObject(MemberSerialization.OptIn)]
 public class AssetPairData
 {
-
     public AssetPairData()
     {
     }
     
-    public AssetPairData(string AssetBought, string AssetSold)
+    public AssetPairData(string assetBought, string assetSold, decimal minimumTradeQty)
     {
-        this.AssetBought = AssetBought;
-        this.AssetSold = AssetSold;
+        AssetBought = assetBought;
+        AssetSold = assetSold;
+        MinimumTradeQty = minimumTradeQty;
     }
-    
+
+    [JsonProperty]
     public string AssetBought { set; get; }
+
+    [JsonProperty]
     public string AssetSold { set; get; }
 
-    public string ToString()
+    [JsonProperty]
+    public decimal MinimumTradeQty { set; get; }
+
+    
+    public override string ToString()
     {
         return AssetBought + "/" + AssetSold;
     }

BTCPayServer.Client/Models/CreateAppRequest.cs

@@ -0,0 +1,84 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace BTCPayServer.Client.Models
+{
+    public enum PosViewType
+    {
+        Static,
+        Cart,
+        Light,
+        Print
+    }
+
+    public class CreateAppRequest
+    {
+        public string AppName { get; set; }
+        public string AppType { get; set; }
+    }
+
+    public class CreatePointOfSaleAppRequest : CreateAppRequest
+    {
+        public string Currency { get; set; } = null;
+        public string Title { get; set; } = null;
+        public string Description { get; set; } = null;
+        public string Template { get; set; } = null;
+        [JsonConverter(typeof(StringEnumConverter))]
+        public PosViewType DefaultView { get; set; }
+        public bool ShowCustomAmount { get; set; } = false;
+        public bool ShowDiscount { get; set; } = true;
+        public bool EnableTips { get; set; } = true;
+        public string CustomAmountPayButtonText { get; set; } = null;
+        public string FixedAmountPayButtonText { get; set; } = null;
+        public string TipText { get; set; } = null;
+        public string CustomCSSLink { get; set; } = null;
+        public string NotificationUrl { get; set; } = null;
+        public string RedirectUrl { get; set; } = null;
+        public bool? RedirectAutomatically { get; set; } = null;
+        public bool? RequiresRefundEmail { get; set; } = null;
+        public string CheckoutFormId { get; set; } = null;
+        public string EmbeddedCSS { get; set; } = null;
+        public CheckoutType? CheckoutType { get; set; } = null;
+    }
+
+    public enum CrowdfundResetEvery
+    {
+        Never,
+        Hour,
+        Day,
+        Month,
+        Year
+    }
+
+    public class CreateCrowdfundAppRequest : CreateAppRequest
+    {
+        public string Title { get; set; } = null;
+        public bool? Enabled { get; set; } = null;
+        public bool? EnforceTargetAmount { get; set; } = null;
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset? StartDate { get; set; } = null;
+        public string TargetCurrency { get; set; } = null;
+        public string Description { get; set; } = null;
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset? EndDate { get; set; } = null;
+        public decimal? TargetAmount { get; set; } = null;
+        public string CustomCSSLink { get; set; } = null;
+        public string MainImageUrl { get; set; } = null;
+        public string EmbeddedCSS { get; set; } = null;
+        public string NotificationUrl { get; set; } = null;
+        public string Tagline { get; set; } = null;
+        public string PerksTemplate { get; set; } = null;
+        public bool? SoundsEnabled { get; set; } = null;
+        public string DisqusShortname { get; set; } = null;
+        public bool? AnimationsEnabled { get; set; } = null;
+        public int? ResetEveryAmount { get; set; } = null;
+        [JsonConverter(typeof(StringEnumConverter))]
+        public CrowdfundResetEvery ResetEvery { get; set; } = CrowdfundResetEvery.Never;
+        public bool? DisplayPerksValue { get; set; } = null;
+        public bool? DisplayPerksRanking { get; set; } = null;
+        public bool? SortPerksByPopularity { get; set; } = null;
+        public string[] Sounds { get; set; } = null;
+        public string[] AnimationColors { get; set; } = null;
+    }
+}

BTCPayServer.Client/Models/CreateOnChainTransactionRequest.cs

@@ -26,5 +26,6 @@ namespace BTCPayServer.Client.Models
         public List<CreateOnChainTransactionRequestDestination> Destinations { get; set; }
         [JsonProperty("rbf")]
         public bool? RBF { get; set; } = null;
+        public bool ExcludeUnconfirmed { get; set; } = false;
     }
 }

BTCPayServer.Client/Models/CustodianData.cs

@@ -1,10 +1,12 @@
+using System.Collections.Generic;
+
 namespace BTCPayServer.Client.Models;
 
 public class CustodianData
 {
     public string Code { get; set; }
     public string Name { get; set; }
-    public string[] TradableAssetPairs { get; set; }
+    public Dictionary<string, AssetPairData> TradableAssetPairs { get; set; }
     public string[] WithdrawablePaymentMethods { get; set; }
     public string[] DepositablePaymentMethods { get; set; }
     

BTCPayServer.Client/Models/EmailSettingsData.cs

@@ -1,4 +1,4 @@
-namespace BTCPayServer.Client.Models;
+namespace BTCPayServer.Client.Models;
 
 public class EmailSettingsData
 {
@@ -21,13 +21,9 @@ public class EmailSettingsData
     {
         get; set;
     }
-
-    public string FromDisplay
-    {
-        get; set;
-    }
     public string From
     {
         get; set;
     }
+    public bool DisableCertificateCheck { get; set; }
 }

BTCPayServer.Client/Models/InvoiceData.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
@@ -19,6 +20,48 @@ namespace BTCPayServer.Client.Models
         public string Currency { get; set; }
         public JObject Metadata { get; set; }
         public CheckoutOptions Checkout { get; set; } = new CheckoutOptions();
+        public ReceiptOptions Receipt { get; set; } = new ReceiptOptions();
+
+        public class ReceiptOptions
+        {
+            public bool? Enabled { get; set; }
+            public bool? ShowQR { get; set; }
+            public bool? ShowPayments { get; set; }
+            [JsonExtensionData]
+            public IDictionary<string, JToken> AdditionalData { get; set; }
+
+#nullable enable
+            /// <summary>
+            /// Make sure that the return has all values set by order of priority: invoice/store/default
+            /// </summary>
+            /// <param name="storeLevelOption"></param>
+            /// <param name="invoiceLevelOption"></param>
+            /// <returns></returns>
+            public static ReceiptOptions Merge(ReceiptOptions? storeLevelOption, ReceiptOptions? invoiceLevelOption)
+            {
+                storeLevelOption ??= new ReceiptOptions();
+                invoiceLevelOption ??= new ReceiptOptions();
+                var store = JObject.FromObject(storeLevelOption);
+                var inv = JObject.FromObject(invoiceLevelOption);
+                var result = JObject.FromObject(CreateDefault());
+                var mergeSettings = new JsonMergeSettings() { MergeNullValueHandling = MergeNullValueHandling.Ignore };
+                result.Merge(store, mergeSettings);
+                result.Merge(inv, mergeSettings);
+                var options = result.ToObject<ReceiptOptions>()!;
+                return options;
+            }
+
+            public static ReceiptOptions CreateDefault()
+            {
+                return new ReceiptOptions()
+                {
+                    ShowQR = true,
+                    Enabled = true,
+                    ShowPayments = true
+                };
+            }
+#nullable restore
+        }
         public class CheckoutOptions
         {
 
@@ -42,6 +85,9 @@ namespace BTCPayServer.Client.Models
             public bool? RedirectAutomatically { get; set; }
             public bool? RequiresRefundEmail { get; set; } = null;
             public string DefaultLanguage { get; set; }
+            [JsonProperty("checkoutFormId")]
+            public string CheckoutFormId { get; set; }
+            public CheckoutType? CheckoutType { get; set; }
         }
     }
     public class InvoiceData : InvoiceDataBase

BTCPayServer.Client/Models/LabelData.cs

@@ -1,9 +1,11 @@
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Client.Models
 {
+    [Obsolete]
     public class LabelData
     {
         public string Type { get; set; }

BTCPayServer.Client/Models/LightningInvoiceData.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.Lightning;
 using Newtonsoft.Json;
@@ -26,5 +27,8 @@ namespace BTCPayServer.Client.Models
 
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney AmountReceived { get; set; }
+
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public Dictionary<ulong, string> CustomRecords { get; set; }
     }
 }

BTCPayServer.Client/Models/LightningNodeBalanceData.cs

@@ -0,0 +1,53 @@
+using BTCPayServer.Client.JsonConverters;
+using BTCPayServer.Lightning;
+using NBitcoin;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Client.Models
+{
+    public class LightningNodeBalanceData
+    {
+        [JsonProperty("onchain")]
+        public OnchainBalanceData OnchainBalance { get; set; }
+        
+        [JsonProperty("offchain")]
+        public OffchainBalanceData OffchainBalance { get; set; }
+        
+        public LightningNodeBalanceData()
+        {
+        }
+
+        public LightningNodeBalanceData(OnchainBalanceData onchain, OffchainBalanceData offchain)
+        {
+            OnchainBalance = onchain;
+            OffchainBalance = offchain;
+        }
+    }
+
+    public class OnchainBalanceData
+    {
+        [JsonConverter(typeof(JsonConverters.MoneyJsonConverter))]
+        public Money Confirmed { get; set; }
+
+        [JsonConverter(typeof(JsonConverters.MoneyJsonConverter))]
+        public Money Unconfirmed { get; set; }
+        
+        [JsonConverter(typeof(JsonConverters.MoneyJsonConverter))]
+        public Money Reserved { get; set; }
+    }
+
+    public class OffchainBalanceData
+    {
+        [JsonConverter(typeof(LightMoneyJsonConverter))]
+        public LightMoney Opening { get; set; }
+        
+        [JsonConverter(typeof(LightMoneyJsonConverter))]
+        public LightMoney Local { get; set; }
+        
+        [JsonConverter(typeof(LightMoneyJsonConverter))]
+        public LightMoney Remote { get; set; }
+        
+        [JsonConverter(typeof(LightMoneyJsonConverter))]
+        public LightMoney Closing { get; set; }
+    }
+}

BTCPayServer.Client/Models/LightningNodeInformationData.cs

@@ -9,6 +9,13 @@ namespace BTCPayServer.Client.Models
         [JsonProperty("nodeURIs", ItemConverterType = typeof(NodeUriJsonConverter))]
         public NodeInfo[] NodeURIs { get; set; }
         public int BlockHeight { get; set; }
+        public string Alias { get; set; }
+        public string Color { get; set; }
+        public string Version { get; set; }
+        public long? PeersCount { get; set; }
+        public long? ActiveChannelsCount { get; set; }
+        public long? InactiveChannelsCount { get; set; }
+        public long? PendingChannelsCount { get; set; }
     }
 
     public class LightningChannelData

BTCPayServer.Client/Models/MarkPayoutRequest.cs

@@ -0,0 +1,14 @@
+#nullable enable
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Client.Models;
+
+public class MarkPayoutRequest
+{
+    [JsonConverter(typeof(StringEnumConverter))]
+    public PayoutState State { get; set; } = PayoutState.Completed;
+
+    public JObject? PaymentProof { get; set; }
+}

BTCPayServer.Client/Models/OnChainAutomatedPayoutSettings.cs

@@ -10,4 +10,6 @@ public class OnChainAutomatedPayoutSettings
        
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }
+
+    public int? FeeBlockTarget { get; set; } 
 }

BTCPayServer.Client/Models/OnChainWalletTransactionData.cs

@@ -4,16 +4,94 @@ using BTCPayServer.JsonConverters;
 using NBitcoin;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Client.Models
 {
+    public class OnChainWalletObjectId
+    {
+        public OnChainWalletObjectId()
+        {
+
+        }
+        public OnChainWalletObjectId(string type, string id)
+        {
+            Type = type;
+            Id = id;
+        }
+        public string Type { get; set; }
+        public string Id { get; set; }
+    }
+    public class AddOnChainWalletObjectLinkRequest : OnChainWalletObjectId
+    {
+        public AddOnChainWalletObjectLinkRequest()
+        {
+
+        }
+        public AddOnChainWalletObjectLinkRequest(string objectType, string objectId) : base(objectType, objectId)
+        {
+
+        }
+        public JObject Data { get; set; }
+    }
+
+    public class GetWalletObjectsRequest
+    {
+        public string Type { get; set; }
+        public string[] Ids { get; set; }
+        public bool? IncludeNeighbourData { get; set; }
+    }
+
+    public class AddOnChainWalletObjectRequest : OnChainWalletObjectId
+    {
+        public AddOnChainWalletObjectRequest()
+        {
+
+        }
+        public AddOnChainWalletObjectRequest(string objectType, string objectId) : base(objectType, objectId)
+        {
+
+        }
+        public JObject Data { get; set; }
+    }
+
+    public class OnChainWalletObjectData : OnChainWalletObjectId
+    {
+        public OnChainWalletObjectData()
+        {
+
+        }
+        public OnChainWalletObjectData(string type, string id) : base(type, id)
+        {
+
+        }
+
+        public class OnChainWalletObjectLink : OnChainWalletObjectId
+        {
+            public OnChainWalletObjectLink()
+            {
+
+            }
+            public OnChainWalletObjectLink(string type, string id) : base(type, id)
+            {
+
+            }
+            public JObject LinkData { get; set; }
+            public JObject ObjectData { get; set; }
+        }
+        public JObject Data { get; set; }
+        public OnChainWalletObjectLink[] Links { get; set; }
+    }
+
     public class OnChainWalletTransactionData
     {
         [JsonConverter(typeof(UInt256JsonConverter))]
         public uint256 TransactionHash { get; set; }
 
         public string Comment { get; set; }
+#pragma warning disable CS0612 // Type or member is obsolete
         public Dictionary<string, LabelData> Labels { get; set; } = new Dictionary<string, LabelData>();
+#pragma warning restore CS0612 // Type or member is obsolete
 
         [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal Amount { get; set; }

BTCPayServer.Client/Models/OnChainWalletUTXOData.cs

@@ -15,7 +15,9 @@ namespace BTCPayServer.Client.Models
         [JsonConverter(typeof(OutpointJsonConverter))]
         public OutPoint Outpoint { get; set; }
         public string Link { get; set; }
+#pragma warning disable CS0612 // Type or member is obsolete
         public Dictionary<string, LabelData> Labels { get; set; }
+#pragma warning restore CS0612 // Type or member is obsolete
         [JsonConverter(typeof(DateTimeToUnixTimeConverter))]
         public DateTimeOffset Timestamp { get; set; }
         [JsonConverter(typeof(KeyPathJsonConverter))]

BTCPayServer.Client/Models/PayLightningInvoiceRequest.cs

@@ -1,3 +1,4 @@
+using System;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.JsonConverters;
 using BTCPayServer.Lightning;
@@ -19,5 +20,8 @@ namespace BTCPayServer.Client.Models
     
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
+
+        [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
+        public TimeSpan? SendTimeout { get; set; }
     }
 }

BTCPayServer.Client/Models/PayPaymentRequestRequest.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Client.Models
+{
+    public class PayPaymentRequestRequest
+    {
+        [JsonConverter(typeof(NumericStringJsonConverter))]
+        public decimal? Amount { get; set; }
+        public bool? AllowPendingInvoiceReuse { get; set; }
+    }
+}

BTCPayServer.Client/Models/PayoutData.cs

@@ -2,6 +2,7 @@ using System;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Client.Models
 {
@@ -29,5 +30,6 @@ namespace BTCPayServer.Client.Models
         [JsonConverter(typeof(StringEnumConverter))]
         public PayoutState State { get; set; }
         public int Revision { get; set; }
+        public JObject PaymentProof { get; set; }
     }
 }

BTCPayServer.Client/Models/PointOfSaleAppData.cs

@@ -0,0 +1,25 @@
+using System;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Client.Models
+{
+    public class AppDataBase
+    {
+        public string Id { get; set; }
+        public string AppType { get; set; }
+        public string Name { get; set; }
+        public string StoreId { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset Created { get; set; }
+    }
+    
+    public class PointOfSaleAppData : AppDataBase
+    {
+        // We can add POS specific things here later
+    }
+
+    public class CrowdfundAppData : AppDataBase
+    {
+        // We can add Crowdfund specific things here later
+    }
+}

BTCPayServer.Client/Models/RateSource.cs

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

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -31,6 +31,10 @@ namespace BTCPayServer.Client.Models
         public bool AnyoneCanCreateInvoice { get; set; }
         public string DefaultCurrency { get; set; }
         public bool RequiresRefundEmail { get; set; }
+
+        public string CheckoutFormId { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public CheckoutType CheckoutType { get; set; }
         public bool LightningAmountInSatoshi { get; set; }
         public bool LightningPrivateRouteHints { get; set; }
         public bool OnChainWithLnInvoiceFallback { get; set; }
@@ -58,12 +62,20 @@ namespace BTCPayServer.Client.Models
         public NetworkFeeMode NetworkFeeMode { get; set; } = NetworkFeeMode.Never;
 
         public bool PayJoinEnabled { get; set; }
+        
+        public InvoiceData.ReceiptOptions Receipt { get; set; }
 
 
         [JsonExtensionData]
         public IDictionary<string, JToken> AdditionalData { get; set; }
     }
 
+    public enum CheckoutType
+    {
+        V1,
+        V2
+    }
+
     public enum NetworkFeeMode
     {
         MultiplePaymentsOnly,

BTCPayServer.Client/Models/StoreRateConfiguration.cs

@@ -0,0 +1,10 @@
+namespace BTCPayServer.Client.Models
+{
+    public class StoreRateConfiguration
+    {
+        public decimal Spread { get; set; }
+        public bool IsCustomScript { get; set; }
+        public string EffectiveScript { get; set; }
+        public string PreferredSource { get; set; }
+    }
+}

BTCPayServer.Client/Models/StoreRatePreviewResult.cs

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

BTCPayServer.Client/Models/StoreRateResult.cs

@@ -0,0 +1,7 @@
+namespace BTCPayServer.Client.Models;
+
+public class StoreRateResult
+{
+    public string CurrencyPair { get; set; }
+    public decimal Rate { get; set; }
+}

BTCPayServer.Client/Models/TransactionStatus.cs

@@ -3,7 +3,6 @@ namespace BTCPayServer.Client.Models
     public enum TransactionStatus
     {
         Unconfirmed,
-        Confirmed,
-        Replaced
+        Confirmed
     }
 }

BTCPayServer.Client/Models/WebhookEventType.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace BTCPayServer.Client.Models
 {
     public enum WebhookEventType

BTCPayServer.Client/Permissions.cs

@@ -84,6 +84,10 @@ namespace BTCPayServer.Client
         {
             return policy.StartsWith("btcpay.server", StringComparison.OrdinalIgnoreCase);
         }
+        public static bool IsPluginPolicy(string policy)
+        {
+            return policy.StartsWith("btcpay.plugin", StringComparison.OrdinalIgnoreCase);
+        }
     }
     public class Permission
     {

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.MonetaryUnit.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitMonetaryUnit()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("MUE");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "MonetaryUnit",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.monetaryunit.org/#/MUE/mainnet/tx/{0}" : "https://explorer.monetaryunit.org/#/MUE/mainnet/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                                "MUE_X = MUE_BTC * BTC_X",
-                                "MUE_BTC = bittrex(MUE_BTC)"
-                },
-                CryptoImagePath = "imlegacy/monetaryunit.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("31'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/Liquid/BTCPayNetworkProvider.Liquid.cs

@@ -22,7 +22,7 @@ namespace BTCPayServer
                     "LBTC_X = LBTC_BTC * BTC_X",
                     "LBTC_BTC = 1",
                 },
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
+                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://liquid.network/tx/{0}" : "https://liquid.network/testnet/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 CryptoImagePath = "imlegacy/liquid.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),

BTCPayServer.Common/Altcoins/Liquid/BTCPayNetworkProvider.LiquidAssets.cs

@@ -21,7 +21,7 @@ namespace BTCPayServer
                 },
                 AssetId = new uint256("ce091c998b83c78bb71a632313ba3760f1763d9cfcffae02258ffa9865a37bd2"),
                 DisplayName = "Liquid Tether",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
+                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://liquid.network/tx/{0}" : "https://liquid.network/testnet/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 CryptoImagePath = "imlegacy/liquid-tether.svg",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
@@ -44,7 +44,7 @@ namespace BTCPayServer
                 Divisibility = 2,
                 AssetId = new uint256("aa775044c32a7df391902b3659f46dfe004ccb2644ce2ddc7dba31e889391caf"),
                 DisplayName = "Ethiopian Birr",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
+                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://liquid.network/tx/{0}" : "https://liquid.network/testnet/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 CryptoImagePath = "imlegacy/etb.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
@@ -66,7 +66,7 @@ namespace BTCPayServer
                 },
                 AssetId = new uint256("0e99c1a6da379d1f4151fb9df90449d40d0608f6cb33a5bcbfc8c265f42bab0a"),
                 DisplayName = "Liquid CAD",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
+                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://liquid.network/tx/{0}" : "https://liquid.network/testnet/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 CryptoImagePath = "imlegacy/lcad.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),

BTCPayServer.Common/BTCPayNetwork.cs

@@ -137,6 +137,7 @@ namespace BTCPayServer
 
         public string CryptoImagePath { get; set; }
         public string[] DefaultRateRules { get; set; } = Array.Empty<string>();
+
         public override string ToString()
         {
             return CryptoCode;

BTCPayServer.Common/BTCPayNetworkProvider.Bitcoin.cs

@@ -13,9 +13,9 @@ namespace BTCPayServer
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Bitcoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockstream.info/tx/{0}" :
-                                    NetworkType == Bitcoin.Instance.Signet.ChainName ? "https://explorer.bc-2.jp/tx/{0}"
-                                    : "https://blockstream.info/testnet/tx/{0}",
+                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://mempool.space/tx/{0}" :
+                                    NetworkType == Bitcoin.Instance.Signet.ChainName ? "https://mempool.space/signet/tx/{0}"
+                                    : "https://mempool.space/testnet/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 CryptoImagePath = "imlegacy/bitcoin.svg",
                 LightningImagePath = "imlegacy/bitcoin-lightning.svg",

BTCPayServer.Common/BTCPayNetworkProvider.cs

@@ -58,7 +58,7 @@ namespace BTCPayServer
             InitZcash();
             InitChaincoin();
             // InitArgoneum();//their rate source is down 9/15/20.
-            InitMonetaryUnit();
+            // InitMonetaryUnit(); Not supported from Bittrex from 11/23/2022, dead shitcoin
 
             // Assume that electrum mappings are same as BTC if not specified
             foreach (var network in _Networks.Values.OfType<BTCPayNetwork>())

BTCPayServer.Common/BTCPayServer.Common.csproj

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

BTCPayServer.Common/Logging/ConsoleLogger.cs

@@ -180,7 +180,7 @@ namespace BTCPayServer.Logging
             logBuilder.Append(": ");
             var lenAfter = logBuilder.ToString().Length;
             while (lenAfter++ < 18)
-                logBuilder.Append(" ");
+                logBuilder.Append(' ');
             // scope information
             GetScopeInformation(logBuilder);
 

BTCPayServer.Common/MultiProcessingQueue.cs

@@ -106,9 +106,11 @@ namespace BTCPayServer
                 {
                 }
             }
-            cancellationToken.ThrowIfCancellationRequested();
             lock (_Queues)
             {
+                if (_Queues.Count is 0)
+                    return;
+                cancellationToken.ThrowIfCancellationRequested();
                 Cleanup();
             }
         }

BTCPayServer.Data/ApplicationDbContext.cs

@@ -53,12 +53,17 @@ namespace BTCPayServer.Data
         public DbSet<PullPaymentData> PullPayments { get; set; }
         public DbSet<RefundData> Refunds { get; set; }
         public DbSet<SettingData> Settings { get; set; }
+        public DbSet<StoreSettingData> StoreSettings { get; set; }
         public DbSet<StoreWebhookData> StoreWebhooks { get; set; }
         public DbSet<StoreData> Stores { get; set; }
         public DbSet<U2FDevice> U2FDevices { get; set; }
         public DbSet<Fido2Credential> Fido2Credentials { get; set; }
         public DbSet<UserStore> UserStore { get; set; }
+        [Obsolete]
         public DbSet<WalletData> Wallets { get; set; }
+        public DbSet<WalletObjectData> WalletObjects { get; set; }
+        public DbSet<WalletObjectLinkData> WalletObjectLinks { get; set; }
+        [Obsolete]
         public DbSet<WalletTransactionData> WalletTransactions { get; set; }
         public DbSet<WebhookDeliveryData> WebhookDeliveries { get; set; }
         public DbSet<WebhookData> Webhooks { get; set; }
@@ -101,13 +106,18 @@ namespace BTCPayServer.Data
             PullPaymentData.OnModelCreating(builder);
             RefundData.OnModelCreating(builder);
             //SettingData.OnModelCreating(builder);
+            StoreSettingData.OnModelCreating(builder, Database);
             StoreWebhookData.OnModelCreating(builder);
             //StoreData.OnModelCreating(builder);
             U2FDevice.OnModelCreating(builder);
             Fido2Credential.OnModelCreating(builder);
             BTCPayServer.Data.UserStore.OnModelCreating(builder);
             //WalletData.OnModelCreating(builder);
+            WalletObjectData.OnModelCreating(builder, Database);
+            WalletObjectLinkData.OnModelCreating(builder, Database);
+#pragma warning disable CS0612 // Type or member is obsolete
             WalletTransactionData.OnModelCreating(builder);
+#pragma warning restore CS0612 // Type or member is obsolete
             WebhookDeliveryData.OnModelCreating(builder);
             LightningAddressData.OnModelCreating(builder);
             PayoutProcessorData.OnModelCreating(builder);

BTCPayServer.Data/BTCPayServer.Data.csproj

@@ -3,11 +3,11 @@
   <Import Project="../Build/Common.csproj" />
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.9" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />

BTCPayServer.Data/Data/AppData.cs

@@ -15,7 +15,6 @@ namespace BTCPayServer.Data
         public bool TagAllInvoices { get; set; }
         public string Settings { get; set; }
 
-
         internal static void OnModelCreating(ModelBuilder builder)
         {
             builder.Entity<AppData>()
@@ -28,9 +27,7 @@ namespace BTCPayServer.Data
         // utility methods
         public T GetSettings<T>() where T : class, new()
         {
-            if (String.IsNullOrEmpty(Settings))
-                return new T();
-            return JsonConvert.DeserializeObject<T>(Settings);
+            return string.IsNullOrEmpty(Settings) ? new T() : JsonConvert.DeserializeObject<T>(Settings);
         }
 
         public void SetSettings(object value)

BTCPayServer.Data/Data/CustodianAccountData.cs

@@ -19,6 +19,7 @@ public class CustodianAccountData
     [MaxLength(50)]
     public string CustodianCode { get; set; }
     
+    [Required]
     [MaxLength(50)]
     public string Name { get; set; }
     

BTCPayServer.Data/Data/PayoutData.cs

@@ -51,12 +51,10 @@ namespace BTCPayServer.Data
             var period = pp.GetPeriod(now);
             if (period is { } p)
             {
-                return p.Start <= Date && (p.End is DateTimeOffset end ? Date < end : true);
-            }
-            else
-            {
-                return false;
+                return p.Start <= Date && (p.End is not { } end || Date < end);
             }
+
+            return false;
         }
     }
 }

BTCPayServer.Data/Data/PayoutProcessorData.cs

@@ -21,4 +21,9 @@ public class PayoutProcessorData
             .HasOne(o => o.Store)
             .WithMany(data => data.PayoutProcessors).OnDelete(DeleteBehavior.Cascade);
     }
+
+    public override string ToString()
+    {
+        return $"{Processor} {PaymentMethod} {StoreId}";
+    }
 }

BTCPayServer.Data/Data/StoreData.cs

@@ -47,5 +47,6 @@ namespace BTCPayServer.Data
         public IEnumerable<PayoutProcessorData> PayoutProcessors { get; set; }
         public IEnumerable<PayoutData> Payouts { get; set; }
         public IEnumerable<CustodianAccountData> CustodianAccounts { get; set; }
+        public IEnumerable<StoreSettingData> Settings { get; set; }
     }
 }

BTCPayServer.Data/Data/StoreSettingData.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+namespace BTCPayServer.Data;
+
+public class StoreSettingData
+{
+    public string Name { get; set; }
+    public string StoreId { get; set; }
+
+    public string Value { get; set; }
+
+    public StoreData Store { get; set; }
+        
+    public static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
+    {
+        builder.Entity<StoreSettingData>().HasKey(data => new { data.StoreId, data.Name });
+        builder.Entity<StoreSettingData>()
+            .HasOne(o => o.Store)
+            .WithMany(o => o.Settings).OnDelete(DeleteBehavior.Cascade);
+        if (databaseFacade.IsNpgsql())
+        {
+            builder.Entity<StoreSettingData>()
+                .Property(o => o.Value)
+                .HasColumnType("JSONB");
+        }
+    }
+}

BTCPayServer.Data/Data/WalletData.cs

@@ -1,7 +1,9 @@
+using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Data
 {
+    [Obsolete]
     public class WalletData
     {
         [System.ComponentModel.DataAnnotations.Key]

BTCPayServer.Data/Data/WalletObjectData.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+namespace BTCPayServer.Data
+{
+    public class WalletObjectData
+    {
+        public class Types
+        {
+            public const string Label = "label";
+            public const string Tx = "tx";
+            public const string Payjoin = "payjoin";
+            public const string Invoice = "invoice";
+            public const string PaymentRequest = "payment-request";
+            public const string App = "app";
+            public const string PayjoinExposed = "pj-exposed";
+            public const string Payout = "payout";
+            public const string PullPayment = "pull-payment";
+        }
+        public string WalletId { get; set; }
+        public string Type { get; set; }
+        public string Id { get; set; }
+        public string Data { get; set; }
+
+        public List<WalletObjectLinkData> ChildLinks { get; set; }
+        public List<WalletObjectLinkData> ParentLinks { get; set; }
+
+        public IEnumerable<(string type, string id, string linkdata, string objectdata)> GetLinks()
+        {
+            if (ChildLinks is not null)
+                foreach (var c in ChildLinks)
+                {
+                    yield return (c.ChildType, c.ChildId, c.Data, c.Child?.Data);
+                }
+            if (ParentLinks is not null)
+                foreach (var c in ParentLinks)
+                {
+                    yield return (c.ParentType, c.ParentId, c.Data, c.Parent?.Data);
+                }
+        }
+
+        public IEnumerable<WalletObjectData> GetNeighbours()
+        {
+            if (ChildLinks != null)
+                foreach (var c in ChildLinks)
+                {
+                    if (c.Child != null)
+                        yield return c.Child;
+                }
+            if (ParentLinks != null)
+                foreach (var c in ParentLinks)
+                {
+                    if (c.Parent != null)
+                        yield return c.Parent;
+                }
+        }
+
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
+        {
+            builder.Entity<WalletObjectData>().HasKey(o =>
+            new
+            {
+                o.WalletId,
+                o.Type,
+                o.Id,
+            });
+            builder.Entity<WalletObjectData>().HasIndex(o =>
+            new
+            {
+                o.Type,
+                o.Id
+            });
+
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<WalletObjectData>()
+                                .Property(o => o.Data)
+                                .HasColumnType("JSONB");
+            }
+        }
+    }
+}

BTCPayServer.Data/Data/WalletObjectLinkData.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+namespace BTCPayServer.Data
+{
+    public class WalletObjectLinkData
+    {
+        public string WalletId { get; set; }
+        public string ParentType { get; set; }
+        public string ParentId { get; set; }
+        public string ChildType { get; set; }
+        public string ChildId { get; set; }
+        public string Data { get; set; }
+
+        public WalletObjectData Parent { get; set; }
+        public WalletObjectData Child { get; set; }
+
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
+        {
+            builder.Entity<WalletObjectLinkData>().HasKey(o =>
+            new
+            {
+                o.WalletId,
+                o.ParentType,
+                o.ParentId,
+                o.ChildType,
+                o.ChildId,
+            });
+            builder.Entity<WalletObjectLinkData>().HasIndex(o => new
+            {
+                o.WalletId,
+                o.ChildType,
+                o.ChildId,
+            });
+
+            builder.Entity<WalletObjectLinkData>()
+                .HasOne(o => o.Parent)
+                .WithMany(o => o.ChildLinks)
+                .HasForeignKey(o => new { o.WalletId, o.ParentType, o.ParentId })
+                .OnDelete(DeleteBehavior.Cascade);
+
+            builder.Entity<WalletObjectLinkData>()
+                .HasOne(o => o.Child)
+                .WithMany(o => o.ParentLinks)
+                .HasForeignKey(o => new { o.WalletId, o.ChildType, o.ChildId })
+                .OnDelete(DeleteBehavior.Cascade);
+
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<WalletObjectLinkData>()
+                                .Property(o => o.Data)
+                                .HasColumnType("JSONB");
+            }
+        }
+    }
+}

BTCPayServer.Data/Data/WalletTransactionData.cs

@@ -1,7 +1,9 @@
+using System;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data
 {
+    [Obsolete]
     public class WalletTransactionData
     {
         public string WalletDataId { get; set; }

BTCPayServer.Data/Migrations/20220610090843_AddSettingsToStore.cs

@@ -0,0 +1,43 @@
+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("20220610090843_AddSettingsToStore")]
+    public partial class AddSettingsToStore : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "StoreSettings",
+                columns: table => new
+                {
+                    Name = table.Column<string>(type: "TEXT", nullable: false),
+                    StoreId = table.Column<string>(type: "TEXT", nullable: false),
+                    Value = table.Column<string>(type: migrationBuilder.IsNpgsql() ? "JSONB" : "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_StoreSettings", x => new { x.StoreId, x.Name });
+                    table.ForeignKey(
+                        name: "FK_StoreSettings_Stores_StoreId",
+                        column: x => x.StoreId,
+                        principalTable: "Stores",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "StoreSettings");
+        }
+    }
+}

BTCPayServer.Data/Migrations/20220929132704_label.cs

@@ -0,0 +1,81 @@
+// <auto-generated />
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20220929132704_label")]
+    public partial class label : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "WalletObjects",
+                columns: table => new
+                {
+                    WalletId = table.Column<string>(type: "TEXT", nullable: false),
+                    Type = table.Column<string>(type: "TEXT", nullable: false),
+                    Id = table.Column<string>(type: "TEXT", nullable: false),
+                    Data = table.Column<string>(type: migrationBuilder.IsNpgsql() ? "JSONB" : "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WalletObjects", x => new { x.WalletId, x.Type, x.Id });
+                });
+            migrationBuilder.CreateIndex(
+                name: "IX_WalletObjects_Type_Id",
+                table: "WalletObjects",
+                columns: new[] { "Type", "Id" });
+
+            migrationBuilder.CreateTable(
+                name: "WalletObjectLinks",
+                columns: table => new
+                {
+                    WalletId = table.Column<string>(type: "TEXT", nullable: false),
+                    ParentType = table.Column<string>(type: "TEXT", nullable: false),
+                    ParentId = table.Column<string>(type: "TEXT", nullable: false),
+                    ChildType = table.Column<string>(type: "TEXT", nullable: false),
+                    ChildId = table.Column<string>(type: "TEXT", nullable: false),
+                    Data = table.Column<string>(type: migrationBuilder.IsNpgsql() ? "JSONB" : "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WalletObjectLinks", x => new { x.WalletId, x.ParentType, x.ParentId, x.ChildType, x.ChildId });
+                    table.ForeignKey(
+                        name: "FK_WalletObjectLinks_WalletObjects_WalletId_ChildType_ChildId",
+                        columns: x => new { x.WalletId, x.ChildType, x.ChildId },
+                        principalTable: "WalletObjects",
+                        principalColumns: new[] { "WalletId", "Type", "Id" },
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_WalletObjectLinks_WalletObjects_WalletId_ParentType_ParentId",
+                        columns: x => new { x.WalletId, x.ParentType, x.ParentId },
+                        principalTable: "WalletObjects",
+                        principalColumns: new[] { "WalletId", "Type", "Id" },
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WalletObjectLinks_WalletId_ChildType_ChildId",
+                table: "WalletObjectLinks",
+                columns: new[] { "WalletId", "ChildType", "ChildId" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "WalletObjectLinks");
+
+            migrationBuilder.DropTable(
+                name: "WalletObjects");
+        }
+    }
+}

BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -16,7 +16,7 @@ namespace BTCPayServer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "6.0.1");
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.9");
 
             modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
                 {
@@ -189,6 +189,7 @@ namespace BTCPayServer.Migrations
                         .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
+                        .IsRequired()
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
@@ -746,6 +747,22 @@ namespace BTCPayServer.Migrations
                     b.ToTable("Files");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.StoreSettingData", b =>
+                {
+                    b.Property<string>("StoreId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("StoreId", "Name");
+
+                    b.ToTable("StoreSettings");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.StoreWebhookData", b =>
                 {
                     b.Property<string>("StoreId")
@@ -829,6 +846,54 @@ namespace BTCPayServer.Migrations
                     b.ToTable("Wallets");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.WalletObjectData", b =>
+                {
+                    b.Property<string>("WalletId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("WalletId", "Type", "Id");
+
+                    b.HasIndex("Type", "Id");
+
+                    b.ToTable("WalletObjects");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.WalletObjectLinkData", b =>
+                {
+                    b.Property<string>("WalletId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ParentType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChildType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChildId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("WalletId", "ParentType", "ParentId", "ChildType", "ChildId");
+
+                    b.HasIndex("WalletId", "ChildType", "ChildId");
+
+                    b.ToTable("WalletObjectLinks");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.WalletTransactionData", b =>
                 {
                     b.Property<string>("WalletDataId")
@@ -1258,6 +1323,17 @@ namespace BTCPayServer.Migrations
                     b.Navigation("ApplicationUser");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.StoreSettingData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "Store")
+                        .WithMany("Settings")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Store");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.StoreWebhookData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "Store")
@@ -1306,6 +1382,25 @@ namespace BTCPayServer.Migrations
                     b.Navigation("StoreData");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.WalletObjectLinkData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.WalletObjectData", "Child")
+                        .WithMany("ParentLinks")
+                        .HasForeignKey("WalletId", "ChildType", "ChildId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BTCPayServer.Data.WalletObjectData", "Parent")
+                        .WithMany("ChildLinks")
+                        .HasForeignKey("WalletId", "ParentType", "ParentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Child");
+
+                    b.Navigation("Parent");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.WalletTransactionData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.WalletData", "WalletData")
@@ -1438,6 +1533,8 @@ namespace BTCPayServer.Migrations
 
                     b.Navigation("PullPayments");
 
+                    b.Navigation("Settings");
+
                     b.Navigation("UserStores");
                 });
 
@@ -1446,6 +1543,13 @@ namespace BTCPayServer.Migrations
                     b.Navigation("WalletTransactions");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.WalletObjectData", b =>
+                {
+                    b.Navigation("ChildLinks");
+
+                    b.Navigation("ParentLinks");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.WebhookData", b =>
                 {
                     b.Navigation("Deliveries");

BTCPayServer.PluginPacker/BTCPayServer.PluginPacker.csproj

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

BTCPayServer.PluginPacker/Program.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Contracts;
+using McMaster.NETCore.Plugins;
 using NBitcoin.Crypto;
 using NBitcoin.DataEncoders;
 using NBitcoin.Secp256k1;
@@ -33,7 +34,8 @@ namespace BTCPayServer.PluginPacker
                 throw new Exception($"{rootDLLPath} could not be found");
             }
 
-            var assembly = Assembly.LoadFrom(rootDLLPath);
+            var plugin = PluginLoader.CreateFromAssemblyFile(rootDLLPath, false, new[] { typeof(IBTCPayServerPlugin) });
+            var assembly = plugin.LoadAssembly(name);
             var extension = GetAllExtensionTypesFromAssembly(assembly).FirstOrDefault();
             if (extension is null)
             {
@@ -66,31 +68,45 @@ namespace BTCPayServer.PluginPacker
                 File.Delete(sha256dirs);
             }
             await File.WriteAllTextAsync(sha256dirs, sha256sums.ToString());
+            
+            // try Windows executable first, fall back to macOS/Linux PowerShell
             try
             {
-                Process cmd = new();
-                cmd.StartInfo.FileName = "powershell.exe";
-                cmd.StartInfo.RedirectStandardInput = true;
-                cmd.StartInfo.RedirectStandardOutput = true;
-                cmd.StartInfo.CreateNoWindow = false;
-                cmd.StartInfo.UseShellExecute = false;
-                cmd.Start();
-                
-                await cmd.StandardInput.WriteLineAsync($"cat {sha256dirs} | gpg -s > {Path.Combine(outputDir, "SHA256SUMS.asc")}");
-                await cmd.StandardInput.FlushAsync();
-                cmd.StandardInput.Close();
-                await cmd.WaitForExitAsync();
-                Console.WriteLine(await cmd.StandardOutput.ReadToEndAsync());
-
+                await CreateShasums("powershell.exe", sha256dirs, outputDir);
             }
-            catch (Exception e)
+            catch (Exception)
             {
-                Console.WriteLine($"Attempted to sign hashes with gpg but maybe powershell is not installed?\n{e.Message}");
+                try
+                {
+                    await CreateShasums("bash", sha256dirs, outputDir);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine(
+                        $"Attempted to sign hashes with gpg but maybe powershell is not installed?\n{ex.Message}");
+                }
             }
             
             Console.WriteLine($"Created {outputFile}.btcpay at {directory}");
         }
 
+        private static async Task CreateShasums(string exec, string sha256dirs, string outputDir)
+        {
+            Process cmd = new();
+            cmd.StartInfo.FileName = exec;
+            cmd.StartInfo.RedirectStandardInput = true;
+            cmd.StartInfo.RedirectStandardOutput = true;
+            cmd.StartInfo.CreateNoWindow = false;
+            cmd.StartInfo.UseShellExecute = false;
+            cmd.Start();
+
+            await cmd.StandardInput.WriteLineAsync($"cat {sha256dirs} | gpg -s > {Path.Combine(outputDir, "SHA256SUMS.asc")}");
+            await cmd.StandardInput.FlushAsync();
+            cmd.StandardInput.Close();
+            await cmd.WaitForExitAsync();
+            Console.WriteLine(await cmd.StandardOutput.ReadToEndAsync());
+        }
+
         private static Type[] GetAllExtensionTypesFromAssembly(Assembly assembly)
         {
             return assembly.GetTypes().Where(type =>

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

@@ -13,7 +13,7 @@
       <EmbeddedResource Include="Resources\**" />
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.9">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>

BTCPayServer.Plugins.Test/TestExtension.cs

@@ -19,6 +19,7 @@ namespace BTCPayServer.Plugins.Test
         {
             services.AddSingleton<IUIExtension>(new UIExtension("TestExtensionNavExtension", "header-nav"));
             services.AddHostedService<ApplicationPartsLogger>();
+            services.AddHostedService<TestPluginMigrationRunner>();
             services.AddSingleton<TestPluginService>();
             services.AddSingleton<TestPluginDbContextFactory>();
             services.AddDbContext<TestPluginDbContext>((provider, o) =>
@@ -27,13 +28,5 @@ namespace BTCPayServer.Plugins.Test
                 factory.ConfigureBuilder(o);
             });
         }
-
-        public override void Execute(IApplicationBuilder applicationBuilder, IServiceProvider applicationBuilderApplicationServices)
-        {
-            base.Execute(applicationBuilder, applicationBuilderApplicationServices);
-            applicationBuilderApplicationServices.GetService<TestPluginDbContextFactory>().CreateContext().Database.Migrate();
-            applicationBuilderApplicationServices.GetService<TestPluginService>().AddTestDataRecord().GetAwaiter().GetResult();
-
-        }
     }
 }

BTCPayServer.Plugins.Test/TestPluginMigrationRunner.cs

@@ -0,0 +1,45 @@
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Abstractions.Contracts;
+using BTCPayServer.Plugins.Test.Services;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Hosting;
+
+namespace BTCPayServer.Plugins.Test;
+
+public class TestPluginMigrationRunner:IHostedService
+{
+    public class TestPluginDataMigrationHistory
+    {
+        public bool UpdatedSomething { get; set; }
+    }
+    private readonly TestPluginDbContextFactory _testPluginDbContextFactory;
+    private readonly ISettingsRepository _settingsRepository;
+    private readonly TestPluginService _testPluginService;
+
+    public TestPluginMigrationRunner(TestPluginDbContextFactory testPluginDbContextFactory, ISettingsRepository settingsRepository, TestPluginService testPluginService)
+    {
+        _testPluginDbContextFactory = testPluginDbContextFactory;
+        _settingsRepository = settingsRepository;
+        _testPluginService = testPluginService;
+    }
+    public async Task StartAsync(CancellationToken cancellationToken)
+    {
+        var settings = await _settingsRepository.GetSettingAsync<TestPluginDataMigrationHistory>() ??
+                       new TestPluginDataMigrationHistory();
+        await using var ctx = _testPluginDbContextFactory.CreateContext();
+        await ctx.Database.MigrateAsync(cancellationToken: cancellationToken);
+        if (!settings.UpdatedSomething)
+        {
+            await _testPluginService.AddTestDataRecord();
+            settings.UpdatedSomething = true;
+            await _settingsRepository.UpdateSetting(settings);
+        }
+            
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
+    }
+}