Update greenfield-development.md

Co-authored-by: Dennis Reimann <mail@dennisreimann.de>

.circleci/can-build.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-
-echo "Checking if it is possible to build Bitcoin only..."
-cd ../BTCPayServer.Tests
-docker-compose -f "docker-compose.yml" build

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
       - checkout
       - run:
           command: |
-            cd .circleci && ./run-tests.sh "Fast=Fast" && ./can-build.sh
+            cd .circleci && ./run-tests.sh "Fast=Fast"
   selenium_tests:
     machine:
         enabled: true
@@ -49,10 +49,8 @@ jobs:
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
             #
             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 login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-amd64
-            sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64
 
   arm32v7:
     machine:
@@ -65,10 +63,8 @@ jobs:
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
             #
             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 login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm32v7
-            sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7
 
   arm64v8:
     machine:
@@ -81,10 +77,8 @@ jobs:
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
             #
             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 login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm64v8
-            sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8
 
   multiarch:
     machine:
@@ -105,13 +99,6 @@ jobs:
             sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 --os linux --arch arm --variant v7
             sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 --os linux --arch arm64 --variant v8
             sudo docker manifest push $DOCKERHUB_REPO:$LATEST_TAG -p
-            
-            
-            sudo docker manifest create --amend $DOCKERHUB_REPO:$LATEST_TAG-altcoins $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64 $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7 $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8
-            sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG-altcoins $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64 --os linux --arch amd64
-            sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG-altcoins $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7 --os linux --arch arm --variant v7
-            sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG-altcoins $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8 --os linux --arch arm64 --variant v8
-            sudo docker manifest push $DOCKERHUB_REPO:$LATEST_TAG-altcoins -p
 
 workflows:
   version: 2

.circleci/run-tests.sh

@@ -3,7 +3,7 @@ set -e
 
 cd ../BTCPayServer.Tests
 docker-compose -v
-docker-compose -f "docker-compose.altcoins.yml" down --v
-docker-compose -f "docker-compose.altcoins.yml" pull
-docker-compose -f "docker-compose.altcoins.yml" build
-docker-compose -f "docker-compose.altcoins.yml" run -e "TEST_FILTERS=$1" tests
+docker-compose down --v
+docker-compose pull
+docker-compose build
+docker-compose run -e "TEST_FILTERS=$1" tests

.editorconfig

@@ -10,9 +10,8 @@ root = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
-charset = utf-8
 
-[launchSettings.json]
+[project.json]
 indent_size = 2
 
 # C# files
@@ -147,4 +146,4 @@ indent_size = 2
 [*.sh]
 end_of_line = lf
 [*.{cmd, bat}]
-end_of_line = crlf
+end_of_line = crlf

.gitignore

@@ -292,9 +292,5 @@ __pycache__/
 BTCPayServer/wwwroot/bundles/*
 !BTCPayServer/wwwroot/bundles/.gitignore
 
-.vscode/*
-!.vscode/launch.json
-!.vscode/tasks.json
-!.vscode/extensions.json
+.vscode
 BTCPayServer/testpwd
-.DS_Store

.vscode/extensions.json

@@ -1,3 +0,0 @@
-{
-    "recommendations": ["ms-dotnettools.csharp"]
-}

.vscode/launch.json

@@ -1,33 +0,0 @@
-{
-    // Use IntelliSense to find out which attributes exist for C# debugging
-    // Use hover for the description of the existing attributes
-    // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": ".NET Core Launch (web)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/BTCPayServer/bin/Debug/netcoreapp3.1/BTCPayServer.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/BTCPayServer",
-            "stopAtEntry": false,
-            // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
-            "serverReadyAction": {
-                "action": "openExternally",
-                "pattern": "\\bListening on\\s+(https?://\\S+)"
-            },
-            "env": {
-                "ASPNETCORE_ENVIRONMENT": "Development"
-            },
-            "sourceFileMap": {
-                "/Views": "${workspaceFolder}/Views"
-            },
-            "logging": {
-                "moduleLoad": false
-            }
-        }
-    ]
-}

.vscode/tasks.json

@@ -1,42 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/BTCPayServer/BTCPayServer.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/BTCPayServer/BTCPayServer.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "${workspaceFolder}/BTCPayServer/BTCPayServer.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        }
-    ]
-}

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="NBitcoin" Version="5.0.43" />
-      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.2.0" />
+      <PackageReference Include="NBitcoin" Version="5.0.39" />
+      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.1.0.22" />
       <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>
 

BTCPayServer.Client/BTCPayServerClient.APIKeys.cs

@@ -25,7 +25,7 @@ namespace BTCPayServer.Client
         public virtual async Task RevokeCurrentAPIKeyInfo(CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/api-keys/current", null, HttpMethod.Delete), token);
-            await HandleResponse(response);
+            HandleResponse(response);
         }
 
         public virtual async Task RevokeAPIKey(string apikey, CancellationToken token = default)
@@ -33,7 +33,7 @@ namespace BTCPayServer.Client
             if (apikey == null)
                 throw new ArgumentNullException(nameof(apikey));
             var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/api-keys/{apikey}", null, HttpMethod.Delete), token);
-            await HandleResponse(response);
+            HandleResponse(response);
         }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Authorization.cs

@@ -5,7 +5,7 @@ namespace BTCPayServer.Client
 {
     public partial class BTCPayServerClient
     {
-
+    
         public static Uri GenerateAuthorizeUri(Uri btcpayHost, string[] permissions, bool strict = true,
             bool selectiveStores = false)
         {

BTCPayServer.Client/BTCPayServerClient.Health.cs

@@ -1,3 +1,4 @@
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;

BTCPayServer.Client/BTCPayServerClient.Lightning.Internal.cs

@@ -26,7 +26,7 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/connect", bodyPayload: request,
                     method: HttpMethod.Post), token);
-            await HandleResponse(response);
+            HandleResponse(response);
         }
 
         public async Task<IEnumerable<LightningChannelData>> GetLightningNodeChannels(string cryptoCode,
@@ -61,9 +61,9 @@ namespace BTCPayServer.Client
             if (request == null)
                 throw new ArgumentNullException(nameof(request));
             var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/invoices/pay", bodyPayload: request,
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/pay", bodyPayload: request,
                     method: HttpMethod.Post), token);
-            await HandleResponse(response);
+            HandleResponse(response);
         }
 
         public async Task<LightningInvoiceData> GetLightningInvoice(string cryptoCode,

BTCPayServer.Client/BTCPayServerClient.Lightning.Store.cs

@@ -26,7 +26,7 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/connect", bodyPayload: request,
                     method: HttpMethod.Post), token);
-            await HandleResponse(response);
+            HandleResponse(response);
         }
 
         public async Task<IEnumerable<LightningChannelData>> GetLightningNodeChannels(string storeId, string cryptoCode,
@@ -62,9 +62,9 @@ namespace BTCPayServer.Client
             if (request == null)
                 throw new ArgumentNullException(nameof(request));
             var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices/pay", bodyPayload: request,
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/pay", bodyPayload: request,
                     method: HttpMethod.Post), token);
-            await HandleResponse(response);
+            HandleResponse(response);
         }
 
         public async Task<LightningInvoiceData> GetLightningInvoice(string storeId, string cryptoCode,

BTCPayServer.Client/BTCPayServerClient.PaymentRequests.cs

@@ -31,7 +31,7 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}",
                     method: HttpMethod.Delete), token);
-            await HandleResponse(response);
+            HandleResponse(response);
         }
 
         public virtual async Task<PaymentRequestData> CreatePaymentRequest(string storeId,

BTCPayServer.Client/BTCPayServerClient.PullPayments.cs

@@ -1,61 +0,0 @@
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web;
-using BTCPayServer.Client.Models;
-
-namespace BTCPayServer.Client
-{
-    public partial class BTCPayServerClient
-    {
-        public async Task<PullPaymentData> CreatePullPayment(string storeId, CreatePullPaymentRequest request, CancellationToken cancellationToken = default)
-        {
-            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/pull-payments", bodyPayload: request, method: HttpMethod.Post), cancellationToken);
-            return await HandleResponse<PullPaymentData>(response);
-        }
-        public async Task<PullPaymentData> GetPullPayment(string pullPaymentId, CancellationToken cancellationToken = default)
-        {
-            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}", method: HttpMethod.Get), cancellationToken);
-            return await HandleResponse<PullPaymentData>(response);
-        }
-
-        public async Task<PullPaymentData[]> GetPullPayments(string storeId, bool includeArchived = false, CancellationToken cancellationToken = default)
-        {
-            Dictionary<string, object> query = new Dictionary<string, object>();
-            query.Add("includeArchived", includeArchived);
-            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/pull-payments", queryPayload: query, method: HttpMethod.Get), cancellationToken);
-            return await HandleResponse<PullPaymentData[]>(response);
-        }
-
-        public async Task ArchivePullPayment(string storeId, string pullPaymentId, CancellationToken cancellationToken = default)
-        {
-            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}", method: HttpMethod.Delete), cancellationToken);
-            await HandleResponse(response);
-        }
-
-        public async Task<PayoutData[]> GetPayouts(string pullPaymentId, bool includeCancelled = false, CancellationToken cancellationToken = default)
-        {
-            Dictionary<string, object> query = new Dictionary<string, object>();
-            query.Add("includeCancelled", includeCancelled);
-            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts", queryPayload: query, method: HttpMethod.Get), cancellationToken);
-            return await HandleResponse<PayoutData[]>(response);
-        }
-        public async Task<PayoutData> CreatePayout(string pullPaymentId, CreatePayoutRequest payoutRequest, CancellationToken cancellationToken = default)
-        {
-            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 async Task CancelPayout(string storeId, string payoutId, CancellationToken cancellationToken = default)
-        {
-            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}", method: HttpMethod.Delete), cancellationToken);
-            await HandleResponse(response);
-        }
-        public async Task<PayoutData> ApprovePayout(string storeId, string payoutId, ApprovePayoutRequest request, CancellationToken cancellationToken = default)
-        {
-            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}", bodyPayload: request, method: HttpMethod.Post), cancellationToken);
-            return await HandleResponse<PayoutData>(response);
-        }
-    }
-}

BTCPayServer.Client/BTCPayServerClient.ServerInfo.cs

@@ -1,3 +1,4 @@
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;

BTCPayServer.Client/BTCPayServerClient.Stores.cs

@@ -21,14 +21,14 @@ namespace BTCPayServer.Client
                 CreateHttpRequest($"api/v1/stores/{storeId}"), token);
             return await HandleResponse<StoreData>(response);
         }
-
+        
         public virtual async Task RemoveStore(string storeId, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/stores/{storeId}", method: HttpMethod.Delete), token);
-            await HandleResponse(response);
+            HandleResponse(response);
         }
-
+        
         public virtual async Task<StoreData> CreateStore(CreateStoreRequest request, CancellationToken token = default)
         {
             if (request == null)
@@ -36,7 +36,7 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/stores", bodyPayload: request, method: HttpMethod.Post), token);
             return await HandleResponse<StoreData>(response);
         }
-
+        
         public virtual async Task<StoreData> UpdateStore(string storeId, UpdateStoreRequest request, CancellationToken token = default)
         {
             if (request == null)

BTCPayServer.Client/BTCPayServerClient.cs

@@ -18,8 +18,6 @@ namespace BTCPayServer.Client
         private readonly string _password;
         private readonly HttpClient _httpClient;
 
-        public Uri Host => _btcpayHost;
-
         public string APIKey => _apiKey;
 
         public BTCPayServerClient(Uri btcpayHost, HttpClient httpClient = null)
@@ -35,7 +33,7 @@ namespace BTCPayServer.Client
             _btcpayHost = btcpayHost;
             _httpClient = httpClient ?? new HttpClient();
         }
-
+        
         public BTCPayServerClient(Uri btcpayHost, string username, string password, HttpClient httpClient = null)
         {
             _apiKey = APIKey;
@@ -45,26 +43,14 @@ namespace BTCPayServer.Client
             _httpClient = httpClient ?? new HttpClient();
         }
 
-        protected async Task HandleResponse(HttpResponseMessage message)
+        protected void HandleResponse(HttpResponseMessage message)
         {
-            if (message.StatusCode == System.Net.HttpStatusCode.UnprocessableEntity)
-            {
-                var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(await message.Content.ReadAsStringAsync());
-                ;
-                throw new GreenFieldValidationException(err);
-            }
-            else if (message.StatusCode == System.Net.HttpStatusCode.BadRequest)
-            {
-                var err = JsonConvert.DeserializeObject<Models.GreenfieldAPIError>(await message.Content.ReadAsStringAsync());
-                throw new GreenFieldAPIException(err);
-            }
-
             message.EnsureSuccessStatusCode();
         }
 
         protected async Task<T> HandleResponse<T>(HttpResponseMessage message)
         {
-            await HandleResponse(message);
+            HandleResponse(message);
             return JsonConvert.DeserializeObject<T>(await message.Content.ReadAsStringAsync());
         }
 
@@ -72,7 +58,7 @@ namespace BTCPayServer.Client
             Dictionary<string, object> queryPayload = null,
             HttpMethod method = null)
         {
-            UriBuilder uriBuilder = new UriBuilder(_btcpayHost) { Path = path };
+            UriBuilder uriBuilder = new UriBuilder(_btcpayHost) {Path = path};
             if (queryPayload != null && queryPayload.Any())
             {
                 AppendPayloadToQuery(uriBuilder, queryPayload);

BTCPayServer.Client/GreenFieldAPIException.cs

@@ -1,15 +0,0 @@
-using System;
-
-namespace BTCPayServer.Client
-{
-    public class GreenFieldAPIException : Exception
-    {
-        public GreenFieldAPIException(Models.GreenfieldAPIError error) : base(error.Message)
-        {
-            if (error == null)
-                throw new ArgumentNullException(nameof(error));
-            APIError = error;
-        }
-        public Models.GreenfieldAPIError APIError { get; }
-    }
-}

BTCPayServer.Client/GreenFieldValidationException.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Text;
-using BTCPayServer.Client.Models;
-
-namespace BTCPayServer.Client
-{
-    public class GreenFieldValidationException : Exception
-    {
-        public GreenFieldValidationException(Models.GreenfieldValidationError[] errors) : base(BuildMessage(errors))
-        {
-            ValidationErrors = errors;
-        }
-
-        private static string BuildMessage(GreenfieldValidationError[] errors)
-        {
-            if (errors == null)
-                throw new ArgumentNullException(nameof(errors));
-            StringBuilder builder = new StringBuilder();
-            foreach (var error in errors)
-            {
-                builder.AppendLine($"{error.Path}: {error.Message}");
-            }
-            return builder.ToString();
-        }
-
-        public Models.GreenfieldValidationError[] ValidationErrors { get; }
-    }
-}

BTCPayServer.Client/JsonConverters/DecimalStringJsonConverter.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Globalization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.JsonConverters
+{
+    public class DecimalStringJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return (objectType == typeof(decimal) || objectType == typeof(decimal?));
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+            JsonSerializer serializer)
+        {
+            JToken token = JToken.Load(reader);
+            switch (token.Type)
+            {
+                case JTokenType.Float:
+                case JTokenType.Integer:
+                case JTokenType.String:
+                    return decimal.Parse(token.ToString(), CultureInfo.InvariantCulture);
+                case JTokenType.Null when objectType == typeof(decimal?):
+                    return null;
+                default:
+                    throw new JsonSerializationException("Unexpected token type: " +
+                                                         token.Type);
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            if (value != null)
+                writer.WriteValue(((decimal)value).ToString(CultureInfo.InvariantCulture));
+        }
+    }
+}

BTCPayServer.Client/JsonConverters/MoneyJsonConverter.cs

@@ -11,7 +11,7 @@ namespace BTCPayServer.Client.JsonConverters
         {
             if (reader.TokenType == JsonToken.String)
             {
-                return new Money(long.Parse((string)reader.Value));
+                return new Money( long.Parse((string) reader.Value));
             }
             return base.ReadJson(reader, objectType, existingValue, serializer);
         }

BTCPayServer.Client/JsonConverters/NodeUriJsonConverter.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using BTCPayServer.Lightning;
-using NBitcoin.JsonConverters;
-using Newtonsoft.Json;
-
-namespace BTCPayServer.Client.JsonConverters
-{
-    public class NodeUriJsonConverter : JsonConverter<NodeInfo>
-    {
-        public override NodeInfo ReadJson(JsonReader reader, Type objectType, [AllowNull] NodeInfo existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            if (reader.TokenType != JsonToken.String)
-                throw new JsonObjectException(reader.Path, "Unexpected token type for NodeUri");
-            if (NodeInfo.TryParse((string)reader.Value, out var info))
-                return info;
-            throw new JsonObjectException(reader.Path, "Invalid NodeUri");
-        }
-
-        public override void WriteJson(JsonWriter writer, [AllowNull] NodeInfo value, JsonSerializer serializer)
-        {
-            if (value is NodeInfo)
-                writer.WriteValue(value.ToString());
-        }
-    }
-}

BTCPayServer.Client/JsonConverters/NumericStringJsonConverter.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Globalization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.JsonConverters
-{
-    public class NumericStringJsonConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return (objectType == typeof(decimal) ||
-                    objectType == typeof(decimal?) ||
-                    objectType == typeof(double) ||
-                    objectType == typeof(double?));
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
-            JsonSerializer serializer)
-        {
-            JToken token = JToken.Load(reader);
-            switch (token.Type)
-            {
-                case JTokenType.Float:
-                case JTokenType.Integer:
-                case JTokenType.String:
-                    if (objectType == typeof(decimal) || objectType == typeof(decimal?) )
-                        return decimal.Parse(token.ToString(), CultureInfo.InvariantCulture);
-                    if (objectType == typeof(double) || objectType == typeof(double?))
-                        return double.Parse(token.ToString(), CultureInfo.InvariantCulture);
-
-                    throw new JsonSerializationException("Unexpected object type: " + objectType);
-                case JTokenType.Null when objectType == typeof(decimal?) || objectType == typeof(double?):
-                    return null;
-                default:
-                    throw new JsonSerializationException("Unexpected token type: " +
-                                                         token.Type);
-            }
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            switch (value)
-            {
-                case null:
-                    break;
-                case decimal x:
-                    writer.WriteValue(x.ToString(CultureInfo.InvariantCulture));
-                    break;
-                case double x:
-                    writer.WriteValue(x.ToString(CultureInfo.InvariantCulture));
-                    break;
-            }
-        }
-    }
-}

BTCPayServer.Client/JsonConverters/PermissionJsonConverter.cs

@@ -1,7 +1,9 @@
-using System;
+using System;
 using System.Reflection;
-using NBitcoin.JsonConverters;
+using System.Collections.Generic;
+using System.Text;
 using Newtonsoft.Json;
+using NBitcoin.JsonConverters;
 
 namespace BTCPayServer.Client.JsonConverters
 {

BTCPayServer.Client/JsonConverters/TimeSpanJsonConverter.cs

@@ -1,4 +1,6 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
 
@@ -36,7 +38,7 @@ namespace BTCPayServer.Client.JsonConverters
         {
             if (value is TimeSpan s)
             {
-                writer.WriteValue((long)s.TotalSeconds);
+                writer.WriteValue((int)s.TotalSeconds);
             }
         }
     }

BTCPayServer.Client/Models/ApprovePayoutRequest.cs

@@ -1,8 +0,0 @@
-namespace BTCPayServer.Client.Models
-{
-    public class ApprovePayoutRequest
-    {
-        public int Revision { get; set; }
-        public string RateRule { get; set; }
-    }
-}

BTCPayServer.Client/Models/ConnectToNodeRequest.cs

@@ -1,21 +1,10 @@
-using BTCPayServer.Client.JsonConverters;
-using BTCPayServer.Lightning;
-using Newtonsoft.Json;
-
 namespace BTCPayServer.Client.Models
 {
     public class ConnectToNodeRequest
     {
-        public ConnectToNodeRequest()
-        {
-
-        }
-        public ConnectToNodeRequest(NodeInfo nodeInfo)
-        {
-            NodeURI = nodeInfo;
-        }
-        [JsonConverter(typeof(NodeUriJsonConverter))]
-        [JsonProperty("nodeURI")]
-        public NodeInfo NodeURI { get; set; }
+        public string NodeInfo { get; set; }
+        public string NodeId { get; set; }
+        public string NodeHost { get; set; }
+        public int NodePort { get; set; }
     }
 }

BTCPayServer.Client/Models/CreateApiKeyRequest.cs

@@ -1,4 +1,4 @@
-using BTCPayServer.Client.JsonConverters;
+using BTCPayServer.Client.JsonConverters;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Client.Models

BTCPayServer.Client/Models/CreateLightningInvoiceRequest.cs

@@ -7,22 +7,11 @@ namespace BTCPayServer.Client.Models
 {
     public class CreateLightningInvoiceRequest
     {
-        public CreateLightningInvoiceRequest()
-        {
-
-        }
-        public CreateLightningInvoiceRequest(LightMoney amount, string description, TimeSpan expiry)
-        {
-            Amount = amount;
-            Description = description;
-            Expiry = expiry;
-        }
-        [JsonConverter(typeof(LightMoneyJsonConverter))]
+        [JsonProperty(ItemConverterType = typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
         public string Description { get; set; }
-        [JsonConverter(typeof(JsonConverters.TimeSpanJsonConverter))]
         public TimeSpan Expiry { get; set; }
         public bool PrivateRouteHints { get; set; }
-
+        
     }
 }

BTCPayServer.Client/Models/CreatePaymentRequestRequest.cs

@@ -3,4 +3,4 @@ namespace BTCPayServer.Client.Models
     public class CreatePaymentRequestRequest : PaymentRequestBaseData
     {
     }
-}
+}

BTCPayServer.Client/Models/CreatePayoutRequest.cs

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

BTCPayServer.Client/Models/CreatePullPaymentRequest.cs

@@ -1,22 +0,0 @@
-using System;
-using BTCPayServer.Client.JsonConverters;
-using BTCPayServer.JsonConverters;
-using Newtonsoft.Json;
-
-namespace BTCPayServer.Client.Models
-{
-    public class CreatePullPaymentRequest
-    {
-        public string Name { get; set; }
-        [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
-        public decimal Amount { get; set; }
-        public string Currency { get; set; }
-        [JsonConverter(typeof(TimeSpanJsonConverter))]
-        public TimeSpan? Period { get; set; }
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-        public DateTimeOffset? ExpiresAt { get; set; }
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-        public DateTimeOffset? StartsAt { get; set; }
-        public string[] PaymentMethods { get; set; }
-    }
-}

BTCPayServer.Client/Models/CreateStoreRequest.cs

@@ -1,6 +1,6 @@
 namespace BTCPayServer.Client.Models
 {
-    public class CreateStoreRequest : StoreBaseData
+    public class CreateStoreRequest: StoreBaseData
     {
     }
 }

BTCPayServer.Client/Models/GreenfieldAPIError.cs

@@ -1,23 +0,0 @@
-using System;
-
-namespace BTCPayServer.Client.Models
-{
-    public class GreenfieldAPIError
-    {
-        public GreenfieldAPIError()
-        {
-
-        }
-        public GreenfieldAPIError(string code, string message)
-        {
-            if (code == null)
-                throw new ArgumentNullException(nameof(code));
-            if (message == null)
-                throw new ArgumentNullException(nameof(message));
-            Code = code;
-            Message = message;
-        }
-        public string Code { get; set; }
-        public string Message { get; set; }
-    }
-}

BTCPayServer.Client/Models/GreenfieldValidationError.cs

@@ -1,24 +0,0 @@
-using System;
-
-namespace BTCPayServer.Client.Models
-{
-    public class GreenfieldValidationError
-    {
-        public GreenfieldValidationError()
-        {
-
-        }
-        public GreenfieldValidationError(string path, string message)
-        {
-            if (path == null)
-                throw new ArgumentNullException(nameof(path));
-            if (message == null)
-                throw new ArgumentNullException(nameof(message));
-            Path = path;
-            Message = message;
-        }
-
-        public string Path { get; set; }
-        public string Message { get; set; }
-    }
-}

BTCPayServer.Client/Models/LightningInvoiceData.cs

@@ -10,21 +10,19 @@ namespace BTCPayServer.Client.Models
     {
         public string Id { get; set; }
 
-        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonProperty(ItemConverterType = typeof(StringEnumConverter))]
         public LightningInvoiceStatus Status { get; set; }
 
-        [JsonProperty("BOLT11")]
         public string BOLT11 { get; set; }
 
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset? PaidAt { get; set; }
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+
         public DateTimeOffset ExpiresAt { get; set; }
 
-        [JsonConverter(typeof(LightMoneyJsonConverter))]
+        [JsonProperty(ItemConverterType = typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
 
-        [JsonConverter(typeof(LightMoneyJsonConverter))]
+        [JsonProperty(ItemConverterType = typeof(LightMoneyJsonConverter))]
         public LightMoney AmountReceived { get; set; }
     }
 }

BTCPayServer.Client/Models/LightningNodeInformationData.cs

@@ -1,13 +1,15 @@
+using System.Collections.Generic;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.Lightning;
+using NBitcoin;
+using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Client.Models
 {
     public class LightningNodeInformationData
     {
-        [JsonProperty("nodeURIs", ItemConverterType = typeof(NodeUriJsonConverter))]
-        public NodeInfo[] NodeURIs { get; set; }
+        public IEnumerable<string> NodeInfoList { get; set; }
         public int BlockHeight { get; set; }
     }
 
@@ -19,10 +21,10 @@ namespace BTCPayServer.Client.Models
 
         public bool IsActive { get; set; }
 
-        [JsonConverter(typeof(LightMoneyJsonConverter))]
+        [JsonProperty(ItemConverterType = typeof(LightMoneyJsonConverter))]
         public LightMoney Capacity { get; set; }
 
-        [JsonConverter(typeof(LightMoneyJsonConverter))]
+        [JsonProperty(ItemConverterType = typeof(LightMoneyJsonConverter))]
         public LightMoney LocalBalance { get; set; }
 
         public string ChannelPoint { get; set; }

BTCPayServer.Client/Models/OpenLightningChannelRequest.cs

@@ -1,5 +1,3 @@
-using BTCPayServer.Client.JsonConverters;
-using BTCPayServer.Lightning;
 using NBitcoin;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
@@ -9,13 +7,11 @@ namespace BTCPayServer.Client.Models
 {
     public class OpenLightningChannelRequest
     {
-        [JsonConverter(typeof(NodeUriJsonConverter))]
-        [JsonProperty("nodeURI")]
-        public NodeInfo NodeURI { get; set; }
-        [JsonConverter(typeof(MoneyJsonConverter))]
+        public ConnectToNodeRequest Node { get; set; }
+        [JsonProperty(ItemConverterType = typeof(MoneyJsonConverter))]
         public Money ChannelAmount { get; set; }
 
-        [JsonConverter(typeof(FeeRateJsonConverter))]
+        [JsonProperty(ItemConverterType = typeof(FeeRateJsonConverter))]
         public FeeRate FeeRate { get; set; }
     }
 }

BTCPayServer.Client/Models/PayLightningInvoiceRequest.cs

@@ -2,7 +2,6 @@ namespace BTCPayServer.Client.Models
 {
     public class PayLightningInvoiceRequest
     {
-        [Newtonsoft.Json.JsonProperty("BOLT11")]
-        public string BOLT11 { get; set; }
+        public string Invoice { get; set; }
     }
 }

BTCPayServer.Client/Models/PaymentRequestBaseData.cs

@@ -8,7 +8,7 @@ namespace BTCPayServer.Client.Models
 {
     public class PaymentRequestBaseData
     {
-        [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
+        [JsonProperty(ItemConverterType = typeof(DecimalStringJsonConverter))]
         public decimal Amount { get; set; }
         public string Currency { get; set; }
         public DateTime? ExpiryDate { get; set; }

BTCPayServer.Client/Models/PaymentRequestData.cs

@@ -5,7 +5,7 @@ using Newtonsoft.Json.Converters;
 namespace BTCPayServer.Client.Models
 {
     public class PaymentRequestData : PaymentRequestBaseData
-    {
+    {        
         [JsonConverter(typeof(StringEnumConverter))]
         public PaymentRequestData.PaymentRequestStatus Status { get; set; }
         public DateTimeOffset Created { get; set; }

BTCPayServer.Client/Models/PayoutData.cs

@@ -1,32 +0,0 @@
-using System;
-using BTCPayServer.JsonConverters;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace BTCPayServer.Client.Models
-{
-    public enum PayoutState
-    {
-        AwaitingApproval,
-        AwaitingPayment,
-        InProgress,
-        Completed,
-        Cancelled
-    }
-    public class PayoutData
-    {
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-        public DateTimeOffset Date { get; set; }
-        public string Id { get; set; }
-        public string PullPaymentId { get; set; }
-        public string Destination { get; set; }
-        public string PaymentMethod { get; set; }
-        [JsonConverter(typeof(NumericStringJsonConverter))]
-        public decimal Amount { get; set; }
-        [JsonConverter(typeof(NumericStringJsonConverter))]
-        public decimal? PaymentMethodAmount { get; set; }
-        [JsonConverter(typeof(StringEnumConverter))]
-        public PayoutState State { get; set; }
-        public int Revision { get; set; }
-    }
-}

BTCPayServer.Client/Models/PullPaymentBaseData.cs

@@ -1,24 +0,0 @@
-using System;
-using BTCPayServer.Client.JsonConverters;
-using BTCPayServer.JsonConverters;
-using Newtonsoft.Json;
-
-namespace BTCPayServer.Client.Models
-{
-    public class PullPaymentData
-    {
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-        public DateTimeOffset StartsAt { get; set; }
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-        public DateTimeOffset? ExpiresAt { get; set; }
-        public string Id { get; set; }
-        public string Name { get; set; }
-        public string Currency { get; set; }
-        [JsonConverter(typeof(NumericStringJsonConverter))]
-        public decimal Amount { get; set; }
-        [JsonConverter(typeof(TimeSpanJsonConverter))]
-        public TimeSpan? Period { get; set; }
-        public bool Archived { get; set; }
-        public string ViewLink { get; set; }
-    }
-}

BTCPayServer.Client/Models/ServerInfoData.cs

@@ -8,12 +8,12 @@ namespace BTCPayServer.Client.Models
         /// the BTCPay Server version
         /// </summary>
         public string Version { get; set; }
-
+        
         /// <summary>
         /// the Tor hostname
         /// </summary>
         public string Onion { get; set; }
-
+        
         /// <summary>
         /// the payment methods this server supports
         /// </summary>

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using BTCPayServer.Client.JsonConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -60,14 +61,14 @@ namespace BTCPayServer.Client.Models
         [JsonExtensionData]
         public IDictionary<string, JToken> AdditionalData { get; set; }
     }
-
+    
     public enum NetworkFeeMode
     {
         MultiplePaymentsOnly,
         Always,
         Never
     }
-
+    
     public enum SpeedPolicy
     {
         HighSpeed = 0,

BTCPayServer.Client/Models/UpdatePaymentRequestRequest.cs

@@ -3,4 +3,4 @@ namespace BTCPayServer.Client.Models
     public class UpdatePaymentRequestRequest : PaymentRequestBaseData
     {
     }
-}
+}

BTCPayServer.Client/Permissions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -12,7 +12,6 @@ namespace BTCPayServer.Client
         public const string CanUseLightningNodeInStore = "btcpay.store.canuselightningnode";
         public const string CanModifyServerSettings = "btcpay.server.canmodifyserversettings";
         public const string CanModifyStoreSettings = "btcpay.store.canmodifystoresettings";
-        public const string CanModifyStoreSettingsUnscoped = "btcpay.store.canmodifystoresettings:";
         public const string CanViewStoreSettings = "btcpay.store.canviewstoresettings";
         public const string CanCreateInvoice = "btcpay.store.cancreateinvoice";
         public const string CanViewPaymentRequests = "btcpay.store.canviewpaymentrequests";
@@ -20,7 +19,6 @@ namespace BTCPayServer.Client
         public const string CanModifyProfile = "btcpay.user.canmodifyprofile";
         public const string CanViewProfile = "btcpay.user.canviewprofile";
         public const string CanCreateUser = "btcpay.server.cancreateuser";
-        public const string CanManagePullPayments = "btcpay.store.canmanagepullpayments";
         public const string Unrestricted = "unrestricted";
         public static IEnumerable<string> AllPolicies
         {
@@ -40,7 +38,6 @@ namespace BTCPayServer.Client
                 yield return CanCreateLightningInvoiceInternalNode;
                 yield return CanUseLightningNodeInStore;
                 yield return CanCreateLightningInvoiceInStore;
-                yield return CanManagePullPayments;
             }
         }
         public static bool IsValidPolicy(string policy)
@@ -52,10 +49,7 @@ namespace BTCPayServer.Client
         {
             return policy.StartsWith("btcpay.store", StringComparison.OrdinalIgnoreCase);
         }
-        public static bool IsStoreModifyPolicy(string policy)
-        {
-            return policy.StartsWith("btcpay.store.canmodify", StringComparison.OrdinalIgnoreCase);
-        }
+        
         public static bool IsServerPolicy(string policy)
         {
             return policy.StartsWith("btcpay.server", StringComparison.OrdinalIgnoreCase);
@@ -63,14 +57,14 @@ namespace BTCPayServer.Client
     }
     public class Permission
     {
-        public static Permission Create(string policy, string scope = null)
+        public static Permission Create(string policy, string storeId = null)
         {
-            if (TryCreatePermission(policy, scope, out var r))
+            if (TryCreatePermission(policy, storeId, out var r))
                 return r;
             throw new ArgumentException("Invalid Permission");
         }
 
-        public static bool TryCreatePermission(string policy, string scope, out Permission permission)
+        public static bool TryCreatePermission(string policy, string storeId, out Permission permission)
         {
             permission = null;
             if (policy == null)
@@ -78,9 +72,9 @@ namespace BTCPayServer.Client
             policy = policy.Trim().ToLowerInvariant();
             if (!Policies.IsValidPolicy(policy))
                 return false;
-            if (scope != null && !Policies.IsStorePolicy(policy))
+            if (storeId != null && !Policies.IsStorePolicy(policy))
                 return false;
-            permission = new Permission(policy, scope);
+            permission = new Permission(policy, storeId);
             return true;
         }
 
@@ -114,10 +108,10 @@ namespace BTCPayServer.Client
             }
         }
 
-        internal Permission(string policy, string scope)
+        internal Permission(string policy, string storeId)
         {
             Policy = policy;
-            Scope = scope;
+            StoreId = storeId;
         }
 
         public bool Contains(Permission subpermission)
@@ -131,7 +125,7 @@ namespace BTCPayServer.Client
             }
             if (!Policies.IsStorePolicy(subpermission.Policy))
                 return true;
-            return Scope == null || subpermission.Scope == this.Scope;
+            return StoreId == null || subpermission.StoreId == this.StoreId;
         }
 
         public static IEnumerable<Permission> ToPermissions(string[] permissions)
@@ -152,7 +146,7 @@ namespace BTCPayServer.Client
             if (this.Policy == subpolicy)
                 return true;
             switch (subpolicy)
-            {
+            {   
                 case Policies.CanViewStoreSettings when this.Policy == Policies.CanModifyStoreSettings:
                 case Policies.CanCreateInvoice when this.Policy == Policies.CanModifyStoreSettings:
                 case Policies.CanViewProfile when this.Policy == Policies.CanModifyProfile:
@@ -167,14 +161,14 @@ namespace BTCPayServer.Client
             }
         }
 
-        public string Scope { get; }
+        public string StoreId { get; }
         public string Policy { get; }
 
         public override string ToString()
         {
-            if (Scope != null)
+            if (StoreId != null)
             {
-                return $"{Policy}:{Scope}";
+                return $"{Policy}:{StoreId}";
             }
             return Policy;
         }

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Argoneum.cs

@@ -1,31 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitArgoneum()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("AGM");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Argoneum",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet
-                    ? "https://chainz.cryptoid.info/agm/tx.dws?{0}"
-                    : "https://chainz.cryptoid.info/agm-test/tx.dws?{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                UriScheme = "argoneum",
-                DefaultRateRules = new[]
-                    {
-                        "AGM_X = AGM_BTC * BTC_X",
-                        "AGM_BTC = argoneum(AGM_BTC)"
-                    },
-                CryptoImagePath = "imlegacy/argoneum.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("421'")
-                    : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcoin.cs

@@ -1,4 +1,7 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -28,13 +31,13 @@ namespace BTCPayServer
                     {
                         {0x0488b21eU, DerivationType.Legacy }, // xpub
                         {0x049d7cb2U, DerivationType.SegwitP2SH }, // ypub
-                        {0x04b24746U, DerivationType.Segwit }, //zpub
+                        {0x4b24746U, DerivationType.Segwit }, //zpub
                     }
                     : new Dictionary<uint, DerivationType>()
                     {
-                        {0x043587cfU, DerivationType.Legacy}, // tpub
-                        {0x044a5262U, DerivationType.SegwitP2SH}, // upub
-                        {0x045f1cf6U, DerivationType.Segwit} // vpub
+                        {0x043587cfU, DerivationType.Legacy},
+                        {0x044a5262U, DerivationType.SegwitP2SH},
+                        {0x045f1cf6U, DerivationType.Segwit}
                     }
             });
         }

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.BitcoinGold.cs

@@ -1,4 +1,4 @@
-using NBitcoin;
+using NBitcoin;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcoinplus.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcore.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Chaincoin.cs

@@ -1,33 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitChaincoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("CHC");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Chaincoin",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet
-                    ? "https://explorer.chaincoin.org/Explorer/Transaction/{0}"
-                    : "https://test.explorer.chaincoin.org/Explorer/Transaction/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                UriScheme = "chaincoin",
-                DefaultRateRules = new[]
-                    {
-                        "CHC_X = CHC_BTC * BTC_X",
-                        "CHC_BTC = txbit(CHC_X)"
-                    },
-                CryptoImagePath = "imlegacy/chaincoin.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                //https://github.com/satoshilabs/slips/blob/master/slip-0044.md
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("711'")
-                    : new KeyPath("1'")
-            });
-        }
-    }
-}
-

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dash.cs

@@ -1,4 +1,4 @@
-using NBitcoin;
+using NBitcoin;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dogecoin.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -15,7 +19,7 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://dogechain.info/tx/{0}" : "https://dogechain.info/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "dogecoin",
-                DefaultRateRules = new[]
+                DefaultRateRules = new[] 
                 {
                                 "DOGE_X = DOGE_BTC * BTC_X",
                                 "DOGE_BTC = bittrex(DOGE_BTC)"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Feathercoin.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -15,7 +19,7 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.feathercoin.com/tx/{0}" : "https://explorer.feathercoin.com/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "feathercoin",
-                DefaultRateRules = new[]
+                DefaultRateRules = new[] 
                 {
                                 "FTC_X = FTC_BTC * BTC_X",
                                 "FTC_BTC = bittrex(FTC_BTC)"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Groestlcoin.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 
 namespace BTCPayServer

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Litecoin.cs

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

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Monacoin.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -15,7 +19,7 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://mona.insight.monaco-ex.org/insight/tx/{0}" : "https://testnet-mona.insight.monaco-ex.org/insight/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "monacoin",
-                DefaultRateRules = new[]
+                DefaultRateRules = new[] 
                 {
                                 "MONA_X = MONA_BTC * BTC_X",
                                 "MONA_BTC = bittrex(MONA_BTC)"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Polis.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Ufo.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -15,7 +19,7 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/ufo/tx.dws?{0}" : "https://chainz.cryptoid.info/ufo/tx.dws?{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "ufo",
-                DefaultRateRules = new[]
+                DefaultRateRules = new[] 
                 {
                                 "UFO_X = UFO_BTC * BTC_X",
                                 "UFO_BTC = coinexchange(UFO_BTC)"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Viacoin.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.cs

@@ -1,6 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -8,7 +10,7 @@ namespace BTCPayServer
 {
     public partial class BTCPayNetworkProvider
     {
-        readonly Dictionary<string, BTCPayNetworkBase> _Networks = new Dictionary<string, BTCPayNetworkBase>();
+        Dictionary<string, BTCPayNetworkBase> _Networks = new Dictionary<string, BTCPayNetworkBase>();
 
 
         private readonly NBXplorerNetworkProvider _NBXplorerNetworkProvider;
@@ -22,27 +24,29 @@ namespace BTCPayServer
 
         BTCPayNetworkProvider(BTCPayNetworkProvider unfiltered, string[] cryptoCodes)
         {
+            UnfilteredNetworks = unfiltered.UnfilteredNetworks ?? unfiltered;
             NetworkType = unfiltered.NetworkType;
             _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(unfiltered.NetworkType);
             _Networks = new Dictionary<string, BTCPayNetworkBase>();
             cryptoCodes = cryptoCodes.Select(c => c.ToUpperInvariant()).ToArray();
             foreach (var network in unfiltered._Networks)
             {
-                if (cryptoCodes.Contains(network.Key))
+                if(cryptoCodes.Contains(network.Key))
                 {
                     _Networks.Add(network.Key, network.Value);
                 }
             }
         }
 
+        public BTCPayNetworkProvider UnfilteredNetworks { get; }
 
         public NetworkType NetworkType { get; private set; }
         public BTCPayNetworkProvider(NetworkType networkType)
         {
+            UnfilteredNetworks = this;
             _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(networkType);
             NetworkType = networkType;
             InitBitcoin();
-#if ALTCOINS
             InitLiquid();
             InitLiquidAssets();
             InitLitecoin();
@@ -56,13 +60,11 @@ namespace BTCPayServer
             InitViacoin();
             InitMonero();
             InitPolis();
-            InitChaincoin();
-            InitArgoneum();
 
             // Assume that electrum mappings are same as BTC if not specified
             foreach (var network in _Networks.Values.OfType<BTCPayNetwork>())
             {
-                if (network.ElectrumMapping.Count == 0)
+                if(network.ElectrumMapping.Count == 0)
                 {
                     network.ElectrumMapping = GetNetwork<BTCPayNetwork>("BTC").ElectrumMapping;
                     if (!network.NBitcoinNetwork.Consensus.SupportSegwit)
@@ -78,7 +80,6 @@ namespace BTCPayServer
             // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
             //InitBitcoinplus();
             //InitUfo();
-#endif
         }
 
         /// <summary>
@@ -118,11 +119,11 @@ namespace BTCPayServer
         {
             return GetNetwork<BTCPayNetworkBase>(cryptoCode.ToUpperInvariant());
         }
-        public T GetNetwork<T>(string cryptoCode) where T : BTCPayNetworkBase
+        public T GetNetwork<T>(string cryptoCode) where T: BTCPayNetworkBase
         {
             if (cryptoCode == null)
                 throw new ArgumentNullException(nameof(cryptoCode));
-            if (!_Networks.TryGetValue(cryptoCode.ToUpperInvariant(), out BTCPayNetworkBase network))
+            if(!_Networks.TryGetValue(cryptoCode.ToUpperInvariant(), out BTCPayNetworkBase network))
             {
                 if (cryptoCode == "XBT")
                     return GetNetwork<T>("BTC");

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

@@ -1,4 +1,7 @@
-#if ALTCOINS
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using NBitcoin;
 using NBitcoin.Altcoins;
 using NBitcoin.Altcoins.Elements;
@@ -13,7 +16,7 @@ namespace BTCPayServer
             var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LBTC");
             Add(new ElementsBTCPayNetwork()
             {
-                AssetId = NetworkType == NetworkType.Mainnet ? ElementsParams<Liquid>.PeggedAssetId : ElementsParams<Liquid.LiquidRegtest>.PeggedAssetId,
+                AssetId = NetworkType == NetworkType.Mainnet ? ElementsParams<Liquid>.PeggedAssetId: ElementsParams<Liquid.LiquidRegtest>.PeggedAssetId,
                 CryptoCode = "LBTC",
                 NetworkCryptoCode = "LBTC",
                 DisplayName = "Liquid Bitcoin",
@@ -35,4 +38,3 @@ namespace BTCPayServer
 
 
 }
-#endif

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

@@ -1,5 +1,4 @@
-#if ALTCOINS
-using NBitcoin;
+using NBitcoin;
 
 namespace BTCPayServer
 {
@@ -30,7 +29,7 @@ namespace BTCPayServer
                 SupportRBF = true,
                 SupportLightning = false
             });
-
+            
             Add(new ElementsBTCPayNetwork()
             {
                 CryptoCode = "ETB",
@@ -38,7 +37,7 @@ namespace BTCPayServer
                 ShowSyncSummary = false,
                 DefaultRateRules = new[]
                 {
-
+                    
                     "ETB_X = ETB_BTC * BTC_X",
                     "ETB_BTC = bitpay(ETB_BTC)"
                 },
@@ -54,14 +53,14 @@ namespace BTCPayServer
                 SupportRBF = true,
                 SupportLightning = false
             });
-
-            Add(new ElementsBTCPayNetwork()
+            
+              Add(new ElementsBTCPayNetwork()
             {
                 CryptoCode = "LCAD",
                 NetworkCryptoCode = "LBTC",
                 ShowSyncSummary = false,
                 DefaultRateRules = new[]
-              {
+                {
                     "LCAD_CAD = 1",
                     "LCAD_X = CAD_BTC * BTC_X",
                     "LCAD_BTC = bylls(CAD_BTC)",
@@ -82,4 +81,3 @@ namespace BTCPayServer
 
 
 }
-#endif

BTCPayServer.Common/Altcoins/Liquid/ElementsLikeBtcPayNetwork.cs

@@ -1,4 +1,3 @@
-#if ALTCOINS
 using System.Collections.Generic;
 using System.Linq;
 using NBitcoin;
@@ -59,4 +58,3 @@ namespace BTCPayServer
         }
     }
 }
-#endif

BTCPayServer.Common/Altcoins/Liquid/LiquidExtensions.cs

@@ -1,18 +0,0 @@
-#if ALTCOINS
-using System.Collections.Generic;
-using System.Linq;
-
-namespace BTCPayServer
-{
-    public static class LiquidExtensions
-    {
-        public static IEnumerable<string> GetAllElementsSubChains(this BTCPayNetworkProvider networkProvider, BTCPayNetworkProvider unfilteredNetworkProvider)
-        {
-            var elementsBased = networkProvider.GetAll().OfType<ElementsBTCPayNetwork>();
-            var parentChains = elementsBased.Select(network => network.NetworkCryptoCode.ToUpperInvariant()).Distinct();
-            return unfilteredNetworkProvider.GetAll().OfType<ElementsBTCPayNetwork>()
-                .Where(network => parentChains.Contains(network.NetworkCryptoCode)).Select(network => network.CryptoCode.ToUpperInvariant());
-        }
-    }
-}
-#endif

BTCPayServer.Common/Altcoins/Monero/BTCPayNetworkProvider.Monero.cs

@@ -20,8 +20,7 @@ namespace BTCPayServer
                     "XMR_X = XMR_BTC * BTC_X",
                     "XMR_BTC = kraken(XMR_BTC)"
                 },
-                CryptoImagePath = "/imlegacy/monero.svg",
-                UriScheme = "monero"
+                CryptoImagePath = "/imlegacy/monero.svg"
             });
         }
     }

BTCPayServer.Common/Altcoins/Monero/MoneroLikeSpecificBtcPayNetwork.cs

@@ -3,6 +3,5 @@ namespace BTCPayServer
     public class MoneroLikeSpecificBtcPayNetwork : BTCPayNetworkBase
     {
         public int MaxTrackedConfirmation = 10;
-        public string UriScheme { get; set; }
     }
 }

BTCPayServer.Common/Altcoins/Monero/RPC/JsonRpcClient.cs

@@ -46,7 +46,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC
                 Convert.ToBase64String(Encoding.Default.GetBytes($"{_username}:{_password}")));
 
             var rawResult = await _httpClient.SendAsync(httpRequest, cts);
-
+            
             var rawJson = await rawResult.Content.ReadAsStringAsync();
             rawResult.EnsureSuccessStatusCode();
             JsonRpcResult<TResponse> response;
@@ -68,7 +68,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC
                     Error = response.Error
                 };
             }
-
+            
             return response.Result;
         }
 
@@ -92,7 +92,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC
         }
         internal class JsonRpcResult<T>
         {
-
+            
 
             [JsonProperty("result")] public T Result { get; set; }
             [JsonProperty("error")] public JsonRpcResultError Error { get; set; }

BTCPayServer.Common/Altcoins/Monero/RPC/Models/ParseStringConverter.cs

@@ -10,8 +10,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 
         public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer)
         {
-            if (reader.TokenType == JsonToken.Null)
-                return null;
+            if (reader.TokenType == JsonToken.Null) return null;
             var value = serializer.Deserialize<string>(reader);
             long l;
             if (Int64.TryParse(value, out l))

BTCPayServer.Common/BTCPayNetwork.cs

@@ -1,10 +1,12 @@
-using System;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NBitcoin;
 using NBXplorer;
 using NBXplorer.Models;
+using Newtonsoft.Json;
 
 namespace BTCPayServer
 {
@@ -31,7 +33,7 @@ namespace BTCPayServer
             }
         }
 
-        static readonly Dictionary<NetworkType, BTCPayDefaultSettings> _Settings;
+        static Dictionary<NetworkType, BTCPayDefaultSettings> _Settings;
 
         public static BTCPayDefaultSettings GetDefaultSettings(NetworkType chainType)
         {
@@ -43,20 +45,20 @@ namespace BTCPayServer
         public int DefaultPort { get; set; }
     }
 
-    public class BTCPayNetwork : BTCPayNetworkBase
+    public class BTCPayNetwork:BTCPayNetworkBase
     {
-        public Network NBitcoinNetwork { get { return NBXplorerNetwork?.NBitcoinNetwork; } }
+        public Network NBitcoinNetwork { get { return  NBXplorerNetwork?.NBitcoinNetwork; } }
         public NBXplorer.NBXplorerNetwork NBXplorerNetwork { get; set; }
         public bool SupportRBF { get; internal set; }
         public string LightningImagePath { get; set; }
         public BTCPayDefaultSettings DefaultSettings { get; set; }
         public KeyPath CoinType { get; internal set; }
-
+        
         public Dictionary<uint, DerivationType> ElectrumMapping = new Dictionary<uint, DerivationType>();
 
         public virtual bool WalletSupported { get; set; } = true;
-        public virtual bool ReadonlyWallet { get; set; } = false;
-
+        public virtual bool ReadonlyWallet{ get; set; } = false;
+        
         public int MaxTrackedConfirmation { get; internal set; } = 6;
         public string UriScheme { get; internal set; }
         public bool SupportPayJoin { get; set; } = false;

BTCPayServer.Common/BTCPayServer.Common.csproj

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

BTCPayServer.Common/CustomThreadPool.cs

@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -8,12 +9,12 @@ namespace BTCPayServer
 {
     public class CustomThreadPool : IDisposable
     {
-        readonly CancellationTokenSource _Cancel = new CancellationTokenSource();
-        readonly TaskCompletionSource<bool> _Exited;
+        CancellationTokenSource _Cancel = new CancellationTokenSource();
+        TaskCompletionSource<bool> _Exited;
         int _ExitedCount = 0;
-        readonly Thread[] _Threads;
+        Thread[] _Threads;
         Exception _UnhandledException;
-        readonly BlockingCollection<(Action, TaskCompletionSource<object>)> _Actions = new BlockingCollection<(Action, TaskCompletionSource<object>)>(new ConcurrentQueue<(Action, TaskCompletionSource<object>)>());
+        BlockingCollection<(Action, TaskCompletionSource<object>)> _Actions = new BlockingCollection<(Action, TaskCompletionSource<object>)>(new ConcurrentQueue<(Action, TaskCompletionSource<object>)>());
 
         public CustomThreadPool(int threadCount, string threadName)
         {

BTCPayServer.Common/Extensions.cs

@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.Text;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/Logging/ConsoleLogger.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -13,7 +13,7 @@ namespace BTCPayServer.Logging
 {
     public class CustomConsoleLogProvider : ILoggerProvider
     {
-        readonly ConsoleLoggerProcessor _Processor;
+        ConsoleLoggerProcessor _Processor;
         public CustomConsoleLogProvider(ConsoleLoggerProcessor processor)
         {
             _Processor = processor;

BTCPayServer.Common/Logging/Logs.cs

@@ -1,6 +1,9 @@
-using System;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Logging
 {
@@ -40,7 +43,7 @@ namespace BTCPayServer.Logging
 
     public class FuncLoggerFactory : ILoggerFactory
     {
-        private readonly Func<string, ILogger> createLogger;
+        private Func<string, ILogger> createLogger;
         public FuncLoggerFactory(Func<string, ILogger> createLogger)
         {
             this.createLogger = createLogger;

BTCPayServer.Common/Shims.cs

@@ -4,6 +4,9 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 
 namespace Microsoft.Extensions.Logging.Console.Internal
@@ -125,7 +128,7 @@ namespace Microsoft.Extensions.Logging.Console.Internal
         }
     }
 
-    internal class AnsiSystemConsole : IAnsiSystemConsole
+	internal class AnsiSystemConsole : IAnsiSystemConsole
     {
         private readonly TextWriter _textWriter;
 
@@ -148,13 +151,13 @@ namespace Microsoft.Extensions.Logging.Console
     {
         void Write(string message);
     }
-    public interface IConsole
+	public interface IConsole
     {
         void Write(string message, ConsoleColor? background, ConsoleColor? foreground);
         void WriteLine(string message, ConsoleColor? background, ConsoleColor? foreground);
         void Flush();
     }
-    internal class WindowsLogConsole : IConsole
+	internal class WindowsLogConsole : IConsole
     {
         private readonly TextWriter _textWriter;
 

BTCPayServer.Common/SynchronizationContextRemover.cs

@@ -1,6 +1,9 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/ZipUtils.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Text;

BTCPayServer.Data/BTCPayServer.Data.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
   <Import Project="../Build/Common.csproj" />
   <ItemGroup>
@@ -8,7 +8,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.4" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.3" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.4" />
   </ItemGroup>

BTCPayServer.Data/Data/APIKeyData.cs

@@ -1,5 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel.DataAnnotations;
-using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Data
 {
@@ -17,33 +22,17 @@ namespace BTCPayServer.Data
         [MaxLength(50)] public string UserId { get; set; }
 
         public APIKeyType Type { get; set; } = APIKeyType.Legacy;
-
+        
         public byte[] Blob { get; set; }
         public StoreData StoreData { get; set; }
         public ApplicationUser User { get; set; }
         public string Label { get; set; }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<APIKeyData>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.APIKeys)
-                   .HasForeignKey(i => i.StoreId).OnDelete(DeleteBehavior.Cascade);
-
-            builder.Entity<APIKeyData>()
-                .HasOne(o => o.User)
-                .WithMany(i => i.APIKeys)
-                .HasForeignKey(i => i.UserId).OnDelete(DeleteBehavior.Cascade);
-
-            builder.Entity<APIKeyData>()
-                .HasIndex(o => o.StoreId);
-        }
     }
 
     public class APIKeyBlob
     {
         public string[] Permissions { get; set; }
-
+        
     }
 
     public enum APIKeyType

BTCPayServer.Data/Data/AddressInvoiceData.cs

@@ -1,5 +1,7 @@
-using System;
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Data
 {
@@ -30,15 +32,5 @@ namespace BTCPayServer.Data
             get; set;
         }
 
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<AddressInvoiceData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.AddressInvoices).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<AddressInvoiceData>()
-#pragma warning disable CS0618
-                .HasKey(o => o.Address);
-#pragma warning restore CS0618
-        }
     }
 }

BTCPayServer.Data/Data/AppData.cs

@@ -1,5 +1,7 @@
 using System;
-using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Data
@@ -35,14 +37,5 @@ namespace BTCPayServer.Data
         {
             Settings = value == null ? null : JsonConvert.SerializeObject(value);
         }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<AppData>()
-                       .HasOne(o => o.StoreData)
-                       .WithMany(i => i.Apps).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<AppData>()
-                    .HasOne(a => a.StoreData);
-        }
     }
 }

BTCPayServer.Data/Data/ApplicationDbContext.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
@@ -11,15 +11,15 @@ namespace BTCPayServer.Data
     {
         public ApplicationDbContext CreateDbContext(string[] args)
         {
-
+            
             var builder = new DbContextOptionsBuilder<ApplicationDbContext>();
-
+ 
             builder.UseSqlite("Data Source=temp.db");
-
+ 
             return new ApplicationDbContext(builder.Options, true);
         }
     }
-
+    
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {
         private readonly bool _designTime;
@@ -34,35 +34,93 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-        public DbSet<RefundData> Refunds
+
+        public DbSet<PlannedTransaction> PlannedTransactions { get; set; }
+        public DbSet<PayjoinLock> PayjoinLocks { get; set; }
+
+        public DbSet<AppData> Apps
+        {
+            get; set;
+        }
+
+        public DbSet<InvoiceEventData> InvoiceEvents
         {
             get; set;
         }
 
-        public DbSet<PlannedTransaction> PlannedTransactions { get; set; }
-        public DbSet<PayjoinLock> PayjoinLocks { get; set; }
-        public DbSet<AppData> Apps { get; set; }
-        public DbSet<InvoiceEventData> InvoiceEvents { get; set; }
         public DbSet<OffchainTransactionData> OffchainTransactions { get; set; }
-        public DbSet<HistoricalAddressInvoiceData> HistoricalAddressInvoices { get; set; }
-        public DbSet<PendingInvoiceData> PendingInvoices { get; set; }
-        public DbSet<PaymentData> Payments { get; set; }
-        public DbSet<PaymentRequestData> PaymentRequests { get; set; }
-        public DbSet<PullPaymentData> PullPayments { get; set; }
-        public DbSet<PayoutData> Payouts { get; set; }
+
+        public DbSet<HistoricalAddressInvoiceData> HistoricalAddressInvoices
+        {
+            get; set;
+        }
+
+        public DbSet<PendingInvoiceData> PendingInvoices
+        {
+            get; set;
+        }
+        public DbSet<RefundAddressesData> RefundAddresses
+        {
+            get; set;
+        }
+
+        public DbSet<PaymentData> Payments
+        {
+            get; set;
+        }
+        
+        public DbSet<PaymentRequestData> PaymentRequests
+        {
+            get; set;
+        }
+
         public DbSet<WalletData> Wallets { get; set; }
         public DbSet<WalletTransactionData> WalletTransactions { get; set; }
-        public DbSet<StoreData> Stores { get; set; }
-        public DbSet<UserStore> UserStore { get; set; }
-        public DbSet<AddressInvoiceData> AddressInvoices { get; set; }
-        public DbSet<SettingData> Settings { get; set; }
-        public DbSet<PairingCodeData> PairingCodes { get; set; }
-        public DbSet<PairedSINData> PairedSINData { get; set; }
-        public DbSet<APIKeyData> ApiKeys { get; set; }
-        public DbSet<StoredFile> Files { get; set; }
-        public DbSet<U2FDevice> U2FDevices { get; set; }
-        public DbSet<NotificationData> Notifications { get; set; }
 
+        public DbSet<StoreData> Stores
+        {
+            get; set;
+        }
+
+        public DbSet<UserStore> UserStore
+        {
+            get; set;
+        }
+
+        public DbSet<AddressInvoiceData> AddressInvoices
+        {
+            get; set;
+        }
+
+        public DbSet<SettingData> Settings
+        {
+            get; set;
+        }
+
+
+        public DbSet<PairingCodeData> PairingCodes
+        {
+            get; set;
+        }
+
+        public DbSet<PairedSINData> PairedSINData
+        {
+            get; set;
+        }
+
+        public DbSet<APIKeyData> ApiKeys
+        {
+            get; set;
+        } 
+        
+        public DbSet<StoredFile> Files
+        {
+            get; set;
+        }
+       
+
+        public DbSet<U2FDevice> U2FDevices { get; set; }   
+        
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             var isConfigured = optionsBuilder.Options.Extensions.OfType<RelationalOptionsExtension>().Any();
@@ -73,24 +131,140 @@ namespace BTCPayServer.Data
         protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
-            NotificationData.OnModelCreating(builder);
-            InvoiceData.OnModelCreating(builder);
-            PaymentData.OnModelCreating(builder);
-            Data.UserStore.OnModelCreating(builder);
-            APIKeyData.OnModelCreating(builder);
-            AppData.OnModelCreating(builder);
-            AddressInvoiceData.OnModelCreating(builder);
-            PairingCodeData.OnModelCreating(builder);
-            PendingInvoiceData.OnModelCreating(builder);
-            Data.PairedSINData.OnModelCreating(builder);
-            HistoricalAddressInvoiceData.OnModelCreating(builder);
-            InvoiceEventData.OnModelCreating(builder);
-            PaymentRequestData.OnModelCreating(builder);
-            WalletTransactionData.OnModelCreating(builder);
-            PullPaymentData.OnModelCreating(builder);
-            PayoutData.OnModelCreating(builder);
-            RefundData.OnModelCreating(builder);
+            builder.Entity<InvoiceData>()
+                .HasOne(o => o.StoreData)
+                .WithMany(a => a.Invoices).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<InvoiceData>().HasIndex(o => o.StoreDataId);
 
+
+            builder.Entity<PaymentData>()
+                   .HasOne(o => o.InvoiceData)
+                   .WithMany(i => i.Payments).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<PaymentData>()
+                   .HasIndex(o => o.InvoiceDataId);
+
+
+            builder.Entity<RefundAddressesData>()
+                   .HasOne(o => o.InvoiceData)
+                   .WithMany(i => i.RefundAddresses).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<RefundAddressesData>()
+                .HasIndex(o => o.InvoiceDataId);
+
+            builder.Entity<UserStore>()
+                   .HasOne(o => o.StoreData)
+                   .WithMany(i => i.UserStores).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<UserStore>()
+                   .HasKey(t => new
+                   {
+                       t.ApplicationUserId,
+                       t.StoreDataId
+                   });
+
+            builder.Entity<APIKeyData>()
+                   .HasOne(o => o.StoreData)
+                   .WithMany(i => i.APIKeys)
+                   .HasForeignKey(i => i.StoreId).OnDelete(DeleteBehavior.Cascade);
+            
+            builder.Entity<APIKeyData>()
+                .HasOne(o => o.User)
+                .WithMany(i => i.APIKeys)
+                .HasForeignKey(i => i.UserId).OnDelete(DeleteBehavior.Cascade);
+            
+            builder.Entity<APIKeyData>()
+                .HasIndex(o => o.StoreId);
+
+            builder.Entity<AppData>()
+                   .HasOne(o => o.StoreData)
+                   .WithMany(i => i.Apps).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<AppData>()
+                    .HasOne(a => a.StoreData);
+
+            builder.Entity<UserStore>()
+                 .HasOne(pt => pt.ApplicationUser)
+                 .WithMany(p => p.UserStores)
+                 .HasForeignKey(pt => pt.ApplicationUserId);
+
+            builder.Entity<UserStore>()
+                .HasOne(pt => pt.StoreData)
+                .WithMany(t => t.UserStores)
+                .HasForeignKey(pt => pt.StoreDataId);
+
+
+            builder.Entity<AddressInvoiceData>()
+                   .HasOne(o => o.InvoiceData)
+                   .WithMany(i => i.AddressInvoices).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<AddressInvoiceData>()
+#pragma warning disable CS0618
+                .HasKey(o => o.Address);
+#pragma warning restore CS0618
+
+            builder.Entity<PairingCodeData>()
+                .HasKey(o => o.Id);
+
+            builder.Entity<PendingInvoiceData>()
+                .HasOne(o => o.InvoiceData)
+                .WithMany(o => o.PendingInvoices)
+                .HasForeignKey(o => o.Id).OnDelete(DeleteBehavior.Cascade);
+
+
+            builder.Entity<PairedSINData>()
+                   .HasOne(o => o.StoreData)
+                   .WithMany(i => i.PairedSINs).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<PairedSINData>(b =>
+            {
+                b.HasIndex(o => o.SIN);
+                b.HasIndex(o => o.StoreDataId);
+            });
+
+            builder.Entity<HistoricalAddressInvoiceData>()
+                   .HasOne(o => o.InvoiceData)
+                   .WithMany(i => i.HistoricalAddressInvoices).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<HistoricalAddressInvoiceData>()
+                .HasKey(o => new
+                {
+                    o.InvoiceDataId,
+#pragma warning disable CS0618
+                    o.Address
+#pragma warning restore CS0618
+                });
+
+
+            builder.Entity<InvoiceEventData>()
+                   .HasOne(o => o.InvoiceData)
+                   .WithMany(i => i.Events).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<InvoiceEventData>()
+                .HasKey(o => new
+                {
+                    o.InvoiceDataId,
+#pragma warning disable CS0618
+                    o.UniqueId
+#pragma warning restore CS0618
+                });
+            
+            
+            builder.Entity<PaymentRequestData>()
+                .HasOne(o => o.StoreData)
+                .WithMany(i => i.PaymentRequests)
+                .OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<PaymentRequestData>()
+                .Property(e => e.Created)
+                .HasDefaultValue(new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero));
+
+            builder.Entity<PaymentRequestData>()
+                .HasIndex(o => o.Status);
+
+            builder.Entity<WalletTransactionData>()
+                .HasKey(o => new
+                {
+                    o.WalletDataId,
+#pragma warning disable CS0618
+                    o.TransactionId
+#pragma warning restore CS0618
+                });
+            builder.Entity<WalletTransactionData>()
+                .HasOne(o => o.WalletData)
+                .WithMany(w => w.WalletTransactions).OnDelete(DeleteBehavior.Cascade);
+            
             if (Database.IsSqlite() && !_designTime)
             {
                 // SQLite does not have proper support for DateTimeOffset via Entity Framework Core, see the limitations

BTCPayServer.Data/Data/ApplicationDbContextFactory.cs

@@ -1,9 +1,13 @@
+using Microsoft.EntityFrameworkCore;
 using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations;
+using JetBrains.Annotations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations.Operations;
+using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace BTCPayServer.Data
 {
@@ -15,8 +19,8 @@ namespace BTCPayServer.Data
     }
     public class ApplicationDbContextFactory
     {
-        readonly string _ConnectionString;
-        readonly DatabaseType _Type;
+        string _ConnectionString;
+        DatabaseType _Type;
         public ApplicationDbContextFactory(DatabaseType type, string connectionString)
         {
             _ConnectionString = connectionString ?? throw new ArgumentNullException(nameof(connectionString));
@@ -41,7 +45,7 @@ namespace BTCPayServer.Data
 
         class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator
         {
-            public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies, IMigrationsAnnotationProvider annotations, Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.INpgsqlOptions opts) : base(dependencies, annotations, opts)
+            public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies,  IMigrationsAnnotationProvider annotations, Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.INpgsqlOptions opts) : base(dependencies, annotations, opts)
             {
             }
 

BTCPayServer.Data/Data/ApplicationUser.cs

@@ -1,12 +1,15 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
+using BTCPayServer.Data;
 
 namespace BTCPayServer.Data
 {
     // Add profile data for application users by adding properties to the ApplicationUser class
     public class ApplicationUser : IdentityUser
     {
-        public List<NotificationData> Notifications { get; set; }
         public List<UserStore> UserStores
         {
             get;
@@ -23,7 +26,7 @@ namespace BTCPayServer.Data
             get;
             set;
         }
-
+        
         public List<U2FDevice> U2FDevices { get; set; }
         public List<APIKeyData> APIKeys { get; set; }
     }

BTCPayServer.Data/Data/HistoricalAddressInvoiceData.cs

@@ -1,5 +1,7 @@
-using System;
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Data
 {
@@ -38,20 +40,5 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<HistoricalAddressInvoiceData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.HistoricalAddressInvoices).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<HistoricalAddressInvoiceData>()
-                .HasKey(o => new
-                {
-                    o.InvoiceDataId,
-#pragma warning disable CS0618
-                    o.Address
-#pragma warning restore CS0618
-                });
-        }
     }
 }

BTCPayServer.Data/Data/InvoiceData.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Data
 {
@@ -25,6 +25,7 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
+
         public List<PaymentData> Payments
         {
             get; set;
@@ -35,6 +36,11 @@ namespace BTCPayServer.Data
             get; set;
         }
 
+        public List<RefundAddressesData> RefundAddresses
+        {
+            get; set;
+        }
+
         public List<HistoricalAddressInvoiceData> HistoricalAddressInvoices
         {
             get; set;
@@ -73,20 +79,8 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
+
         public bool Archived { get; set; }
         public List<PendingInvoiceData> PendingInvoices { get; set; }
-        public List<RefundData> Refunds { get; set; }
-        public string CurrentRefundId { get; set; }
-        [ForeignKey("Id,CurrentRefundId")]
-        public RefundData CurrentRefund { get; set; }
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<InvoiceData>()
-                .HasOne(o => o.StoreData)
-                .WithMany(a => a.Invoices).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<InvoiceData>().HasIndex(o => o.StoreDataId);
-            builder.Entity<InvoiceData>()
-                .HasOne(o => o.CurrentRefund);
-        }
     }
 }

BTCPayServer.Data/Data/InvoiceEventData.cs

@@ -1,5 +1,7 @@
-using System;
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Data
 {
@@ -20,20 +22,5 @@ namespace BTCPayServer.Data
         }
 
         public string Message { get; set; }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<InvoiceEventData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.Events).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<InvoiceEventData>()
-                .HasKey(o => new
-                {
-                    o.InvoiceDataId,
-#pragma warning disable CS0618
-                    o.UniqueId
-#pragma warning restore CS0618
-                });
-        }
     }
 }

BTCPayServer.Data/Data/NotificationData.cs

@@ -1,30 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Microsoft.EntityFrameworkCore;
-
-namespace BTCPayServer.Data
-{
-    public class NotificationData
-    {
-        [MaxLength(36)]
-        public string Id { get; set; }
-        public DateTimeOffset Created { get; set; }
-        [MaxLength(50)]
-        [Required]
-        public string ApplicationUserId { get; set; }
-        public ApplicationUser ApplicationUser { get; set; }
-        [MaxLength(100)]
-        [Required]
-        public string NotificationType { get; set; }
-        public bool Seen { get; set; }
-        public byte[] Blob { get; set; }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<NotificationData>()
-                .HasOne(o => o.ApplicationUser)
-                .WithMany(n => n.Notifications)
-                .HasForeignKey(k => k.ApplicationUserId).OnDelete(DeleteBehavior.Cascade);
-        }
-    }
-}

BTCPayServer.Data/Data/OffchainTransactionData.cs

@@ -1,11 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace BTCPayServer.Data
 {
     public class OffchainTransactionData
     {
         [Key]
-        [MaxLength(32 * 2)]
+        [MaxLength(32*2)]
         public string Id { get; set; }
         public byte[] Blob { get; set; }
     }

BTCPayServer.Data/Data/PairedSINData.cs

@@ -1,5 +1,7 @@
-using System;
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Data
 {
@@ -31,17 +33,5 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<PairedSINData>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.PairedSINs).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<PairedSINData>(b =>
-            {
-                b.HasIndex(o => o.SIN);
-                b.HasIndex(o => o.StoreDataId);
-            });
-        }
     }
 }

BTCPayServer.Data/Data/PairingCodeData.cs

@@ -1,5 +1,7 @@
-using System;
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Data
 {
@@ -44,11 +46,5 @@ namespace BTCPayServer.Data
             get;
             set;
         }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<PairingCodeData>()
-                .HasKey(o => o.Id);
-        }
     }
 }

BTCPayServer.Data/Data/PayjoinLock.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace BTCPayServer.Data
 {

BTCPayServer.Data/Data/PaymentData.cs

@@ -1,4 +1,7 @@
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Data
 {
@@ -26,14 +29,5 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<PaymentData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.Payments).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<PaymentData>()
-                   .HasIndex(o => o.InvoiceDataId);
-        }
     }
 }

BTCPayServer.Data/Data/PaymentRequestData.cs

@@ -1,5 +1,7 @@
 using System;
-using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Text;
+using BTCPayServer.Client.Models;
 
 namespace BTCPayServer.Data
 {
@@ -18,18 +20,6 @@ namespace BTCPayServer.Data
         public Client.Models.PaymentRequestData.PaymentRequestStatus Status { get; set; }
 
         public byte[] Blob { get; set; }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<PaymentRequestData>()
-                .HasOne(o => o.StoreData)
-                .WithMany(i => i.PaymentRequests)
-                .OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<PaymentRequestData>()
-                .Property(e => e.Created)
-                .HasDefaultValue(new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero));
-            builder.Entity<PaymentRequestData>()
-                .HasIndex(o => o.Status);
-        }
+        
     }
 }

BTCPayServer.Data/Data/PayoutData.cs

@@ -1,62 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Microsoft.EntityFrameworkCore;
-using NBitcoin;
-
-namespace BTCPayServer.Data
-{
-    public class PayoutData
-    {
-        [Key]
-        [MaxLength(30)]
-        public string Id { get; set; }
-        public DateTimeOffset Date { get; set; }
-        public string PullPaymentDataId { get; set; }
-        public PullPaymentData PullPaymentData { get; set; }
-        [MaxLength(20)]
-        public PayoutState State { get; set; }
-        [MaxLength(20)]
-        [Required]
-        public string PaymentMethodId { get; set; }
-        public string Destination { get; set; }
-        public byte[] Blob { get; set; }
-        public byte[] Proof { get; set; }
-        public bool IsInPeriod(PullPaymentData pp, DateTimeOffset now)
-        {
-            var period = pp.GetPeriod(now);
-            if (period is { } p)
-            {
-                return p.Start <= Date && (p.End is DateTimeOffset end ? Date < end : true);
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        internal static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<PayoutData>()
-                .HasOne(o => o.PullPaymentData)
-                .WithMany(o => o.Payouts).OnDelete(DeleteBehavior.Cascade);
-
-            builder.Entity<PayoutData>()
-                .Property(o => o.State)
-                .HasConversion<string>();
-            builder.Entity<PayoutData>()
-                .HasIndex(o => o.Destination)
-                .IsUnique();
-            builder.Entity<PayoutData>()
-                .HasIndex(o => o.State);
-        }
-    }
-
-    public enum PayoutState
-    {
-        AwaitingApproval,
-        AwaitingPayment,
-        InProgress,
-        Completed,
-        Cancelled
-    }
-}