Adding ability to print vouchers for Pull Payments if it's supported

Allowing more space for the break, that is useful especially on Lightning invoices (Destination)

.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

.editorconfig

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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,14 @@
 blank_issues_enabled: true
 contact_links:
-  - name: 🚀 Discussions
-    url: https://github.com/btcpayserver/btcpayserver/discussions
-    about: Technical discussions, questions and feature requests
+  - name: 💡 Request a feature
+    url: https://github.com/btcpayserver/btcpayserver/discussions/categories/ideas-feature-requests
+    about: Submit a feature request or vote on ideas posted by others. Features with most upvotes become roadmap candidates
+  - name: 🧑‍💻 Ask a technical question
+    url: https://github.com/btcpayserver/btcpayserver/discussions/new?category=technical-support
+    about: If you're experiencing a technical problem post it to our community support forum
+  - name: 🔌 Report a problem with a plugin
+    url: https://github.com/btcpayserver/btcpayserver/discussions/new?category=plugins-integrations
+    about: Experiencing a problem with a third-party plugin? Post it here and we will tag their developers to assist
   - name: 📝 Official Documentation
     url: https://docs.btcpayserver.org
     about: Check our documentation for answers to common questions

.github/codeql/codeql-config.yml

@@ -0,0 +1,2 @@
+paths-ignore:
+  - 'BTCPayServer/wwwroot/vendor/**/*.js'

.github/workflows/codeql.yml

@@ -0,0 +1,80 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+# Allow running tests manually. Usefull if scan failure, or need to rescan before next scheduled date.
+  workflow_dispatch:
+# We scan only on a schedule for now, can uncomment the following to scan on commit or PR merge later on if deemed appropriate.
+  # push:
+  #  branches: [ "master" ]
+  # pull_request:
+  #   branches: [ "master" ]
+  schedule:
+  # Scan every Monday 06:00 UTC.
+    - cron: '0 6 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.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,6 @@ BTCPayServer/testpwd
 .DS_Store
 Packed Plugins
 Plugins/packed
+
+BTCPayServer/wwwroot/swagger/v1/openapi.json
+BTCPayServer/appsettings.dev.json

.run/Pack Test Extension.run.xml

@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Pack Test Plugin" type="DotNetProject" factoryName=".NET Project" singleton="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/BTCPayServer.PluginPacker/bin/Debug/netcoreapp3.1/BTCPayServer.PluginPacker.dll" />
-    <option name="PROGRAM_PARAMETERS" value="../../../../BTCPayServer.Plugins.Test\bin\Debug\netcoreapp3.1 BTCPayServer.Plugins.Test &quot;../../../../Packed Plugins&quot;" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/BTCPayServer.PluginPacker/bin/Debug/netcoreapp3.1" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/BTCPayServer.PluginPacker/BTCPayServer.PluginPacker.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
-    <method v="2">
-      <option name="Build" default="false" projectName="BTCPayServer.Plugins.Test" projectPath="C:\Git\btcpayserver\BTCPayServer.Plugins.Test\BTCPayServer.Plugins.Test.csproj" />
-      <option name="Build" />
-    </method>
-  </configuration>
-</component>

BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj

@@ -31,10 +31,10 @@
     <None Include="icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HtmlSanitizer" Version="5.0.372" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5" />
+    <PackageReference Include="HtmlSanitizer" Version="8.0.723" />
+    <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>

BTCPayServer.Abstractions/CamelCaseSerializerSettings.cs

@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Abstractions
+{
+    public class CamelCaseSerializerSettings
+    {
+        static CamelCaseSerializerSettings()
+        {
+            Settings = new JsonSerializerSettings()
+            {
+                ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+            };
+            Serializer = JsonSerializer.Create(Settings);
+        }
+        public static readonly JsonSerializerSettings Settings;
+        public static readonly JsonSerializer Serializer;
+    }
+}

BTCPayServer.Abstractions/Configuration/DataDirectories.cs

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

BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Data.Common;
 using BTCPayServer.Abstractions.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -21,7 +22,6 @@ namespace BTCPayServer.Abstractions.Contracts
         }
 
         public abstract T CreateContext();
-
         class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator
         {
 #pragma warning disable EF1001 // Internal EF Core API usage.

BTCPayServer.Abstractions/Contracts/IFileService.cs

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

BTCPayServer.Abstractions/Contracts/INotificationHandler.cs

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

BTCPayServer.Abstractions/Contracts/IPluginHookService.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 
 namespace BTCPayServer.Abstractions.Contracts
@@ -6,5 +7,8 @@ namespace BTCPayServer.Abstractions.Contracts
     {
         Task ApplyAction(string hook, object args);
         Task<object> ApplyFilter(string hook, object args);
+
+        event EventHandler<(string hook, object args)> ActionInvoked;
+        event EventHandler<(string hook, object args)> FilterInvoked;
     }
 }

BTCPayServer.Abstractions/Contracts/IScopeProvider.cs

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

BTCPayServer.Abstractions/Contracts/IStoredFile.cs

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

BTCPayServer.Abstractions/Contracts/IUTXOLocker.cs

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

BTCPayServer.Abstractions/Custodians/Client/AssetQuoteResult.cs

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

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

@@ -2,10 +2,11 @@ namespace BTCPayServer.Abstractions.Custodians;
 
 public class AssetBalancesUnavailableException : CustodianApiException
 {
-    
     public AssetBalancesUnavailableException(System.Exception e) : base(500, "asset-balances-unavailable", $"Cannot fetch the asset balances: {e.Message}", e)
     {
     }
 
-    
+    public AssetBalancesUnavailableException(string errorMsg) : base(500, "asset-balances-unavailable", $"Cannot fetch the asset balances: {errorMsg}")
+    {
+    }
 }

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

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

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

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

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

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

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

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

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

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

BTCPayServer.Abstractions/Custodians/Client/SimulateWithdrawalResult.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using BTCPayServer.Client.Models;
+using BTCPayServer.JsonConverters;
+
+namespace BTCPayServer.Abstractions.Custodians.Client;
+
+public class SimulateWithdrawalResult
+{
+    public string PaymentMethod { get; }
+    public string Asset { get; }
+    public decimal MinQty { get; }
+    public decimal MaxQty { get; }
+
+    public List<LedgerEntryData> LedgerEntries { get; }
+
+    // Fee can be NULL if unknown.
+    public decimal? Fee { get; }
+
+    public SimulateWithdrawalResult(string paymentMethod, string asset, List<LedgerEntryData> ledgerEntries,
+        decimal minQty, decimal maxQty)
+    {
+        PaymentMethod = paymentMethod;
+        Asset = asset;
+        LedgerEntries = ledgerEntries;
+        MinQty = minQty;
+        MaxQty = maxQty;
+    }
+}

BTCPayServer.Abstractions/Custodians/ICanTrade.cs

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

BTCPayServer.Abstractions/Custodians/ICanWithdraw.cs

@@ -5,9 +5,14 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Abstractions.Custodians;
 
+/// <summary>
+/// Interface for custodians that can move funds to the store wallet.
+/// </summary>
 public interface ICanWithdraw
 {
-    public Task<WithdrawResult> WithdrawAsync(string paymentMethod, decimal amount, JObject config, CancellationToken cancellationToken);
+    public Task<WithdrawResult> WithdrawToStoreWalletAsync(string paymentMethod, decimal amount, JObject config, CancellationToken cancellationToken);
+
+    public Task<SimulateWithdrawalResult> SimulateWithdrawalAsync(string paymentMethod, decimal qty, JObject config, CancellationToken cancellationToken);
 
     public Task<WithdrawResult> GetWithdrawalInfoAsync(string paymentMethod, string withdrawalId, JObject config, CancellationToken cancellationToken);
 

BTCPayServer.Abstractions/Custodians/ICustodian.cs

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

BTCPayServer.Abstractions/Extensions/GreenfieldExtensions.cs

@@ -7,6 +7,10 @@ namespace BTCPayServer.Abstractions.Extensions;
 
 public static class GreenfieldExtensions
 {
+    public static IActionResult UserNotFound(this ControllerBase ctrl)
+    {
+        return ctrl.CreateAPIError(404, "user-not-found", "The user was not found");
+    }
     public static IActionResult CreateValidationError(this ControllerBase controller, ModelStateDictionary modelState)
     {
         return controller.UnprocessableEntity(modelState.ToGreenfieldValidationError());
@@ -30,12 +34,12 @@ public static class GreenfieldExtensions
     {
         return controller.BadRequest(new GreenfieldAPIError(errorCode, errorMessage));
     }
-        
+
     public static IActionResult CreateAPIError(this ControllerBase controller, int httpCode, string errorCode, string errorMessage)
     {
         return controller.StatusCode(httpCode, new GreenfieldAPIError(errorCode, errorMessage));
     }
-        
+
     public static IActionResult CreateAPIPermissionError(this ControllerBase controller, string missingPermission, string message = null)
     {
         return controller.StatusCode(403, new GreenfieldPermissionAPIError(missingPermission, message));

BTCPayServer.Abstractions/Extensions/HttpRequestExtensions.cs

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

BTCPayServer.Abstractions/Extensions/StringExtensions.cs

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

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,22 @@ 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 SetBlazorAllowed(this ViewDataDictionary viewData, bool allowed)
+        {
+            viewData["BlazorAllowed"] = allowed;
+        }
+        public static bool IsBlazorAllowed(this ViewDataDictionary viewData)
+        {
+            return viewData["BlazorAllowed"] is not false;
+        }
 
         public static void SetActivePage<T>(this ViewDataDictionary viewData, T activePage, string title = null, string activeId = null)
             where T : IConvertible
@@ -41,7 +59,7 @@ namespace BTCPayServer.Abstractions.Extensions
         {
             return IsActiveCategory(viewData, category.ToString(), id);
         }
-        
+
         public static string IsActiveCategory(this ViewDataDictionary viewData, string category, object id = null)
         {
             if (!viewData.ContainsKey(ACTIVE_CATEGORY_KEY))
@@ -52,7 +70,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,7 +78,15 @@ 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)
         {
             if (!viewData.ContainsKey(ACTIVE_PAGE_KEY))
@@ -72,29 +98,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 +135,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

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

BTCPayServer.Abstractions/Form/Field.cs

@@ -1,35 +1,64 @@
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Abstractions.Form;
 
-public abstract class Field
+public 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;
-    
+    public static Field Create(string label, string name, string value, bool required, string helpText, string type = "text")
+    {
+        return new Field
+        {
+            Label = label,
+            Name = name,
+            Value = value,
+            OriginalValue = value,
+            Required = required,
+            HelpText = helpText,
+            Type = 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;
-    
+
+    public bool Constant;
+
+    // HTML5 compatible type string like "text", "textarea", "email", "password", etc.
+    public string Type;
+
+    public static Field CreateFieldset()
+    {
+        return new Field { Type = "fieldset" };
+    }
+
     // The value field is what is currently in the DB or what the user entered, but possibly not saved yet due to validation errors.
     // 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;
 
+    public bool Required;
+
+    // The translated label of the field.
+    public string Label;
+
     // 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;
-    
+
+    [JsonExtensionData] public IDictionary<string, JToken> AdditionalData { get; set; }
+    public List<Field> Fields { get; set; } = new();
+
     // The field is considered "valid" if there are no validation errors
-    public List<string> ValidationErrors = new List<string>();
+    public List<string> ValidationErrors = new();
 
-    public bool Required = false;
-
-    public bool IsValid()
+    public virtual bool IsValid()
     {
-        return ValidationErrors.Count == 0;
+        return ValidationErrors.Count == 0 && Fields.All(field => field.IsValid());
     }
 }

BTCPayServer.Abstractions/Form/Fieldset.cs

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

@@ -1,60 +1,111 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json.Linq;
+using Npgsql.Internal.TypeHandlers.GeometricHandlers;
 
 namespace BTCPayServer.Abstractions.Form;
 
 public class Form
 {
+#nullable enable
+    public static Form Parse(string str)
+    {
+        ArgumentNullException.ThrowIfNull(str);
+        return JObject.Parse(str).ToObject<Form>(CamelCaseSerializerSettings.Serializer) ?? throw new InvalidOperationException("Impossible to deserialize Form");
+    }
+    public override string ToString()
+    {
+        return JObject.FromObject(this, CamelCaseSerializerSettings.Serializer).ToString(Newtonsoft.Json.Formatting.Indented);
+    }
+#nullable restore
 
     // Messages to be shown at the top of the form indicating user feedback like "Saved successfully" or "Please change X because of Y." or a warning, etc...
     public List<AlertMessage> TopMessages { get; set; } = new();
-    
+
     // Groups of fields in the form
-    public List<Fieldset> Fieldsets { get; set; } = new();
-    
+    public List<Field> Fields { 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;
+        if (TopMessages?.Any(t => t.Type == AlertMessage.AlertMessageType.Danger) is true)
+            return false;
+        return Fields.Select(f => f.IsValid()).All(o => o);
     }
 
-    public Field GetFieldByName(string name)
+    public Field GetFieldByFullName(string fullName)
     {
-        foreach (var fieldset in Fieldsets)
+        foreach (var f in GetAllFields())
         {
-            foreach (var field in fieldset.Fields)
-            {
-                if (name.Equals(field.Name))
-                {
-                    return field;
-                }
-            }
+            if (f.FullName == fullName)
+                return f.Field;
         }
         return null;
     }
 
-    public List<string> GetAllNames()
+    public IEnumerable<(string FullName, List<string> Path, Field Field)> GetAllFields()
     {
-        var names = new List<string>();
-        foreach (var fieldset in Fieldsets)
+        HashSet<string> nameReturned = new();
+        foreach (var f in GetAllFieldsCore(new List<string>(), Fields))
         {
-            foreach (var field in fieldset.Fields)
+            var fullName = string.Join('_', f.Path.Where(s => !string.IsNullOrEmpty(s)));
+            if (!nameReturned.Add(fullName))
+                continue;
+            yield return (fullName, f.Path, f.Field);
+        }
+    }
+
+    public bool ValidateFieldNames(out List<string> errors)
+    {
+        errors = new List<string>();
+        HashSet<string> nameReturned = new();
+        foreach (var f in GetAllFieldsCore(new List<string>(), Fields))
+        {
+            var fullName = string.Join('_', f.Path.Where(s => !string.IsNullOrEmpty(s)));
+            if (!nameReturned.Add(fullName))
             {
-                names.Add(field.Name);
+                errors.Add($"Form contains duplicate field names '{fullName}'");
             }
         }
-
-        return names;
+        return errors.Count == 0;
     }
+
+    IEnumerable<(List<string> Path, Field Field)> GetAllFieldsCore(List<string> path, List<Field> fields)
+    {
+        foreach (var field in fields)
+        {
+            List<string> thisPath = new(path.Count + 1);
+            thisPath.AddRange(path);
+            if (!string.IsNullOrEmpty(field.Name))
+            {
+                thisPath.Add(field.Name);
+                yield return (thisPath, field);
+            }
+            foreach (var descendant in GetAllFieldsCore(thisPath, field.Fields))
+            {
+                descendant.Field.Constant = field.Constant || descendant.Field.Constant;
+                yield return descendant;
+            }
+        }
+    }
+
+    public void ApplyValuesFromForm(IEnumerable<KeyValuePair<string, StringValues>> form)
+    {
+        var values = form.GroupBy(f => f.Key, f => f.Value).ToDictionary(g => g.Key, g => g.First());
+        foreach (var f in GetAllFields())
+        {
+            if (f.Field.Constant || !values.TryGetValue(f.FullName, out var val))
+                continue;
+
+            f.Field.Value = val;
+        }
+    }
+
+    
+
+
 }

BTCPayServer.Abstractions/Form/TextField.cs

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

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

BTCPayServer.Abstractions/Security/AuthorizationFilterHandle.cs

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

BTCPayServer.Abstractions/Security/ContentSecurityPolicies.cs

@@ -114,6 +114,11 @@ namespace BTCPayServer.Security
             _Policies.Add(policy);
         }
 
+        public void UnsafeEval()
+        {
+            Add("script-src", "'unsafe-eval'");
+        }
+
         public IEnumerable<ConsentSecurityPolicy> Rules => _Policies;
         public bool HasRules => _Policies.Count != 0;
 

BTCPayServer.Abstractions/Services/Safe.cs

@@ -1,4 +1,5 @@
-using Ganss.XSS;
+using System.Web;
+using Ganss.Xss;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
@@ -21,6 +22,11 @@ namespace BTCPayServer.Abstractions.Services
         {
             return _htmlHelper.Raw(_htmlSanitizer.Sanitize(value));
         }
+        
+        public IHtmlContent RawEncode(string value)
+        {
+            return _htmlHelper.Raw(HttpUtility.HtmlEncode(_htmlSanitizer.Sanitize(value)));
+        }
 
         public IHtmlContent Json(object model)
         {

BTCPayServer.Abstractions/TagHelpers/PermissionTagHelper.cs

@@ -6,31 +6,33 @@ using Microsoft.Extensions.Logging;
 
 namespace BTCPayServer.Abstractions.TagHelpers;
 
-[HtmlTargetElement(Attributes = nameof(Permission))]
+[HtmlTargetElement(Attributes = "[permission]")]
+[HtmlTargetElement(Attributes = "[not-permission]"  )]
 public class PermissionTagHelper : TagHelper
 {
     private readonly IAuthorizationService _authorizationService;
     private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly ILogger<PermissionTagHelper> _logger;
 
-    public PermissionTagHelper(IAuthorizationService authorizationService, IHttpContextAccessor httpContextAccessor, ILogger<PermissionTagHelper> logger)
+    public PermissionTagHelper(IAuthorizationService authorizationService, IHttpContextAccessor httpContextAccessor)
     {
         _authorizationService = authorizationService;
         _httpContextAccessor = httpContextAccessor;
-        _logger = logger;
     }
 
     public string Permission { get; set; }
+    public string NotPermission { get; set; }
     public string PermissionResource { get; set; }
+    
 
     public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        if (string.IsNullOrEmpty(Permission))
+        if (string.IsNullOrEmpty(Permission) && string.IsNullOrEmpty(NotPermission))
             return;
         if (_httpContextAccessor.HttpContext is null)
             return;
 
-        var key = $"{Permission}_{PermissionResource}";
+        var expectedResult = !string.IsNullOrEmpty(Permission);
+        var key = $"{Permission??NotPermission}_{PermissionResource}";
         if (!_httpContextAccessor.HttpContext.Items.TryGetValue(key, out var o) ||
             o is not AuthorizationResult res)
         {
@@ -39,7 +41,7 @@ public class PermissionTagHelper : TagHelper
                 Permission);
             _httpContextAccessor.HttpContext.Items.Add(key, res);
         }
-        if (!res.Succeeded)
+        if (expectedResult != res.Succeeded)
         {
             output.SuppressOutput();
         }

BTCPayServer.Abstractions/TagHelpers/SVGUse.cs

@@ -1,5 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
 using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc;
 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;
@@ -8,7 +15,7 @@ namespace BTCPayServer.Abstractions.TagHelpers;
 
 // Make sure that <svg><use href=/ are correctly working if rootpath is present
 [HtmlTargetElement("use", Attributes = "href")]
-public class SVGUse : UrlResolutionTagHelper
+public class SVGUse : UrlResolutionTagHelper2
 {
     private readonly IFileVersionProvider _fileVersionProvider;
 
@@ -16,10 +23,20 @@ public class SVGUse : UrlResolutionTagHelper
     {
         _fileVersionProvider = fileVersionProvider;
     }
+
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
         var attr = output.Attributes["href"].Value.ToString();
-        attr = _fileVersionProvider.AddFileVersionToPath(ViewContext.HttpContext.Request.PathBase, attr);
+        var symbolIndex = attr!.IndexOf("#", StringComparison.InvariantCulture);
+        var start = attr.IndexOf("~", StringComparison.InvariantCulture) + 1;
+        var length = (symbolIndex != -1 ? symbolIndex : attr.Length) - start;
+        var filePath = attr.Substring(start, length);
+        if (!string.IsNullOrEmpty(filePath))
+        {
+            var versioned = _fileVersionProvider.AddFileVersionToPath(ViewContext.HttpContext.Request.PathBase, filePath);
+            attr = attr.Replace(filePath, versioned);
+        }
         output.Attributes.SetAttribute("href", attr);
+        base.Process(context, output);
     }
 }

BTCPayServer.Abstractions/TagHelpers/UrlResolutionTagHelper2.cs

@@ -0,0 +1,314 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc;
+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.Abstractions.TagHelpers
+{
+    // A copy of https://github.com/dotnet/aspnetcore/blob/39f0e0b8f40b4754418f81aef0de58a9204a1fe5/src/Mvc/Mvc.Razor/src/TagHelpers/UrlResolutionTagHelper.cs
+    // slightly modified to also work on use tag.
+    public class UrlResolutionTagHelper2 : TagHelper
+    {
+        // Valid whitespace characters defined by the HTML5 spec.
+        private static readonly char[] ValidAttributeWhitespaceChars =
+            new[] { '\t', '\n', '\u000C', '\r', ' ' };
+        private static readonly Dictionary<string, string[]> ElementAttributeLookups =
+            new(StringComparer.OrdinalIgnoreCase)
+            {
+                { "use", new[] { "href" } },
+                { "a", new[] { "href" } },
+                { "applet", new[] { "archive" } },
+                { "area", new[] { "href" } },
+                { "audio", new[] { "src" } },
+                { "base", new[] { "href" } },
+                { "blockquote", new[] { "cite" } },
+                { "button", new[] { "formaction" } },
+                { "del", new[] { "cite" } },
+                { "embed", new[] { "src" } },
+                { "form", new[] { "action" } },
+                { "html", new[] { "manifest" } },
+                { "iframe", new[] { "src" } },
+                { "img", new[] { "src", "srcset" } },
+                { "input", new[] { "src", "formaction" } },
+                { "ins", new[] { "cite" } },
+                { "link", new[] { "href" } },
+                { "menuitem", new[] { "icon" } },
+                { "object", new[] { "archive", "data" } },
+                { "q", new[] { "cite" } },
+                { "script", new[] { "src" } },
+                { "source", new[] { "src", "srcset" } },
+                { "track", new[] { "src" } },
+                { "video", new[] { "poster", "src" } },
+            };
+
+        /// <summary>
+        /// Creates a new <see cref="UrlResolutionTagHelper"/>.
+        /// </summary>
+        /// <param name="urlHelperFactory">The <see cref="IUrlHelperFactory"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/>.</param>
+        public UrlResolutionTagHelper2(IUrlHelperFactory urlHelperFactory, HtmlEncoder htmlEncoder)
+        {
+            UrlHelperFactory = urlHelperFactory;
+            HtmlEncoder = htmlEncoder;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000 - 999;
+
+        /// <summary>
+        /// The <see cref="IUrlHelperFactory"/>.
+        /// </summary>
+        protected IUrlHelperFactory UrlHelperFactory { get; }
+
+        /// <summary>
+        /// The <see cref="HtmlEncoder"/>.
+        /// </summary>
+        protected HtmlEncoder HtmlEncoder { get; }
+
+        /// <summary>
+        /// The <see cref="ViewContext"/>.
+        /// </summary>
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; } = default!;
+
+        /// <inheritdoc />
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            ArgumentNullException.ThrowIfNull(context);
+            ArgumentNullException.ThrowIfNull(output);
+
+            if (output.TagName == null)
+            {
+                return;
+            }
+
+            if (ElementAttributeLookups.TryGetValue(output.TagName, out var attributeNames))
+            {
+                for (var i = 0; i < attributeNames.Length; i++)
+                {
+                    ProcessUrlAttribute(attributeNames[i], output);
+                }
+            }
+
+            // itemid can be present on any HTML element.
+            ProcessUrlAttribute("itemid", output);
+        }
+
+        /// <summary>
+        /// Resolves and updates URL values starting with '~/' (relative to the application's 'webroot' setting) for
+        /// <paramref name="output"/>'s <see cref="TagHelperOutput.Attributes"/> whose
+        /// <see cref="TagHelperAttribute.Name"/> is <paramref name="attributeName"/>.
+        /// </summary>
+        /// <param name="attributeName">The attribute name used to lookup values to resolve.</param>
+        /// <param name="output">The <see cref="TagHelperOutput"/>.</param>
+        protected void ProcessUrlAttribute(string attributeName, TagHelperOutput output)
+        {
+            ArgumentNullException.ThrowIfNull(attributeName);
+            ArgumentNullException.ThrowIfNull(output);
+
+            var attributes = output.Attributes;
+            // Read interface .Count once rather than per iteration
+            var attributesCount = attributes.Count;
+            for (var i = 0; i < attributesCount; i++)
+            {
+                var attribute = attributes[i];
+                if (!string.Equals(attribute.Name, attributeName, StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                if (attribute.Value is string stringValue)
+                {
+                    if (TryResolveUrl(stringValue, resolvedUrl: out string? resolvedUrl))
+                    {
+                        attributes[i] = new TagHelperAttribute(
+                            attribute.Name,
+                            resolvedUrl,
+                            attribute.ValueStyle);
+                    }
+                }
+                else
+                {
+                    if (attribute.Value is IHtmlContent htmlContent)
+                    {
+                        var htmlString = htmlContent as HtmlString;
+                        if (htmlString != null)
+                        {
+                            // No need for a StringWriter in this case.
+                            stringValue = htmlString.ToString();
+                        }
+                        else
+                        {
+                            using var writer = new StringWriter();
+                            htmlContent.WriteTo(writer, HtmlEncoder);
+                            stringValue = writer.ToString();
+                        }
+
+                        if (TryResolveUrl(stringValue, resolvedUrl: out IHtmlContent? resolvedUrl))
+                        {
+                            attributes[i] = new TagHelperAttribute(
+                                attribute.Name,
+                                resolvedUrl,
+                                attribute.ValueStyle);
+                        }
+                        else if (htmlString == null)
+                        {
+                            // Not a ~/ URL. Just avoid re-encoding the attribute value later.
+                            attributes[i] = new TagHelperAttribute(
+                                attribute.Name,
+                                new HtmlString(stringValue),
+                                attribute.ValueStyle);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Tries to resolve the given <paramref name="url"/> value relative to the application's 'webroot' setting.
+        /// </summary>
+        /// <param name="url">The URL to resolve.</param>
+        /// <param name="resolvedUrl">Absolute URL beginning with the application's virtual root. <c>null</c> if
+        /// <paramref name="url"/> could not be resolved.</param>
+        /// <returns><c>true</c> if the <paramref name="url"/> could be resolved; <c>false</c> otherwise.</returns>
+        protected bool TryResolveUrl(string url, out string? resolvedUrl)
+        {
+            resolvedUrl = null;
+            var start = FindRelativeStart(url);
+            if (start == -1)
+            {
+                return false;
+            }
+
+            var trimmedUrl = CreateTrimmedString(url, start);
+
+            var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext);
+            resolvedUrl = urlHelper.Content(trimmedUrl);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Tries to resolve the given <paramref name="url"/> value relative to the application's 'webroot' setting.
+        /// </summary>
+        /// <param name="url">The URL to resolve.</param>
+        /// <param name="resolvedUrl">
+        /// Absolute URL beginning with the application's virtual root. <c>null</c> if <paramref name="url"/> could
+        /// not be resolved.
+        /// </param>
+        /// <returns><c>true</c> if the <paramref name="url"/> could be resolved; <c>false</c> otherwise.</returns>
+        protected bool TryResolveUrl(string url, [NotNullWhen(true)] out IHtmlContent? resolvedUrl)
+        {
+            resolvedUrl = null;
+            var start = FindRelativeStart(url);
+            if (start == -1)
+            {
+                return false;
+            }
+
+            var trimmedUrl = CreateTrimmedString(url, start);
+
+            var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext);
+            var appRelativeUrl = urlHelper.Content(trimmedUrl);
+            var postTildeSlashUrlValue = trimmedUrl.Substring(2);
+
+            if (!appRelativeUrl.EndsWith(postTildeSlashUrlValue, StringComparison.Ordinal))
+            {
+                throw new InvalidOperationException();
+            }
+
+            resolvedUrl = new EncodeFirstSegmentContent(
+                appRelativeUrl,
+                appRelativeUrl.Length - postTildeSlashUrlValue.Length,
+                postTildeSlashUrlValue);
+
+            return true;
+        }
+
+        private static int FindRelativeStart(string url)
+        {
+            if (url == null || url.Length < 2)
+            {
+                return -1;
+            }
+
+            var maxTestLength = url.Length - 2;
+
+            var start = 0;
+            for (; start < url.Length; start++)
+            {
+                if (start > maxTestLength)
+                {
+                    return -1;
+                }
+
+                if (!IsCharWhitespace(url[start]))
+                {
+                    break;
+                }
+            }
+
+            // Before doing more work, ensure that the URL we're looking at is app-relative.
+            if (url[start] != '~' || url[start + 1] != '/')
+            {
+                return -1;
+            }
+
+            return start;
+        }
+
+        private static string CreateTrimmedString(string input, int start)
+        {
+            var end = input.Length - 1;
+            for (; end >= start; end--)
+            {
+                if (!IsCharWhitespace(input[end]))
+                {
+                    break;
+                }
+            }
+
+            var len = end - start + 1;
+
+            // Substring returns same string if start == 0 && len == Length
+            return input.Substring(start, len);
+        }
+
+        private static bool IsCharWhitespace(char ch)
+        {
+            return ValidAttributeWhitespaceChars.AsSpan().IndexOf(ch) != -1;
+        }
+
+        private sealed class EncodeFirstSegmentContent : IHtmlContent
+        {
+            private readonly string _firstSegment;
+            private readonly int _firstSegmentLength;
+            private readonly string _secondSegment;
+
+            public EncodeFirstSegmentContent(string firstSegment, int firstSegmentLength, string secondSegment)
+            {
+                _firstSegment = firstSegment;
+                _firstSegmentLength = firstSegmentLength;
+                _secondSegment = secondSegment;
+            }
+
+            public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+            {
+                encoder.Encode(writer, _firstSegment, 0, _firstSegmentLength);
+                writer.Write(_secondSegment);
+            }
+        }
+    }
+
+}

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -12,9 +12,11 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/btcpayserver/btcpayserver</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
+        <Configurations>Debug;Release;Altcoins-Debug;Altcoins-Release</Configurations>
+        <Platforms>AnyCPU</Platforms>
     </PropertyGroup>
   <PropertyGroup>
-    <Version Condition=" '$(Version)' == '' ">1.7.0</Version>
+    <Version Condition=" '$(Version)' == '' ">1.7.3</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -28,9 +30,9 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.3.8" />
-      <PackageReference Include="NBitcoin" Version="7.0.10" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.3.21" />
+      <PackageReference Include="NBitcoin" Version="7.0.24" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
   <ItemGroup>
     <None Include="icon.png" Pack="true" PackagePath="\" />

BTCPayServer.Client/BTCPayServerClient.APIKeys.cs

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

BTCPayServer.Client/BTCPayServerClient.Apps.cs

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

BTCPayServer.Client/BTCPayServerClient.CustodianAccounts.cs

@@ -50,7 +50,7 @@ namespace BTCPayServer.Client
             await HandleResponse(response);
         }
 
-        public virtual async Task<DepositAddressData> GetDepositAddress(string storeId, string accountId, string paymentMethod, CancellationToken token = default)
+        public virtual async Task<DepositAddressData> GetCustodianAccountDepositAddress(string storeId, string accountId, string paymentMethod, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/addresses/{paymentMethod}"), token);
             return await HandleResponse<DepositAddressData>(response);
@@ -58,7 +58,6 @@ namespace BTCPayServer.Client
 
         public virtual async Task<MarketTradeResponseData> MarketTradeCustodianAccountAsset(string storeId, string accountId, TradeRequestData request, CancellationToken token = default)
         {
-            
             //var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/users", null, request, HttpMethod.Post), token);
             //return await HandleResponse<ApplicationUserData>(response);
             var internalRequest = CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/market", null,
@@ -67,13 +66,13 @@ namespace BTCPayServer.Client
             return await HandleResponse<MarketTradeResponseData>(response);
         }
 
-        public virtual async Task<MarketTradeResponseData> GetTradeInfo(string storeId, string accountId, string tradeId, CancellationToken token = default)
+        public virtual async Task<MarketTradeResponseData> GetCustodianAccountTradeInfo(string storeId, string accountId, string tradeId, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/{tradeId}", method: HttpMethod.Get), token);
             return await HandleResponse<MarketTradeResponseData>(response);
         }
 
-        public virtual async Task<TradeQuoteResponseData> GetTradeQuote(string storeId, string accountId, string fromAsset, string toAsset, CancellationToken token = default)
+        public virtual async Task<TradeQuoteResponseData> GetCustodianAccountTradeQuote(string storeId, string accountId, string fromAsset, string toAsset, CancellationToken token = default)
         {
             var queryPayload = new Dictionary<string, object>();
             queryPayload.Add("fromAsset", fromAsset);
@@ -81,14 +80,20 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/quote", queryPayload), token);
             return await HandleResponse<TradeQuoteResponseData>(response);
         }
-        
-        public virtual async Task<WithdrawalResponseData> CreateWithdrawal(string storeId, string accountId,  WithdrawRequestData request, CancellationToken token = default)
+
+        public virtual async Task<WithdrawalResponseData> CreateCustodianAccountWithdrawal(string storeId, string accountId, WithdrawRequestData request, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/withdrawals", bodyPayload: request, method: HttpMethod.Post), token);
             return await HandleResponse<WithdrawalResponseData>(response);
         }
 
-        public virtual async Task<WithdrawalResponseData> GetWithdrawalInfo(string storeId, string accountId, string paymentMethod, string withdrawalId, CancellationToken token = default)
+        public virtual async Task<WithdrawalSimulationResponseData> SimulateCustodianAccountWithdrawal(string storeId, string accountId, WithdrawRequestData request, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/withdrawals/simulation", bodyPayload: request, method: HttpMethod.Post), token);
+            return await HandleResponse<WithdrawalSimulationResponseData>(response);
+        }
+
+        public virtual async Task<WithdrawalResponseData> GetCustodianAccountWithdrawalInfo(string storeId, string accountId, string paymentMethod, string withdrawalId, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/withdrawals/{paymentMethod}/{withdrawalId}", method: HttpMethod.Get), token);
             return await HandleResponse<WithdrawalResponseData>(response);

BTCPayServer.Client/BTCPayServerClient.Invoices.cs

@@ -128,5 +128,18 @@ namespace BTCPayServer.Client
                     method: HttpMethod.Post), token);
             await HandleResponse(response);
         }
+
+        public virtual async Task<PullPaymentData> RefundInvoice(
+            string storeId,
+            string invoiceId,
+            RefundInvoiceRequest request,
+            CancellationToken token = default
+        )
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/refund", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<PullPaymentData>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Lightning.Internal.cs

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

BTCPayServer.Client/BTCPayServerClient.Lightning.Store.cs

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

BTCPayServer.Client/BTCPayServerClient.LightningAddresses.cs

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

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.Objects.cs

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

@@ -55,7 +55,7 @@ namespace BTCPayServer.Client
         }
 
         public virtual async Task<IEnumerable<OnChainWalletTransactionData>> ShowOnChainWalletTransactions(
-            string storeId, string cryptoCode, TransactionStatus[] statusFilter = null, string labelFilter = null,
+            string storeId, string cryptoCode, TransactionStatus[] statusFilter = null, string labelFilter = null, int skip = 0,
             CancellationToken token = default)
         {
             var query = new Dictionary<string, object>();
@@ -63,9 +63,14 @@ namespace BTCPayServer.Client
             {
                 query.Add(nameof(statusFilter), statusFilter);
             }
-            if (labelFilter != null) {
+            if (labelFilter != null)
+            {
                 query.Add(nameof(labelFilter), labelFilter);
             }
+            if (skip != 0)
+            {
+                query.Add(nameof(skip), skip);
+            }
             var response =
                 await _httpClient.SendAsync(
                     CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions", query), token);

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

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

BTCPayServer.Client/BTCPayServerClient.ServerInfo.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
@@ -11,5 +12,11 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/server/info"), token);
             return await HandleResponse<ServerInfoData>(response);
         }
+        
+        public virtual async Task<List<RoleData>> GetServerRoles(CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/server/roles"), token);
+            return await HandleResponse<List<RoleData>>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.StorePayoutProcessors.cs

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

BTCPayServer.Client/BTCPayServerClient.StoreRatesConfiguration.cs

@@ -0,0 +1,64 @@
+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<StoreRateResult>> 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<StoreRateResult>>(response);
+        }
+
+        public virtual async Task<List<StoreRateResult>> GetStoreRates(string storeId, string[] currencyPair,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/rates",
+                    queryPayload: new Dictionary<string, object>() { { "currencyPair", currencyPair } },
+                    method: HttpMethod.Get),
+                token);
+            return await HandleResponse<List<StoreRateResult>>(response);
+        }
+    }
+}

BTCPayServer.Client/BTCPayServerClient.StoreUsers.cs

@@ -9,6 +9,13 @@ namespace BTCPayServer.Client
 {
     public partial class BTCPayServerClient
     {
+        public virtual async Task<List<RoleData>> GetStoreRoles(string storeId,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/roles"), token);
+            return await HandleResponse<List<RoleData>>(response);
+        }
+        
         public virtual async Task<IEnumerable<StoreUserData>> GetStoreUsers(string storeId,
             CancellationToken token = default)
         {

BTCPayServer.Client/BTCPayServerClient.Users.cs

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

BTCPayServer.Client/BTCPayServerClient.cs

@@ -51,7 +51,8 @@ namespace BTCPayServer.Client
             {
                 if (message.StatusCode == System.Net.HttpStatusCode.UnprocessableEntity)
                 {
-                    var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(await message.Content.ReadAsStringAsync());
+                    var aa = await message.Content.ReadAsStringAsync();
+                    var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(aa);
                     throw new GreenfieldValidationException(err);
                 }
                 if (message.StatusCode == System.Net.HttpStatusCode.Forbidden)

BTCPayServer.Client/JsonConverters/NumericStringJsonConverter.cs

@@ -30,9 +30,9 @@ namespace BTCPayServer.JsonConverters
                 case JTokenType.Integer:
                 case JTokenType.String:
                     if (objectType == typeof(decimal) || objectType == typeof(decimal?))
-                        return decimal.Parse(token.ToString(), CultureInfo.InvariantCulture);
+                        return decimal.Parse(token.ToString(), NumberStyles.Any, CultureInfo.InvariantCulture);
                     if (objectType == typeof(double) || objectType == typeof(double?))
-                        return double.Parse(token.ToString(), CultureInfo.InvariantCulture);
+                        return double.Parse(token.ToString(), NumberStyles.Any, CultureInfo.InvariantCulture);
                     throw new JsonSerializationException("Unexpected object type: " + objectType);
                 case JTokenType.Null when objectType == typeof(decimal?) || objectType == typeof(double?):
                     return null;

BTCPayServer.Client/JsonConverters/TradeQuantityJsonConverter.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Globalization;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Lightning;
+using NBitcoin.JsonConverters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Client.JsonConverters
+{
+    public class TradeQuantityJsonConverter : JsonConverter<TradeQuantity>
+    {
+        public override TradeQuantity ReadJson(JsonReader reader, Type objectType, TradeQuantity existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            JToken token = JToken.Load(reader);
+            switch (token.Type)
+            {
+                case JTokenType.Float:
+                case JTokenType.Integer:
+                case JTokenType.String:
+                    if (TradeQuantity.TryParse(token.ToString(), out var q))
+                        return q;
+                    break;
+                case JTokenType.Null:
+                    return null;
+            }
+            throw new JsonObjectException("Invalid TradeQuantity, expected string. Expected: \"1.50\" or \"50%\"", reader);
+        }
+
+        public override void WriteJson(JsonWriter writer, TradeQuantity value, JsonSerializer serializer)
+        {
+            if (value is not null)
+                writer.WriteValue(value.ToString());
+        }
+    }
+}

BTCPayServer.Client/Models/AssetPairData.cs

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

BTCPayServer.Client/Models/CreateAppRequest.cs

@@ -1,3 +1,4 @@
+using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -25,8 +26,10 @@ namespace BTCPayServer.Client.Models
         public string Template { get; set; } = null;
         [JsonConverter(typeof(StringEnumConverter))]
         public PosViewType DefaultView { get; set; }
-        public bool ShowCustomAmount { get; set; } = true;
+        public bool ShowCustomAmount { get; set; } = false;
         public bool ShowDiscount { get; set; } = true;
+        public bool ShowSearch { get; set; } = true;
+        public bool ShowCategories { get; set; } = true;
         public bool EnableTips { get; set; } = true;
         public string CustomAmountPayButtonText { get; set; } = null;
         public string FixedAmountPayButtonText { get; set; } = null;
@@ -36,6 +39,50 @@ namespace BTCPayServer.Client.Models
         public string RedirectUrl { get; set; } = null;
         public bool? RedirectAutomatically { get; set; } = null;
         public bool? RequiresRefundEmail { get; set; } = null;
+        public bool? Archived { get; set; } = null;
+        public string FormId { 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 bool? Archived { get; set; } = null;
+        public string[] Sounds { get; set; } = null;
+        public string[] AnimationColors { get; set; } = null;
     }
 }

BTCPayServer.Client/Models/CreateLightningInvoiceRequest.cs

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

BTCPayServer.Client/Models/CreatePayoutThroughStoreRequest.cs

@@ -1,8 +1,11 @@
 #nullable enable
+using Newtonsoft.Json.Linq;
+
 namespace BTCPayServer.Client.Models;
 
 public class CreatePayoutThroughStoreRequest : CreatePayoutRequest
 {
     public string? PullPaymentId { get; set; }
     public bool? Approved { get; set; }
+    public JObject? Metadata { get; set; }
 }

BTCPayServer.Client/Models/CustodianAccountBaseData.cs

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

BTCPayServer.Client/Models/CustodianAccountResponse.cs

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

BTCPayServer.Client/Models/CustodianData.cs

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

BTCPayServer.Client/Models/DepositAddressData.cs

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

BTCPayServer.Client/Models/InvoiceData.cs

@@ -85,6 +85,8 @@ namespace BTCPayServer.Client.Models
             public bool? RedirectAutomatically { get; set; }
             public bool? RequiresRefundEmail { get; set; } = null;
             public string DefaultLanguage { get; set; }
+            public CheckoutType? CheckoutType { get; set; }
+            public bool? LazyPaymentMethods { get; set; }
         }
     }
     public class InvoiceData : InvoiceDataBase

BTCPayServer.Client/Models/InvoiceExceptionStatus.cs

@@ -1,12 +1,12 @@
-namespace BTCPayServer.Client.Models
+namespace BTCPayServer.Client.Models;
+public enum InvoiceExceptionStatus
 {
-    public enum InvoiceExceptionStatus
-    {
-        None,
-        PaidLate,
-        PaidPartial,
-        Marked,
-        Invalid,
-        PaidOver
-    }
+    None,
+    PaidLate,
+    PaidPartial,
+    Marked,
+    Invalid,
+    PaidOver
 }
+
+

BTCPayServer.Client/Models/LNURLPayPaymentMethodBaseData.cs

@@ -1,9 +1,12 @@
+using Newtonsoft.Json;
+
 namespace BTCPayServer.Client.Models
 {
     public class LNURLPayPaymentMethodBaseData
     {
         public bool UseBech32Scheme { get; set; }
-        public bool EnableForStandardInvoices { get; set; }
+        
+        [JsonProperty("lud12Enabled")]
         public bool LUD12Enabled { get; set; }
 
         public LNURLPayPaymentMethodBaseData()

BTCPayServer.Client/Models/LNURLPayPaymentMethodData.cs

@@ -16,12 +16,12 @@ namespace BTCPayServer.Client.Models
         {
         }
 
-        public LNURLPayPaymentMethodData(string cryptoCode, bool enabled, bool useBech32Scheme, bool enableForStandardInvoices)
+        public LNURLPayPaymentMethodData(string cryptoCode, bool enabled, bool useBech32Scheme, bool lud12Enabled)
         {
             Enabled = enabled;
             CryptoCode = cryptoCode;
             UseBech32Scheme = useBech32Scheme;
-            EnableForStandardInvoices = enableForStandardInvoices;
+            LUD12Enabled = lud12Enabled;
         }
     }
 }

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

@@ -1,3 +1,4 @@
+using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -6,6 +7,7 @@ namespace BTCPayServer.Client.Models;
 public class LedgerEntryData
 {
     public string Asset { get; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
     public decimal Qty { get; }
 
     [JsonConverter(typeof(StringEnumConverter))]

BTCPayServer.Client/Models/LightningAddressData.cs

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

BTCPayServer.Client/Models/LightningAutomatedPayoutSettings.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using BTCPayServer.Client.JsonConverters;
 using Newtonsoft.Json;
 
@@ -7,7 +7,12 @@ namespace BTCPayServer.Client.Models;
 public class LightningAutomatedPayoutSettings
 {
     public string PaymentMethod { get; set; }
-        
+
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }
+
+    public int? CancelPayoutAfterFailures { get; set; }
+    [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+    public bool  ProcessNewPayoutsInstantly { 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;
@@ -16,8 +17,14 @@ namespace BTCPayServer.Client.Models
         [JsonProperty("BOLT11")]
         public string BOLT11 { get; set; }
 
+        public string PaymentHash { get; set; }
+
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public string Preimage { get; set; }
+
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset? PaidAt { get; set; }
+
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset ExpiresAt { get; set; }
 
@@ -26,5 +33,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/LightningNetworkPaymentMethodBaseData.cs

@@ -4,7 +4,6 @@ namespace BTCPayServer.Client.Models
     {
 
         public string ConnectionString { get; set; }
-        public bool DisableBOLT11PaymentOption { get; set; }
         public LightningNetworkPaymentMethodBaseData()
         {
 

BTCPayServer.Client/Models/LightningNetworkPaymentMethodData.cs

@@ -16,13 +16,12 @@ namespace BTCPayServer.Client.Models
         {
         }
 
-        public LightningNetworkPaymentMethodData(string cryptoCode, string connectionString, bool enabled, string paymentMethod, bool disableBOLT11PaymentOption)
+        public LightningNetworkPaymentMethodData(string cryptoCode, string connectionString, bool enabled, string paymentMethod)
         {
             Enabled = enabled;
             CryptoCode = cryptoCode;
             ConnectionString = connectionString;
             PaymentMethod = paymentMethod;
-            DisableBOLT11PaymentOption = disableBOLT11PaymentOption;
         }
 
         public string PaymentMethod { get; set; }

BTCPayServer.Client/Models/LightningNodeBalanceData.cs

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

BTCPayServer.Client/Models/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/LightningPaymentData.cs

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

BTCPayServer.Client/Models/LockUserRequest.cs

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

BTCPayServer.Client/Models/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/MarketTradeResponseData.cs

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

BTCPayServer.Client/Models/NotificationData.cs

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

BTCPayServer.Client/Models/OnChainAutomatedPayoutSettings.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using BTCPayServer.Client.JsonConverters;
 using Newtonsoft.Json;
 
@@ -7,7 +7,13 @@ namespace BTCPayServer.Client.Models;
 public class OnChainAutomatedPayoutSettings
 {
     public string PaymentMethod { get; set; }
-       
+
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }
+
+    public int? FeeBlockTarget { get; set; }
+    [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+    public decimal Threshold { get; set; }
+    [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+    public bool  ProcessNewPayoutsInstantly { 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/OpenLightningChannelRequest.cs

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

BTCPayServer.Client/Models/PayLightningInvoiceRequest.cs

@@ -1,3 +1,4 @@
+using System;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.JsonConverters;
 using BTCPayServer.Lightning;
@@ -10,14 +11,17 @@ namespace BTCPayServer.Client.Models
     {
         [JsonProperty("BOLT11")]
         public string BOLT11 { get; set; }
-        
+
         [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
         public float? MaxFeePercent { get; set; }
-        
+
         [JsonConverter(typeof(MoneyJsonConverter))]
         public Money MaxFeeFlat { get; set; }
-    
+
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
+
+        [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/PaymentMethodCriteriaData.cs

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

BTCPayServer.Client/Models/PaymentRequestBaseData.cs

@@ -24,5 +24,9 @@ namespace BTCPayServer.Client.Models
 
         [JsonExtensionData]
         public IDictionary<string, JToken> AdditionalData { get; set; }
+
+        public string FormId { get; set; }
+
+        public JObject FormResponse { get; set; }
     }
 }

BTCPayServer.Client/Models/PaymentRequestData.cs

@@ -7,17 +7,17 @@ namespace BTCPayServer.Client.Models
     public class PaymentRequestData : PaymentRequestBaseData
     {
         [JsonConverter(typeof(StringEnumConverter))]
-        public PaymentRequestData.PaymentRequestStatus Status { get; set; }
+        public PaymentRequestStatus Status { get; set; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset CreatedTime { get; set; }
         public string Id { get; set; }
         public bool Archived { get; set; }
-
         public enum PaymentRequestStatus
         {
             Pending = 0,
             Completed = 1,
-            Expired = 2
+            Expired = 2,
+            Processing = 3
         }
     }
 }

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,7 @@ namespace BTCPayServer.Client.Models
         [JsonConverter(typeof(StringEnumConverter))]
         public PayoutState State { get; set; }
         public int Revision { get; set; }
+        public JObject PaymentProof { get; set; }
+        public JObject Metadata { get; set; }
     }
 }