bump

.circleci/config.yml

@@ -1,41 +1,25 @@
 version: 2
 jobs:
-  fast_tests:
-    machine:
-        docker_layer_caching: true
-    steps:
+  build:
+    machine: 
+      docker_layer_caching: true
+    steps: 
       - checkout
-      - run:
-          command: |
-            cd .circleci && ./run-tests.sh "Fast=Fast"
-  selenium_tests:
-    machine:
-        docker_layer_caching: true
-    steps:
-      - checkout
-      - run:
-          command: |
-            cd .circleci && ./run-tests.sh "Selenium=Selenium"
-  integration_tests:
-    machine:
-        docker_layer_caching: true
-    steps:
-      - checkout
-      - run:
-          command: |
-            cd .circleci && ./run-tests.sh "Integration=Integration"
-  external_tests:
-    machine:
-        docker_layer_caching: true
-    steps:
-      - checkout
-      - run:
-          command: |
-            cd .circleci && ./run-tests.sh "ExternalIntegration=ExternalIntegration"
 
+  test:
+    machine:
+        docker_layer_caching: true
+    steps:
+      - checkout
+      - run:
+          command: |
+            cd BTCPayServer.Tests
+            docker-compose down --v
+            docker-compose build
+            docker-compose run tests
 
   # publish jobs require $DOCKERHUB_REPO, $DOCKERHUB_USER, $DOCKERHUB_PASS defined
-  amd64:
+  publish_docker_linuxamd64:
     machine:
       docker_layer_caching: true
     steps:
@@ -44,11 +28,11 @@ jobs:
           command: |
             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 -t $DOCKERHUB_REPO:$LATEST_TAG-amd64 -f Dockerfile.linuxamd64 .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-amd64
 
-  arm32v7:
+  publish_docker_linuxarm:
     machine:
       docker_layer_caching: true
     steps:
@@ -58,11 +42,11 @@ jobs:
             sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
             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 -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f Dockerfile.linuxarm32v7 .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm32v7
 
-  multiarch:
+  publish_docker_multiarch:
     machine:
       enabled: true
       image: circleci/classic:201808-01
@@ -85,17 +69,11 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - fast_tests
-      - selenium_tests
-      - integration_tests
-      - external_tests:
-          filters:
-            branches:
-                only: master
+      - test
 
   publish:
     jobs:
-      - amd64:
+      - publish_docker_linuxamd64:
           filters:
             # ignore any commit on any branch by default
             branches:
@@ -103,16 +81,16 @@ workflows:
             # only act on version tags
             tags:
               only: /v[1-9]+(\.[0-9]+)*/
-      - arm32v7:
+      - publish_docker_linuxarm:
           filters:
             branches:
               ignore: /.*/
             tags:
               only: /v[1-9]+(\.[0-9]+)*/
-      - multiarch:
+      - publish_docker_multiarch:
           requires:
-            - amd64
-            - arm32v7
+            - publish_docker_linuxamd64
+            - publish_docker_linuxarm
           filters:
             branches:
               ignore: /.*/

.circleci/run-tests.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-cd ../BTCPayServer.Tests
-docker-compose -v
-docker-compose down --v
-docker-compose pull
-docker-compose build
-docker-compose run -e "TEST_FILTERS=$1" tests

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,34 +0,0 @@
----
-name: Report a problem
-about: File a technical problem or report a bug
----
-
-**Describe the problem/bug**
-A clear and concise description of what the bug is.
-
-**Your environment**
-* Version of BTCPay Server:
-* Deployment method: 
-* Other relevant environment details:
-
-**Logs (if applicable)**
-Basic logs can be found in Server Settings > Logs.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Actual behavior**
-Tell us what happens instead
-
-**Screenshots/Links**
-If applicable, add screenshots or links to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Ideas and feature requests
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Provide examples**
-If applicable provide examples, wireframes, sketches or images to better explain your idea.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
-  <Import Project="../Build/Common.csproj" />
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
-    <PackageReference Include="NBitcoin" Version="4.2.4" />
-    <PackageReference Include="NBXplorer.Client" Version="2.0.0.19" />
-  </ItemGroup>
-</Project>

BTCPayServer.Common/Extensions.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BTCPayServer
-{
-    public static class UtilitiesExtensions
-    {
-        public static void AddRange<T>(this HashSet<T> hashSet, IEnumerable<T> items)
-        {
-            foreach (var item in items)
-            {
-                hashSet.Add(item);
-            }
-        }
-    }
-}

BTCPayServer.Data/BTCPayServer.Data.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="../Build/Common.csproj" />
-  <ItemGroup>
-     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
-    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="2.0.0" />
-  </ItemGroup>
-</Project>

BTCPayServer.Data/Data/AddressInvoiceData.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Data
-{
-    public class AddressInvoiceData
-    {
-        /// <summary>
-        /// Some crypto currencies share same address prefix
-        /// For not having exceptions thrown by two address on different network, we suffix by "#CRYPTOCODE" 
-        /// </summary>
-        [Obsolete("Use GetHash instead")]
-        public string Address
-        {
-            get; set;
-        }
-
-        public InvoiceData InvoiceData
-        {
-            get; set;
-        }
-
-        public string InvoiceDataId
-        {
-            get; set;
-        }
-
-        public DateTimeOffset? CreatedTime
-        {
-            get; set;
-        }
-
-    }
-}

BTCPayServer.Data/Data/BTCPayOpenIdAuthorization.cs

@@ -1,6 +0,0 @@
-using OpenIddict.EntityFrameworkCore.Models;
-
-namespace BTCPayServer.Data
-{
-    public class BTCPayOpenIdAuthorization : OpenIddictAuthorization<string, BTCPayOpenIdClient, BTCPayOpenIdToken> { }
-}

BTCPayServer.Data/Data/BTCPayOpenIdClient.cs

@@ -1,10 +0,0 @@
-using OpenIddict.EntityFrameworkCore.Models;
-
-namespace BTCPayServer.Data
-{
-    public class BTCPayOpenIdClient: OpenIddictApplication<string, BTCPayOpenIdAuthorization, BTCPayOpenIdToken>
-    {
-        public string ApplicationUserId { get; set; }
-        public ApplicationUser ApplicationUser { get; set; }
-    }
-}

BTCPayServer.Data/Data/BTCPayOpenIdToken.cs

@@ -1,6 +0,0 @@
-using OpenIddict.EntityFrameworkCore.Models;
-
-namespace BTCPayServer.Data
-{
-    public class BTCPayOpenIdToken : OpenIddictToken<string, BTCPayOpenIdClient, BTCPayOpenIdAuthorization> { }
-}

BTCPayServer.Data/Data/PaymentRequestData.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BTCPayServer.Data
-{
-    public class PaymentRequestData
-    {
-        public string Id { get; set; }
-        public DateTimeOffset Created
-        {
-            get; set;
-        }
-        public string StoreDataId { get; set; }
-
-        public StoreData StoreData { get; set; }
-
-        public PaymentRequestStatus Status { get; set; }
-
-        public byte[] Blob { get; set; }
-
-        public class PaymentRequestBlob
-        {
-            public decimal Amount { get; set; }
-            public string Currency { get; set; }
-
-            public DateTime? ExpiryDate { get; set; }
-
-            public string Title { get; set; }
-            public string Description { get; set; }
-            public string Email { get; set; }
-
-            public string EmbeddedCSS { get; set; }
-            public string CustomCSSLink { get; set; }
-            public bool AllowCustomPaymentAmounts { get; set; }
-        }
-
-        public enum PaymentRequestStatus
-        {
-            Pending = 0,
-            Completed = 1,
-            Expired = 2
-        }
-    }
-}

BTCPayServer.Data/Data/StoreData.cs

@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json.Linq;
-using System.Security.Claims;
-
-namespace BTCPayServer.Data
-{
-    public enum SpeedPolicy
-    {
-        HighSpeed = 0,
-        MediumSpeed = 1,
-        LowSpeed = 2,
-        LowMediumSpeed = 3
-    }
-    public class StoreData
-    {
-        public string Id
-        {
-            get;
-            set;
-        }
-
-        public List<UserStore> UserStores
-        {
-            get; set;
-        }
-        public List<AppData> Apps
-        {
-            get; set;
-        }
-        
-        public List<PaymentRequestData> PaymentRequests
-        {
-            get; set;
-        }
-
-        public List<InvoiceData> Invoices { get; set; }
-
-        [Obsolete("Use GetDerivationStrategies instead")]
-        public string DerivationStrategy
-        {
-            get; set;
-        }
-
-        [Obsolete("Use GetDerivationStrategies instead")]
-        public string DerivationStrategies
-        {
-            get;
-            set;
-        }
-
-        public string StoreName
-        {
-            get; set;
-        }
-
-        public SpeedPolicy SpeedPolicy
-        {
-            get; set;
-        }
-
-        public string StoreWebsite
-        {
-            get; set;
-        }
-
-        public byte[] StoreCertificate
-        {
-            get; set;
-        }
-
-        [NotMapped]
-        [Obsolete]
-        public string Role
-        {
-            get; set;
-        }
-
-        public byte[] StoreBlob
-        {
-            get;
-            set;
-        }
-        [Obsolete("Use GetDefaultPaymentId instead")]
-        public string DefaultCrypto { get; set; }
-        public List<PairedSINData> PairedSINs { get; set; }
-        public IEnumerable<APIKeyData> APIKeys { get; set; }
-
-        [NotMapped]
-        public List<Claim> AdditionalClaims { get; set; } = new List<Claim>();
-    }
-
-    public enum NetworkFeeMode
-    {
-        MultiplePaymentsOnly,
-        Always,
-        Never
-    }
-}

BTCPayServer.Data/Data/StoredFile.cs

@@ -1,20 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace BTCPayServer.Data
-{
-    public class StoredFile
-    {
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public string Id { get; set; }
-
-        public string FileName { get; set; }
-        public string StorageFileName { get; set; }
-        public DateTime Timestamp { get; set; }
-        public string ApplicationUserId { get; set; }
-        public ApplicationUser ApplicationUser
-        {
-            get; set;
-        }
-    }
-}

BTCPayServer.Data/Data/U2FDevice.cs

@@ -1,23 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace BTCPayServer.Data
-{
-    public class U2FDevice
-    {
-        public string Id { get; set; }
-
-        public string Name { get; set; }
-
-        [Required] public byte[] KeyHandle { get; set; }
-
-        [Required] public byte[] PublicKey { get; set; }
-
-        [Required] public byte[] AttestationCert { get; set; }
-
-        [Required] public int Counter { get; set; }
-
-        public string ApplicationUserId { get; set; }
-        public ApplicationUser ApplicationUser { get; set; }
-    }
-}

BTCPayServer.Data/Data/WalletData.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace BTCPayServer.Data
-{
-    public class WalletData
-    {
-        [System.ComponentModel.DataAnnotations.Key]
-        public string Id { get; set; }
-
-        public List<WalletTransactionData> WalletTransactions { get; set; }
-
-        public byte[] Blob { get; set; }
-    }
-
-    public class Label
-    {
-        public Label(string value, string color)
-        {
-            if (value == null)
-                throw new ArgumentNullException(nameof(value));
-            if (color == null)
-                throw new ArgumentNullException(nameof(color));
-            Value = value;
-            Color = color;
-        }
-
-        public string Value { get; }
-        public string Color { get; }
-
-        public override bool Equals(object obj)
-        {
-            Label item = obj as Label;
-            if (item == null)
-                return false;
-            return Value.Equals(item.Value, StringComparison.OrdinalIgnoreCase);
-        }
-        public static bool operator ==(Label a, Label b)
-        {
-            if (System.Object.ReferenceEquals(a, b))
-                return true;
-            if (((object)a == null) || ((object)b == null))
-                return false;
-            return a.Value == b.Value;
-        }
-
-        public static bool operator !=(Label a, Label b)
-        {
-            return !(a == b);
-        }
-
-        public override int GetHashCode()
-        {
-            return Value.GetHashCode(StringComparison.OrdinalIgnoreCase);
-        }
-    }
-
-    public class WalletBlobInfo
-    {
-        public Dictionary<string, string> LabelColors { get; set; } = new Dictionary<string, string>();
-
-        public IEnumerable<Label> GetLabels(WalletTransactionInfo transactionInfo)
-        {
-            foreach (var label in transactionInfo.Labels)
-            {
-                if (LabelColors.TryGetValue(label, out var color))
-                {
-                    yield return new Label(label, color);
-                }
-            }
-        }
-
-        public IEnumerable<Label> GetLabels()
-        {
-            foreach (var kv in LabelColors)
-            {
-                yield return new Label(kv.Key, kv.Value);
-            }
-        }
-    }
-}

BTCPayServer.Data/Data/WalletTransactionData.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace BTCPayServer.Data
-{
-    public class WalletTransactionData
-    {
-        public string WalletDataId { get; set; }
-        public WalletData WalletData { get; set; }
-        public string TransactionId { get; set; }
-        public string Labels { get; set; }
-        public byte[] Blob { get; set; }
-    }
-
-    public class WalletTransactionInfo
-    {
-        public string Comment { get; set; } = string.Empty;
-        [JsonIgnore]
-        public HashSet<string> Labels { get; set; } = new HashSet<string>();
-    }
-}

BTCPayServer.Data/Migrations/20190225091644_AddOpenIddict.cs

@@ -1,171 +0,0 @@
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20190225091644_AddOpenIddict")]
-    public partial class AddOpenIddict : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "OpenIddictApplications",
-                columns: table => new
-                {
-                    ClientId = table.Column<string>(maxLength: 100, nullable: false),
-                    ClientSecret = table.Column<string>(nullable: true),
-                    ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
-                    ConsentType = table.Column<string>(nullable: true),
-                    DisplayName = table.Column<string>(nullable: true),
-                    Id = table.Column<string>(nullable: false),
-                    Permissions = table.Column<string>(nullable: true),
-                    PostLogoutRedirectUris = table.Column<string>(nullable: true),
-                    Properties = table.Column<string>(nullable: true),
-                    RedirectUris = table.Column<string>(nullable: true),
-                    Type = table.Column<string>(maxLength: 25, nullable: false),
-                    ApplicationUserId = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_OpenIddictApplications", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_OpenIddictApplications_AspNetUsers_ApplicationUserId",
-                        column: x => x.ApplicationUserId,
-                        principalTable: "AspNetUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "OpenIddictScopes",
-                columns: table => new
-                {
-                    ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
-                    Description = table.Column<string>(nullable: true),
-                    DisplayName = table.Column<string>(nullable: true),
-                    Id = table.Column<string>(nullable: false),
-                    Name = table.Column<string>(maxLength: 200, nullable: false),
-                    Properties = table.Column<string>(nullable: true),
-                    Resources = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_OpenIddictScopes", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "OpenIddictAuthorizations",
-                columns: table => new
-                {
-                    ApplicationId = table.Column<string>(nullable: true),
-                    ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
-                    Id = table.Column<string>(nullable: false),
-                    Properties = table.Column<string>(nullable: true),
-                    Scopes = table.Column<string>(nullable: true),
-                    Status = table.Column<string>(maxLength: 25, nullable: false),
-                    Subject = table.Column<string>(maxLength: 450, nullable: false),
-                    Type = table.Column<string>(maxLength: 25, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_OpenIddictAuthorizations", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_OpenIddictAuthorizations_OpenIddictApplications_ApplicationId",
-                        column: x => x.ApplicationId,
-                        principalTable: "OpenIddictApplications",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "OpenIddictTokens",
-                columns: table => new
-                {
-                    ApplicationId = table.Column<string>(nullable: true),
-                    AuthorizationId = table.Column<string>(nullable: true),
-                    ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
-                    CreationDate = table.Column<DateTimeOffset>(nullable: true),
-                    ExpirationDate = table.Column<DateTimeOffset>(nullable: true),
-                    Id = table.Column<string>(nullable: false),
-                    Payload = table.Column<string>(nullable: true),
-                    Properties = table.Column<string>(nullable: true),
-                    ReferenceId = table.Column<string>(maxLength: 100, nullable: true),
-                    Status = table.Column<string>(maxLength: 25, nullable: false),
-                    Subject = table.Column<string>(maxLength: 450, nullable: false),
-                    Type = table.Column<string>(maxLength: 25, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_OpenIddictTokens", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_OpenIddictTokens_OpenIddictApplications_ApplicationId",
-                        column: x => x.ApplicationId,
-                        principalTable: "OpenIddictApplications",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_OpenIddictTokens_OpenIddictAuthorizations_AuthorizationId",
-                        column: x => x.AuthorizationId,
-                        principalTable: "OpenIddictAuthorizations",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_OpenIddictApplications_ApplicationUserId",
-                table: "OpenIddictApplications",
-                column: "ApplicationUserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_OpenIddictApplications_ClientId",
-                table: "OpenIddictApplications",
-                column: "ClientId",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_OpenIddictAuthorizations_ApplicationId_Status_Subject_Type",
-                table: "OpenIddictAuthorizations",
-                columns: new[] { "ApplicationId", "Status", "Subject", "Type" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_OpenIddictScopes_Name",
-                table: "OpenIddictScopes",
-                column: "Name",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_OpenIddictTokens_AuthorizationId",
-                table: "OpenIddictTokens",
-                column: "AuthorizationId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_OpenIddictTokens_ReferenceId",
-                table: "OpenIddictTokens",
-                column: "ReferenceId",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_OpenIddictTokens_ApplicationId_Status_Subject_Type",
-                table: "OpenIddictTokens",
-                columns: new[] { "ApplicationId", "Status", "Subject", "Type" });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "OpenIddictScopes");
-
-            migrationBuilder.DropTable(
-                name: "OpenIddictTokens");
-
-            migrationBuilder.DropTable(
-                name: "OpenIddictAuthorizations");
-
-            migrationBuilder.DropTable(
-                name: "OpenIddictApplications");
-        }
-    }
-}

BTCPayServer.Data/Migrations/20190324141717_AddFiles.cs

@@ -1,47 +0,0 @@
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20190324141717_AddFiles")]
-    public partial class AddFiles : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Files",
-                columns: table => new
-                {
-                    Id = table.Column<string>(nullable: false),
-                    FileName = table.Column<string>(nullable: true),
-                    StorageFileName = table.Column<string>(nullable: true),
-                    Timestamp = table.Column<DateTime>(nullable: false),
-                    ApplicationUserId = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Files", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Files_AspNetUsers_ApplicationUserId",
-                        column: x => x.ApplicationUserId,
-                        principalTable: "AspNetUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Files_ApplicationUserId",
-                table: "Files",
-                column: "ApplicationUserId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Files");
-        }
-    }
-}

BTCPayServer.Data/Migrations/20190425081749_AddU2fDevices.cs

@@ -1,64 +0,0 @@
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20190425081749_AddU2fDevices")]
-    public partial class AddU2fDevices : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            if (this.SupportDropColumn(migrationBuilder.ActiveProvider))
-            {
-                migrationBuilder.DropColumn(
-                    name: "Facade",
-                    table: "PairedSINData");
-            }
-
-            migrationBuilder.CreateTable(
-                name: "U2FDevices",
-                columns: table => new
-                {
-                    Id = table.Column<string>(nullable: false),
-                    Name = table.Column<string>(nullable: true),
-                    KeyHandle = table.Column<byte[]>(nullable: false),
-                    PublicKey = table.Column<byte[]>(nullable: false),
-                    AttestationCert = table.Column<byte[]>(nullable: false),
-                    Counter = table.Column<int>(nullable: false),
-                    ApplicationUserId = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_U2FDevices", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_U2FDevices_AspNetUsers_ApplicationUserId",
-                        column: x => x.ApplicationUserId,
-                        principalTable: "AspNetUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_U2FDevices_ApplicationUserId",
-                table: "U2FDevices",
-                column: "ApplicationUserId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "U2FDevices");
-            //if it did not support dropping it, then it is still here and re-adding it would throw
-            if (this.SupportDropColumn(migrationBuilder.ActiveProvider))
-            {
-                migrationBuilder.AddColumn<string>(
-                    name: "Facade",
-                    table: "PairedSINData",
-                    nullable: true);
-            }
-        }
-    }
-}

BTCPayServer.Data/Migrations/20190701082105_sort_paymentrequests.cs

@@ -1,28 +0,0 @@
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20190701082105_sort_paymentrequests")]
-    public partial class sort_paymentrequests : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<DateTimeOffset>(
-                name: "Created",
-                table: "PaymentRequests",
-                nullable: false,
-                defaultValue: new DateTimeOffset(new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)));
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Created",
-                table: "PaymentRequests");
-        }
-    }
-}

BTCPayServer.Data/Migrations/20190802142637_WalletData.cs

@@ -1,56 +0,0 @@
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20190802142637_WalletData")]
-    public partial class WalletData : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Wallets",
-                columns: table => new
-                {
-                    Id = table.Column<string>(nullable: false),
-                    Blob = table.Column<byte[]>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Wallets", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "WalletTransactions",
-                columns: table => new
-                {
-                    WalletDataId = table.Column<string>(nullable: false),
-                    TransactionId = table.Column<string>(nullable: false),
-                    Labels = table.Column<string>(nullable: true),
-                    Blob = table.Column<byte[]>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_WalletTransactions", x => new { x.WalletDataId, x.TransactionId });
-                    table.ForeignKey(
-                        name: "FK_WalletTransactions_Wallets_WalletDataId",
-                        column: x => x.WalletDataId,
-                        principalTable: "Wallets",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "WalletTransactions");
-
-            migrationBuilder.DropTable(
-                name: "Wallets");
-        }
-    }
-}

BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -1,883 +0,0 @@
-// <auto-generated />
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    partial class ApplicationDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.11-servicing-32099");
-
-            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
-            {
-                b.Property<string>("Address")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<DateTimeOffset?>("CreatedTime");
-
-                b.Property<string>("InvoiceDataId");
-
-                b.HasKey("Address");
-
-                b.HasIndex("InvoiceDataId");
-
-                b.ToTable("AddressInvoices");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd()
-                    .HasMaxLength(50);
-
-                b.Property<string>("StoreId")
-                    .HasMaxLength(50);
-
-                b.HasKey("Id");
-
-                b.HasIndex("StoreId");
-
-                b.ToTable("ApiKeys");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("AppType");
-
-                b.Property<DateTimeOffset>("Created");
-
-                b.Property<string>("Name");
-
-                b.Property<string>("Settings");
-
-                b.Property<string>("StoreDataId");
-
-                b.Property<bool>("TagAllInvoices");
-
-                b.HasKey("Id");
-
-                b.HasIndex("StoreDataId");
-
-                b.ToTable("Apps");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.ApplicationUser", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<int>("AccessFailedCount");
-
-                b.Property<string>("ConcurrencyStamp")
-                    .IsConcurrencyToken();
-
-                b.Property<string>("Email")
-                    .HasMaxLength(256);
-
-                b.Property<bool>("EmailConfirmed");
-
-                b.Property<bool>("LockoutEnabled");
-
-                b.Property<DateTimeOffset?>("LockoutEnd");
-
-                b.Property<string>("NormalizedEmail")
-                    .HasMaxLength(256);
-
-                b.Property<string>("NormalizedUserName")
-                    .HasMaxLength(256);
-
-                b.Property<string>("PasswordHash");
-
-                b.Property<string>("PhoneNumber");
-
-                b.Property<bool>("PhoneNumberConfirmed");
-
-                b.Property<bool>("RequiresEmailConfirmation");
-
-                b.Property<string>("SecurityStamp");
-
-                b.Property<bool>("TwoFactorEnabled");
-
-                b.Property<string>("UserName")
-                    .HasMaxLength(256);
-
-                b.HasKey("Id");
-
-                b.HasIndex("NormalizedEmail")
-                    .HasName("EmailIndex");
-
-                b.HasIndex("NormalizedUserName")
-                    .IsUnique()
-                    .HasName("UserNameIndex");
-
-                b.ToTable("AspNetUsers");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdAuthorization", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("ApplicationId");
-
-                b.Property<string>("ConcurrencyToken")
-                    .IsConcurrencyToken()
-                    .HasMaxLength(50);
-
-                b.Property<string>("Properties");
-
-                b.Property<string>("Scopes");
-
-                b.Property<string>("Status")
-                    .IsRequired()
-                    .HasMaxLength(25);
-
-                b.Property<string>("Subject")
-                    .IsRequired()
-                    .HasMaxLength(450);
-
-                b.Property<string>("Type")
-                    .IsRequired()
-                    .HasMaxLength(25);
-
-                b.HasKey("Id");
-
-                b.HasIndex("ApplicationId", "Status", "Subject", "Type");
-
-                b.ToTable("OpenIddictAuthorizations");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdClient", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("ApplicationUserId");
-
-                b.Property<string>("ClientId")
-                    .IsRequired()
-                    .HasMaxLength(100);
-
-                b.Property<string>("ClientSecret");
-
-                b.Property<string>("ConcurrencyToken")
-                    .IsConcurrencyToken()
-                    .HasMaxLength(50);
-
-                b.Property<string>("ConsentType");
-
-                b.Property<string>("DisplayName");
-
-                b.Property<string>("Permissions");
-
-                b.Property<string>("PostLogoutRedirectUris");
-
-                b.Property<string>("Properties");
-
-                b.Property<string>("RedirectUris");
-
-                b.Property<string>("Type")
-                    .IsRequired()
-                    .HasMaxLength(25);
-
-                b.HasKey("Id");
-
-                b.HasIndex("ApplicationUserId");
-
-                b.HasIndex("ClientId")
-                    .IsUnique();
-
-                b.ToTable("OpenIddictApplications");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdToken", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("ApplicationId");
-
-                b.Property<string>("AuthorizationId");
-
-                b.Property<string>("ConcurrencyToken")
-                    .IsConcurrencyToken()
-                    .HasMaxLength(50);
-
-                b.Property<DateTimeOffset?>("CreationDate");
-
-                b.Property<DateTimeOffset?>("ExpirationDate");
-
-                b.Property<string>("Payload");
-
-                b.Property<string>("Properties");
-
-                b.Property<string>("ReferenceId")
-                    .HasMaxLength(100);
-
-                b.Property<string>("Status")
-                    .IsRequired()
-                    .HasMaxLength(25);
-
-                b.Property<string>("Subject")
-                    .IsRequired()
-                    .HasMaxLength(450);
-
-                b.Property<string>("Type")
-                    .IsRequired()
-                    .HasMaxLength(25);
-
-                b.HasKey("Id");
-
-                b.HasIndex("AuthorizationId");
-
-                b.HasIndex("ReferenceId")
-                    .IsUnique();
-
-                b.HasIndex("ApplicationId", "Status", "Subject", "Type");
-
-                b.ToTable("OpenIddictTokens");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
-            {
-                b.Property<string>("InvoiceDataId");
-
-                b.Property<string>("Address");
-
-                b.Property<DateTimeOffset>("Assigned");
-
-                b.Property<string>("CryptoCode");
-
-                b.Property<DateTimeOffset?>("UnAssigned");
-
-                b.HasKey("InvoiceDataId", "Address");
-
-                b.ToTable("HistoricalAddressInvoices");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<byte[]>("Blob");
-
-                b.Property<DateTimeOffset>("Created");
-
-                b.Property<string>("CustomerEmail");
-
-                b.Property<string>("ExceptionStatus");
-
-                b.Property<string>("ItemCode");
-
-                b.Property<string>("OrderId");
-
-                b.Property<string>("Status");
-
-                b.Property<string>("StoreDataId");
-
-                b.HasKey("Id");
-
-                b.HasIndex("StoreDataId");
-
-                b.ToTable("Invoices");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
-            {
-                b.Property<string>("InvoiceDataId");
-
-                b.Property<string>("UniqueId");
-
-                b.Property<string>("Message");
-
-                b.Property<DateTimeOffset>("Timestamp");
-
-                b.HasKey("InvoiceDataId", "UniqueId");
-
-                b.ToTable("InvoiceEvents");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("Label");
-
-                b.Property<DateTimeOffset>("PairingTime");
-
-                b.Property<string>("SIN");
-
-                b.Property<string>("StoreDataId");
-
-                b.HasKey("Id");
-
-                b.HasIndex("SIN");
-
-                b.HasIndex("StoreDataId");
-
-                b.ToTable("PairedSINData");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.PairingCodeData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<DateTime>("DateCreated");
-
-                b.Property<DateTimeOffset>("Expiration");
-
-                b.Property<string>("Facade");
-
-                b.Property<string>("Label");
-
-                b.Property<string>("SIN");
-
-                b.Property<string>("StoreDataId");
-
-                b.Property<string>("TokenValue");
-
-                b.HasKey("Id");
-
-                b.ToTable("PairingCodes");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<bool>("Accounted");
-
-                b.Property<byte[]>("Blob");
-
-                b.Property<string>("InvoiceDataId");
-
-                b.HasKey("Id");
-
-                b.HasIndex("InvoiceDataId");
-
-                b.ToTable("Payments");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.PaymentRequestData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<byte[]>("Blob");
-
-                b.Property<DateTimeOffset>("Created")
-                    .ValueGeneratedOnAdd()
-                    .HasDefaultValue(new DateTimeOffset(new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)));
-
-                b.Property<int>("Status");
-
-                b.Property<string>("StoreDataId");
-
-                b.HasKey("Id");
-
-                b.HasIndex("Status");
-
-                b.HasIndex("StoreDataId");
-
-                b.ToTable("PaymentRequests");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
-            {
-                b.Property<string>("Id");
-
-                b.HasKey("Id");
-
-                b.ToTable("PendingInvoices");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<byte[]>("Blob");
-
-                b.Property<string>("InvoiceDataId");
-
-                b.HasKey("Id");
-
-                b.HasIndex("InvoiceDataId");
-
-                b.ToTable("RefundAddresses");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.SettingData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("Value");
-
-                b.HasKey("Id");
-
-                b.ToTable("Settings");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.StoreData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("DefaultCrypto");
-
-                b.Property<string>("DerivationStrategies");
-
-                b.Property<string>("DerivationStrategy");
-
-                b.Property<int>("SpeedPolicy");
-
-                b.Property<byte[]>("StoreBlob");
-
-                b.Property<byte[]>("StoreCertificate");
-
-                b.Property<string>("StoreName");
-
-                b.Property<string>("StoreWebsite");
-
-                b.HasKey("Id");
-
-                b.ToTable("Stores");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("ApplicationUserId");
-
-                b.Property<string>("FileName");
-
-                b.Property<string>("StorageFileName");
-
-                b.Property<DateTime>("Timestamp");
-
-                b.HasKey("Id");
-
-                b.HasIndex("ApplicationUserId");
-
-                b.ToTable("Files");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("ApplicationUserId");
-
-                b.Property<byte[]>("AttestationCert")
-                    .IsRequired();
-
-                b.Property<int>("Counter");
-
-                b.Property<byte[]>("KeyHandle")
-                    .IsRequired();
-
-                b.Property<string>("Name");
-
-                b.Property<byte[]>("PublicKey")
-                    .IsRequired();
-
-                b.HasKey("Id");
-
-                b.HasIndex("ApplicationUserId");
-
-                b.ToTable("U2FDevices");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>
-            {
-                b.Property<string>("ApplicationUserId");
-
-                b.Property<string>("StoreDataId");
-
-                b.Property<string>("Role");
-
-                b.HasKey("ApplicationUserId", "StoreDataId");
-
-                b.HasIndex("StoreDataId");
-
-                b.ToTable("UserStore");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.WalletData", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<byte[]>("Blob");
-
-                b.HasKey("Id");
-
-                b.ToTable("Wallets");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.WalletTransactionData", b =>
-            {
-                b.Property<string>("WalletDataId");
-
-                b.Property<string>("TransactionId");
-
-                b.Property<byte[]>("Blob");
-
-                b.Property<string>("Labels");
-
-                b.HasKey("WalletDataId", "TransactionId");
-
-                b.ToTable("WalletTransactions");
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("ConcurrencyStamp")
-                    .IsConcurrencyToken();
-
-                b.Property<string>("Name")
-                    .HasMaxLength(256);
-
-                b.Property<string>("NormalizedName")
-                    .HasMaxLength(256);
-
-                b.HasKey("Id");
-
-                b.HasIndex("NormalizedName")
-                    .IsUnique()
-                    .HasName("RoleNameIndex");
-
-                b.ToTable("AspNetRoles");
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-            {
-                b.Property<int>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("ClaimType");
-
-                b.Property<string>("ClaimValue");
-
-                b.Property<string>("RoleId")
-                    .IsRequired();
-
-                b.HasKey("Id");
-
-                b.HasIndex("RoleId");
-
-                b.ToTable("AspNetRoleClaims");
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-            {
-                b.Property<int>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("ClaimType");
-
-                b.Property<string>("ClaimValue");
-
-                b.Property<string>("UserId")
-                    .IsRequired();
-
-                b.HasKey("Id");
-
-                b.HasIndex("UserId");
-
-                b.ToTable("AspNetUserClaims");
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-            {
-                b.Property<string>("LoginProvider");
-
-                b.Property<string>("ProviderKey");
-
-                b.Property<string>("ProviderDisplayName");
-
-                b.Property<string>("UserId")
-                    .IsRequired();
-
-                b.HasKey("LoginProvider", "ProviderKey");
-
-                b.HasIndex("UserId");
-
-                b.ToTable("AspNetUserLogins");
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-            {
-                b.Property<string>("UserId");
-
-                b.Property<string>("RoleId");
-
-                b.HasKey("UserId", "RoleId");
-
-                b.HasIndex("RoleId");
-
-                b.ToTable("AspNetUserRoles");
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-            {
-                b.Property<string>("UserId");
-
-                b.Property<string>("LoginProvider");
-
-                b.Property<string>("Name");
-
-                b.Property<string>("Value");
-
-                b.HasKey("UserId", "LoginProvider", "Name");
-
-                b.ToTable("AspNetUserTokens");
-            });
-
-            modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictScope<string>", b =>
-            {
-                b.Property<string>("Id")
-                    .ValueGeneratedOnAdd();
-
-                b.Property<string>("ConcurrencyToken")
-                    .IsConcurrencyToken()
-                    .HasMaxLength(50);
-
-                b.Property<string>("Description");
-
-                b.Property<string>("DisplayName");
-
-                b.Property<string>("Name")
-                    .IsRequired()
-                    .HasMaxLength(200);
-
-                b.Property<string>("Properties");
-
-                b.Property<string>("Resources");
-
-                b.HasKey("Id");
-
-                b.HasIndex("Name")
-                    .IsUnique();
-
-                b.ToTable("OpenIddictScopes");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                    .WithMany("AddressInvoices")
-                    .HasForeignKey("InvoiceDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                    .WithMany("APIKeys")
-                    .HasForeignKey("StoreId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                    .WithMany("Apps")
-                    .HasForeignKey("StoreDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdAuthorization", b =>
-            {
-                b.HasOne("BTCPayServer.Data.BTCPayOpenIdClient", "Application")
-                    .WithMany("Authorizations")
-                    .HasForeignKey("ApplicationId");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdClient", b =>
-            {
-                b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
-                    .WithMany("OpenIdClients")
-                    .HasForeignKey("ApplicationUserId");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdToken", b =>
-            {
-                b.HasOne("BTCPayServer.Data.BTCPayOpenIdClient", "Application")
-                    .WithMany("Tokens")
-                    .HasForeignKey("ApplicationId");
-
-                b.HasOne("BTCPayServer.Data.BTCPayOpenIdAuthorization", "Authorization")
-                    .WithMany("Tokens")
-                    .HasForeignKey("AuthorizationId");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                    .WithMany("HistoricalAddressInvoices")
-                    .HasForeignKey("InvoiceDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                    .WithMany("Invoices")
-                    .HasForeignKey("StoreDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                    .WithMany("Events")
-                    .HasForeignKey("InvoiceDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                    .WithMany("PairedSINs")
-                    .HasForeignKey("StoreDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                    .WithMany("Payments")
-                    .HasForeignKey("InvoiceDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.PaymentRequestData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                    .WithMany("PaymentRequests")
-                    .HasForeignKey("StoreDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                    .WithMany("PendingInvoices")
-                    .HasForeignKey("Id")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                    .WithMany("RefundAddresses")
-                    .HasForeignKey("InvoiceDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
-            {
-                b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
-                    .WithMany("StoredFiles")
-                    .HasForeignKey("ApplicationUserId");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
-            {
-                b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
-                    .WithMany("U2FDevices")
-                    .HasForeignKey("ApplicationUserId");
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>
-            {
-                b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
-                    .WithMany("UserStores")
-                    .HasForeignKey("ApplicationUserId")
-                    .OnDelete(DeleteBehavior.Cascade);
-
-                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                    .WithMany("UserStores")
-                    .HasForeignKey("StoreDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("BTCPayServer.Data.WalletTransactionData", b =>
-            {
-                b.HasOne("BTCPayServer.Data.WalletData", "WalletData")
-                    .WithMany("WalletTransactions")
-                    .HasForeignKey("WalletDataId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-            {
-                b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
-                    .WithMany()
-                    .HasForeignKey("RoleId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-            {
-                b.HasOne("BTCPayServer.Data.ApplicationUser")
-                    .WithMany()
-                    .HasForeignKey("UserId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-            {
-                b.HasOne("BTCPayServer.Data.ApplicationUser")
-                    .WithMany()
-                    .HasForeignKey("UserId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-            {
-                b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
-                    .WithMany()
-                    .HasForeignKey("RoleId")
-                    .OnDelete(DeleteBehavior.Cascade);
-
-                b.HasOne("BTCPayServer.Data.ApplicationUser")
-                    .WithMany()
-                    .HasForeignKey("UserId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-            {
-                b.HasOne("BTCPayServer.Data.ApplicationUser")
-                    .WithMany()
-                    .HasForeignKey("UserId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
-#pragma warning restore 612, 618
-        }
-    }
-}

BTCPayServer.Data/MigrationsExtensions.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-
-namespace BTCPayServer.Migrations
-{
-    public static class MigrationsExtensions
-    {
-        public static bool SupportDropColumn(this Microsoft.EntityFrameworkCore.Migrations.Migration migration, string activeProvider)
-        {
-            return activeProvider != "Microsoft.EntityFrameworkCore.Sqlite";
-        }
-
-        public static bool SupportDropForeignKey(this Microsoft.EntityFrameworkCore.Migrations.Migration migration, string activeProvider)
-        {
-            return activeProvider != "Microsoft.EntityFrameworkCore.Sqlite";
-        }
-        public static bool SupportDropForeignKey(this DatabaseFacade facade)
-        {
-            return facade.ProviderName != "Microsoft.EntityFrameworkCore.Sqlite";
-        }
-    }
-}

BTCPayServer.Rating/BTCPayServer.Rating.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
-  <Import Project="../Build/Common.csproj" />
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Folder Include="Providers\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\BTCPayServer.Common\BTCPayServer.Common.csproj" />
-  </ItemGroup>
-
-</Project>

BTCPayServer.Rating/Providers/BitbankRateProvider.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Rating;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class BitbankRateProvider : IRateProvider, IHasExchangeName
-    {
-        private readonly HttpClient _httpClient;
-        public BitbankRateProvider(HttpClient httpClient)
-        {
-            _httpClient = httpClient ?? new HttpClient();
-        }
-        public string ExchangeName => "bitbank";
-
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
-        {
-            var response = await _httpClient.GetAsync("https://public.bitbank.cc/prices", cancellationToken);
-            var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
-            return new ExchangeRates(((jobj["data"] as JObject) ?? new JObject())
-                .Properties()
-                .Select(p => new ExchangeRate(ExchangeName, CurrencyPair.Parse(p.Name), CreateBidAsk(p)))
-                .ToArray());
-
-        }
-
-        private static BidAsk CreateBidAsk(JProperty p)
-        {
-            var buy = p.Value["buy"].Value<decimal>();
-            var sell = p.Value["sell"].Value<decimal>();
-            // Bug from their API (https://github.com/btcpayserver/btcpayserver/issues/741)
-            return buy < sell ? new BidAsk(buy, sell) : new BidAsk(sell, buy);
-        }
-    }
-}

BTCPayServer.Rating/Providers/BitpayRateProvider.cs

@@ -1,35 +0,0 @@
-using System.Linq;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using BTCPayServer.Rating;
-using System.Threading;
-using System.Net.Http;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class BitpayRateProvider : IRateProvider, IHasExchangeName
-    {
-        public const string BitpayName = "bitpay";
-        private readonly HttpClient _httpClient;
-        public BitpayRateProvider(HttpClient httpClient)
-        {
-            _httpClient = httpClient ?? new HttpClient();
-        }
-
-        public string ExchangeName => BitpayName;
-
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
-        {
-            var response = await _httpClient.GetAsync("https://bitpay.com/rates", cancellationToken);
-            var jarray = (JArray)(await response.Content.ReadAsAsync<JObject>(cancellationToken))["data"];
-            return new ExchangeRates(jarray
-                .Children<JObject>()
-                .Select(jobj => new ExchangeRate(ExchangeName, new CurrencyPair("BTC", jobj["code"].Value<string>()), new BidAsk(jobj["rate"].Value<decimal>())))
-                .Where(o => o.CurrencyPair.Right != "BTC")
-                .ToArray());
-        }
-    }
-}

BTCPayServer.Rating/Providers/ByllsRateProvider.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Rating;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class ByllsRateProvider : IRateProvider, IHasExchangeName
-    {
-        private readonly HttpClient _httpClient;
-        public ByllsRateProvider(HttpClient httpClient)
-        {
-            _httpClient = httpClient ?? new HttpClient();
-        }
-        public string ExchangeName => "bylls";
-
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
-        {
-            var response = await _httpClient.GetAsync("https://bylls.com/api/price?from_currency=BTC&to_currency=CAD", cancellationToken);
-            var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
-            var value = jobj["public_price"]["to_price"].Value<decimal>();
-            return new ExchangeRates(new[] { new ExchangeRate(ExchangeName, new CurrencyPair("BTC", "CAD"), new BidAsk(value)) });
-        }
-    }
-}

BTCPayServer.Rating/Providers/NdaxRateProvider.cs

@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Rating;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class NdaxRateProvider : IRateProvider, IHasExchangeName
-    {
-        private readonly HttpClient _httpClient;
-
-        public NdaxRateProvider(HttpClient httpClient)
-        {
-            _httpClient = httpClient ?? new HttpClient();
-        }
-
-        public string ExchangeName => "ndax";
-
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
-        {
-            var response = await _httpClient.GetAsync("https://ndax.io/api/returnTicker", cancellationToken);
-            var jobj = await response.Content.ReadAsAsync<Dictionary<string, JObject>>(cancellationToken);
-            return new ExchangeRates(jobj.Select(pair => new ExchangeRate(ExchangeName, CurrencyPair.Parse(pair.Key),
-                new BidAsk(GetValue(pair.Value["highestBid"]), GetValue(pair.Value["lowestAsk"])))));
-        }
-
-        private static decimal GetValue(JToken jobj)
-        {
-            return string.IsNullOrEmpty(jobj.ToString()) ? 0 : jobj.Value<decimal>();
-        }
-
-    }
-}

BTCPayServer.Tests/AuthenticationTests.cs

@@ -1,385 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using AspNet.Security.OpenIdConnect.Primitives;
-using BTCPayServer.Tests.Logging;
-using Microsoft.IdentityModel.Protocols.OpenIdConnect;
-using Xunit;
-using Xunit.Abstractions;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using BTCPayServer.Data;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using OpenIddict.Abstractions;
-using OpenQA.Selenium;
-
-namespace BTCPayServer.Tests
-{
-    public class AuthenticationTests
-    {
-        public AuthenticationTests(ITestOutputHelper helper)
-        {
-            Logs.Tester = new XUnitLog(helper) {Name = "Tests"};
-            Logs.LogProvider = new XUnitLogProvider(helper);
-        }
-
-        [Fact]
-        [Trait("Integration", "Integration")]
-        public async Task GetRedirectedToLoginPathOnChallenge()
-        {
-            using (var tester = ServerTester.Create())
-            {
-                tester.Start();
-                var client = tester.PayTester.HttpClient;
-                //Wallets endpoint is protected
-                var response = await client.GetAsync("wallets");
-                var urlPath = response.RequestMessage.RequestUri.ToString()
-                    .Replace(tester.PayTester.ServerUri.ToString(), "");
-                //Cookie Challenge redirects you to login page
-                Assert.StartsWith("Account/Login", urlPath, StringComparison.InvariantCultureIgnoreCase);
-
-                var queryString = response.RequestMessage.RequestUri.ParseQueryString();
-
-                Assert.NotNull(queryString["ReturnUrl"]);
-                Assert.Equal("/wallets", queryString["ReturnUrl"]);
-            }
-        }
-
-        [Fact]
-        [Trait("Integration", "Integration")]
-        public async Task CanGetOpenIdConfiguration()
-        {
-            using (var tester = ServerTester.Create())
-            {
-                tester.Start();
-                using (var response =
-                    await tester.PayTester.HttpClient.GetAsync("/.well-known/openid-configuration"))
-                {
-                    using (var streamToReadFrom = new StreamReader(await response.Content.ReadAsStreamAsync()))
-                    {
-                        var json = await streamToReadFrom.ReadToEndAsync();
-                        Assert.NotNull(json);
-                        var configuration = OpenIdConnectConfiguration.Create(json);
-                        Assert.NotNull(configuration);
-                    }
-                }
-            }
-        }
-
-        [Fact]
-        [Trait("Integration", "Integration")]
-        public async Task CanUseNonInteractiveFlows()
-        {
-            using (var tester = ServerTester.Create())
-            {
-                tester.Start();
-
-                var user = tester.NewAccount();
-                user.GrantAccess();
-                var token = await RegisterPasswordClientAndGetAccessToken(user, null, tester);
-                await TestApiAgainstAccessToken(token, tester, user);
-                token = await RegisterPasswordClientAndGetAccessToken(user, "secret", tester);
-                await TestApiAgainstAccessToken(token, tester, user);
-                token = await RegisterClientCredentialsFlowAndGetAccessToken(user, "secret", tester);
-                await TestApiAgainstAccessToken(token, tester, user);
-            }
-        }
-
-        [Trait("Selenium", "Selenium")]
-        [Fact]
-        public async Task CanUseImplicitFlow()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                var tester = s.Server;
-
-                var user = tester.NewAccount();
-                user.GrantAccess();
-                var id = Guid.NewGuid().ToString();
-                var redirecturi = new Uri("http://127.0.0.1/oidc-callback");
-                var openIdClient = await user.RegisterOpenIdClient(
-                    new OpenIddictApplicationDescriptor()
-                    {
-                        ClientId = id,
-                        DisplayName = id,
-                        Permissions = {OpenIddictConstants.Permissions.GrantTypes.Implicit},
-                        RedirectUris = {redirecturi}
-                    });
-                var implicitAuthorizeUrl = new Uri(tester.PayTester.ServerUri,
-                    $"connect/authorize?response_type=token&client_id={id}&redirect_uri={redirecturi.AbsoluteUri}&scope=openid&nonce={Guid.NewGuid().ToString()}");
-                s.Driver.Navigate().GoToUrl(implicitAuthorizeUrl);
-                s.Login(user.RegisterDetails.Email, user.RegisterDetails.Password);
-                s.Driver.FindElement(By.Id("consent-yes")).Click();
-                var url = s.Driver.Url;
-                var results = url.Split("#").Last().Split("&")
-                    .ToDictionary(s1 => s1.Split("=")[0], s1 => s1.Split("=")[1]);
-                await TestApiAgainstAccessToken(results["access_token"], tester, user);
-                //in Implicit mode, you renew your token  by hitting the same endpoint but adding prompt=none. If you are still logged in on the site, you will receive a fresh token.
-                var implicitAuthorizeUrlSilentModel = new Uri($"{implicitAuthorizeUrl.OriginalString}&prompt=none");
-                s.Driver.Navigate().GoToUrl(implicitAuthorizeUrlSilentModel);
-                url = s.Driver.Url;
-                results = url.Split("#").Last().Split("&").ToDictionary(s1 => s1.Split("=")[0], s1 => s1.Split("=")[1]);
-                await TestApiAgainstAccessToken(results["access_token"], tester, user);
-
-                LogoutFlow(tester, id, s);
-                
-                s.Driver.Navigate().GoToUrl(implicitAuthorizeUrl);
-                s.Login(user.RegisterDetails.Email, user.RegisterDetails.Password);
-                
-                Assert.Throws<NoSuchElementException>(() => s.Driver.FindElement(By.Id("consent-yes")));
-                results = url.Split("#").Last().Split("&")
-                    .ToDictionary(s1 => s1.Split("=")[0], s1 => s1.Split("=")[1]);
-                await TestApiAgainstAccessToken(results["access_token"], tester, user);
-            }
-        }
-
-        void LogoutFlow(ServerTester tester, string clientId, SeleniumTester seleniumTester)
-        {
-            var logoutUrl = new Uri(tester.PayTester.ServerUri,
-                $"connect/logout?response_type=token&client_id={clientId}");
-            seleniumTester.Driver.Navigate().GoToUrl(logoutUrl);
-            seleniumTester.GoToHome();
-            Assert.Throws<NoSuchElementException>(() => seleniumTester.Driver.FindElement(By.Id("Logout")));
-            
-        }
-
-        [Trait("Selenium", "Selenium")]
-        [Fact]
-        public async Task CanUseCodeFlow()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                var tester = s.Server;
-
-                var user = tester.NewAccount();
-                user.GrantAccess();
-                var id = Guid.NewGuid().ToString();
-                var redirecturi = new Uri("http://127.0.0.1/oidc-callback");
-                var secret = "secret";
-                var openIdClient = await user.RegisterOpenIdClient(
-                    new OpenIddictApplicationDescriptor()
-                    {
-                        ClientId = id,
-                        DisplayName = id,
-                        Permissions =
-                        {
-                            OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
-                            OpenIddictConstants.Permissions.GrantTypes.RefreshToken
-                        },
-                        RedirectUris = {redirecturi}
-                    }, secret);
-                var authorizeUrl = new Uri(tester.PayTester.ServerUri,
-                    $"connect/authorize?response_type=code&client_id={id}&redirect_uri={redirecturi.AbsoluteUri}&scope=openid offline_access&state={Guid.NewGuid().ToString()}");
-                s.Driver.Navigate().GoToUrl(authorizeUrl);
-                s.Login(user.RegisterDetails.Email, user.RegisterDetails.Password);
-                s.Driver.FindElement(By.Id("consent-yes")).Click();
-                var url = s.Driver.Url;
-                var results = url.Split("?").Last().Split("&")
-                    .ToDictionary(s1 => s1.Split("=")[0], s1 => s1.Split("=")[1]);
-
-                var httpClient = tester.PayTester.HttpClient;
-
-                var httpRequest = new HttpRequestMessage(HttpMethod.Post,
-                    new Uri(tester.PayTester.ServerUri, "/connect/token"))
-                {
-                    Content = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>()
-                    {
-                        new KeyValuePair<string, string>("grant_type",
-                            OpenIddictConstants.GrantTypes.AuthorizationCode),
-                        new KeyValuePair<string, string>("client_id", openIdClient.ClientId),
-                        new KeyValuePair<string, string>("client_secret", secret),
-                        new KeyValuePair<string, string>("code", results["code"]),
-                        new KeyValuePair<string, string>("redirect_uri", redirecturi.AbsoluteUri)
-                    })
-                };
-
-
-                var response = await httpClient.SendAsync(httpRequest);
-
-                Assert.True(response.IsSuccessStatusCode);
-
-                string content = await response.Content.ReadAsStringAsync();
-                var result = JObject.Parse(content).ToObject<OpenIdConnectResponse>();
-
-                await TestApiAgainstAccessToken(result.AccessToken, tester, user);
-
-                var refreshedAccessToken = await RefreshAnAccessToken(result.RefreshToken, httpClient, id, secret);
-
-                await TestApiAgainstAccessToken(refreshedAccessToken, tester, user);
-                
-                LogoutFlow(tester, id, s);
-                s.Driver.Navigate().GoToUrl(authorizeUrl);
-                s.Login(user.RegisterDetails.Email, user.RegisterDetails.Password);
-                
-                Assert.Throws<NoSuchElementException>(() => s.Driver.FindElement(By.Id("consent-yes")));
-                results = url.Split("?").Last().Split("&")
-                    .ToDictionary(s1 => s1.Split("=")[0], s1 => s1.Split("=")[1]);
-                Assert.True(results.ContainsKey("code"));
-            }
-        }
-
-        private static async Task<string> RefreshAnAccessToken(string refreshToken, HttpClient client, string clientId,
-            string clientSecret = null)
-        {
-            var httpRequest = new HttpRequestMessage(HttpMethod.Post,
-                new Uri(client.BaseAddress, "/connect/token"))
-            {
-                Content = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>()
-                {
-                    new KeyValuePair<string, string>("grant_type",
-                        OpenIddictConstants.GrantTypes.RefreshToken),
-                    new KeyValuePair<string, string>("client_id", clientId),
-                    new KeyValuePair<string, string>("client_secret", clientSecret),
-                    new KeyValuePair<string, string>("refresh_token", refreshToken)
-                })
-            };
-
-            var response = await client.SendAsync(httpRequest);
-
-            Assert.True(response.IsSuccessStatusCode);
-
-            string content = await response.Content.ReadAsStringAsync();
-            var result = JObject.Parse(content).ToObject<OpenIdConnectResponse>();
-            Assert.NotEmpty(result.AccessToken);
-            Assert.Null(result.Error);
-            return result.AccessToken;
-        }
-
-        private static async Task<string> RegisterClientCredentialsFlowAndGetAccessToken(TestAccount user,
-            string secret,
-            ServerTester tester)
-        {
-            var id = Guid.NewGuid().ToString();
-            var openIdClient = await user.RegisterOpenIdClient(
-                new OpenIddictApplicationDescriptor()
-                {
-                    ClientId = id,
-                    DisplayName = id,
-                    Permissions = {OpenIddictConstants.Permissions.GrantTypes.ClientCredentials}
-                }, secret);
-
-
-            var httpClient = tester.PayTester.HttpClient;
-
-            var httpRequest = new HttpRequestMessage(HttpMethod.Post,
-                new Uri(tester.PayTester.ServerUri, "/connect/token"))
-            {
-                Content = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>()
-                {
-                    new KeyValuePair<string, string>("grant_type",
-                        OpenIddictConstants.GrantTypes.ClientCredentials),
-                    new KeyValuePair<string, string>("client_id", openIdClient.ClientId),
-                    new KeyValuePair<string, string>("client_secret", secret)
-                })
-            };
-
-
-            var response = await httpClient.SendAsync(httpRequest);
-
-            Assert.True(response.IsSuccessStatusCode);
-
-            string content = await response.Content.ReadAsStringAsync();
-            var result = JObject.Parse(content).ToObject<OpenIdConnectResponse>();
-            Assert.NotEmpty(result.AccessToken);
-            Assert.Null(result.Error);
-            return result.AccessToken;
-        }
-
-        private static async Task<string> RegisterPasswordClientAndGetAccessToken(TestAccount user, string secret,
-            ServerTester tester)
-        {
-            var id = Guid.NewGuid().ToString();
-            var openIdClient = await user.RegisterOpenIdClient(
-                new OpenIddictApplicationDescriptor()
-                {
-                    ClientId = id,
-                    DisplayName = id,
-                    Permissions = {OpenIddictConstants.Permissions.GrantTypes.Password}
-                }, secret);
-
-
-            var httpClient = tester.PayTester.HttpClient;
-
-            var httpRequest = new HttpRequestMessage(HttpMethod.Post,
-                new Uri(tester.PayTester.ServerUri, "/connect/token"))
-            {
-                Content = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>()
-                {
-                    new KeyValuePair<string, string>("grant_type", OpenIddictConstants.GrantTypes.Password),
-                    new KeyValuePair<string, string>("username", user.RegisterDetails.Email),
-                    new KeyValuePair<string, string>("password", user.RegisterDetails.Password),
-                    new KeyValuePair<string, string>("client_id", openIdClient.ClientId),
-                    new KeyValuePair<string, string>("client_secret", secret)
-                })
-            };
-
-
-            var response = await httpClient.SendAsync(httpRequest);
-
-            Assert.True(response.IsSuccessStatusCode);
-
-            string content = await response.Content.ReadAsStringAsync();
-            var result = JObject.Parse(content).ToObject<OpenIdConnectResponse>();
-            Assert.NotEmpty(result.AccessToken);
-            Assert.Null(result.Error);
-            return result.AccessToken;
-        }
-
-        async Task TestApiAgainstAccessToken(string accessToken, ServerTester tester, TestAccount testAccount)
-        {
-            var resultUser =
-                await TestApiAgainstAccessToken<string>(accessToken, "api/test/me/id",
-                    tester.PayTester.HttpClient);
-            Assert.Equal(testAccount.UserId, resultUser);
-
-            var secondUser = tester.NewAccount();
-            secondUser.GrantAccess();
-
-            var resultStores =
-                await TestApiAgainstAccessToken<StoreData[]>(accessToken, "api/test/me/stores",
-                    tester.PayTester.HttpClient);
-            Assert.Contains(resultStores,
-                data => data.Id.Equals(testAccount.StoreId, StringComparison.InvariantCultureIgnoreCase));
-            Assert.DoesNotContain(resultStores,
-                data => data.Id.Equals(secondUser.StoreId, StringComparison.InvariantCultureIgnoreCase));
-
-            Assert.True(await TestApiAgainstAccessToken<bool>(accessToken,
-                $"api/test/me/stores/{testAccount.StoreId}/can-edit",
-                tester.PayTester.HttpClient));
-
-
-            Assert.Equal(testAccount.RegisterDetails.IsAdmin, await TestApiAgainstAccessToken<bool>(accessToken,
-                $"api/test/me/is-admin",
-                tester.PayTester.HttpClient));
-
-            await Assert.ThrowsAnyAsync<HttpRequestException>(async () =>
-            {
-                await TestApiAgainstAccessToken<bool>(accessToken, $"api/test/me/stores/{secondUser.StoreId}/can-edit",
-                    tester.PayTester.HttpClient);
-            });
-        }
-
-        public async Task<T> TestApiAgainstAccessToken<T>(string accessToken, string url, HttpClient client)
-        {
-            var httpRequest = new HttpRequestMessage(HttpMethod.Get,
-                new Uri(client.BaseAddress, url));
-            httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
-            var result = await client.SendAsync(httpRequest);
-            result.EnsureSuccessStatusCode();
-
-            var rawJson = await result.Content.ReadAsStringAsync();
-            if (typeof(T).IsPrimitive || typeof(T) == typeof(string))
-            {
-                return (T)Convert.ChangeType(rawJson, typeof(T));
-            }
-
-            return JsonConvert.DeserializeObject<T>(rawJson);
-        }
-    }
-}

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -10,9 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="76.0.3809.6801" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
@@ -33,8 +31,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BTCPayServer.Rating\BTCPayServer.Rating.csproj" />
     <ProjectReference Include="..\BTCPayServer\BTCPayServer.csproj" />
   </ItemGroup>
-
 </Project>

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -1,4 +1,4 @@
-using BTCPayServer.Configuration;
+using BTCPayServer.Configuration;
 using System.Linq;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Hosting;
@@ -33,12 +33,8 @@ using System.Security.Claims;
 using System.Security.Principal;
 using System.Text;
 using System.Threading;
-using AspNet.Security.OpenIdConnect.Primitives;
 using Xunit;
 using BTCPayServer.Services;
-using System.Net.Http;
-using Microsoft.AspNetCore.Hosting.Server.Features;
-using System.Threading.Tasks;
 
 namespace BTCPayServer.Tests
 {
@@ -105,25 +101,16 @@ namespace BTCPayServer.Tests
 
             StringBuilder config = new StringBuilder();
             config.AppendLine($"{chain.ToLowerInvariant()}=1");
-            if (InContainer)
-            {
-                config.AppendLine($"bind=0.0.0.0");
-            }
             config.AppendLine($"port={Port}");
             config.AppendLine($"chains=btc,ltc");
 
             config.AppendLine($"btc.explorer.url={NBXplorerUri.AbsoluteUri}");
             config.AppendLine($"btc.explorer.cookiefile=0");
-            config.AppendLine("allow-admin-registration=1");
+
             config.AppendLine($"ltc.explorer.url={LTCNBXplorerUri.AbsoluteUri}");
             config.AppendLine($"ltc.explorer.cookiefile=0");
+
             config.AppendLine($"btc.lightning={IntegratedLightning.AbsoluteUri}");
-            if (!string.IsNullOrEmpty(SSHPassword) && string.IsNullOrEmpty(SSHKeyFile))
-                config.AppendLine($"sshpassword={SSHPassword}");
-            if (!string.IsNullOrEmpty(SSHKeyFile))
-                config.AppendLine($"sshkeyfile={SSHKeyFile}");
-            if (!string.IsNullOrEmpty(SSHConnection))
-                config.AppendLine($"sshconnection={SSHConnection}");
 
             if (TestDatabase == TestDatabases.MySQL && !String.IsNullOrEmpty(MySQL))
                 config.AppendLine($"mysql=" + MySQL);
@@ -133,18 +120,15 @@ namespace BTCPayServer.Tests
             File.WriteAllText(confPath, config.ToString());
 
             ServerUri = new Uri("http://" + HostName + ":" + Port + "/");
-            HttpClient = new HttpClient();
-            HttpClient.BaseAddress = ServerUri;
+
             Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development");
             var conf = new DefaultConfiguration() { Logger = Logs.LogProvider.CreateLogger("Console") }.CreateConfiguration(new[] { "--datadir", _Directory, "--conf", confPath, "--disable-registration", "false" });
             _Host = new WebHostBuilder()
                     .UseConfiguration(conf)
-                    .UseContentRoot(FindBTCPayServerDirectory())
                     .ConfigureServices(s =>
                     {
                         s.AddLogging(l =>
                         {
-                            l.AddFilter("System.Net.Http.HttpClient", LogLevel.Critical);
                             l.SetMinimumLevel(LogLevel.Information)
                             .AddFilter("Microsoft", LogLevel.Error)
                             .AddFilter("Hangfire", LogLevel.Error)
@@ -154,18 +138,14 @@ namespace BTCPayServer.Tests
                     .UseKestrel()
                     .UseStartup<Startup>()
                     .Build();
-            _Host.StartWithTasksAsync().GetAwaiter().GetResult();
-
-            var urls = _Host.ServerFeatures.Get<IServerAddressesFeature>().Addresses;
-            foreach (var url in urls)
-            {
-                Logs.Tester.LogInformation("Listening on " + url);
-            }
-            Logs.Tester.LogInformation("Server URI " + ServerUri);
-
+            _Host.Start();
             InvoiceRepository = (InvoiceRepository)_Host.Services.GetService(typeof(InvoiceRepository));
             StoreRepository = (StoreRepository)_Host.Services.GetService(typeof(StoreRepository));
-            Networks = (BTCPayNetworkProvider)_Host.Services.GetService(typeof(BTCPayNetworkProvider));
+            var dashBoard = (NBXplorerDashboard)_Host.Services.GetService(typeof(NBXplorerDashboard));
+            while(!dashBoard.IsFullySynched())
+            {
+                Thread.Sleep(10);
+            }
 
             if (MockRates)
             {
@@ -226,50 +206,8 @@ namespace BTCPayServer.Tests
                 });
                 rateProvider.Providers.Add("bittrex", bittrex);
             }
-
-            
-
-            WaitSiteIsOperational().GetAwaiter().GetResult();
         }
 
-        private async Task WaitSiteIsOperational()
-        {
-            using (var cts = new CancellationTokenSource(10_000))
-            {
-                var synching = WaitIsFullySynched(cts.Token);
-                var accessingHomepage = WaitCanAccessHomepage(cts.Token);
-                await Task.WhenAll(synching, accessingHomepage).ConfigureAwait(false);
-            }
-        }
-
-        private async Task WaitCanAccessHomepage(CancellationToken cancellationToken)
-        {
-            while (true)
-            {
-                var resp = await HttpClient.GetAsync("/", cancellationToken).ConfigureAwait(false);
-                if (resp.StatusCode == HttpStatusCode.OK)
-                    break;
-                await Task.Delay(10, cancellationToken).ConfigureAwait(false);
-            }
-        }
-
-        private async Task WaitIsFullySynched(CancellationToken cancellationToken)
-        {
-            var dashBoard = GetService<NBXplorerDashboard>();
-            while (!dashBoard.IsFullySynched())
-            {
-                await Task.Delay(10, cancellationToken).ConfigureAwait(false);
-            }
-        }
-
-        private string FindBTCPayServerDirectory()
-        {
-            var solutionDirectory = LanguageService.TryGetSolutionDirectoryInfo(Directory.GetCurrentDirectory());
-            return Path.Combine(solutionDirectory.FullName, "BTCPayServer");
-        }
-
-        public HttpClient HttpClient { get; set; }
-
         public string HostName
         {
             get;
@@ -277,7 +215,6 @@ namespace BTCPayServer.Tests
         }
         public InvoiceRepository InvoiceRepository { get; private set; }
         public StoreRepository StoreRepository { get; private set; }
-        public BTCPayNetworkProvider Networks { get; private set; }
         public Uri IntegratedLightning { get; internal set; }
         public bool InContainer { get; internal set; }
 
@@ -286,11 +223,6 @@ namespace BTCPayServer.Tests
             return _Host.Services.GetRequiredService<T>();
         }
 
-        public IServiceProvider ServiceProvider => _Host.Services;
-
-        public string SSHPassword { get; internal set; }
-        public string SSHKeyFile { get; internal set; }
-        public string SSHConnection { get; set; }
         public T GetController<T>(string userId = null, string storeId = null, Claim[] additionalClaims = null) where T : Controller
         {
             var context = new DefaultHttpContext();
@@ -300,7 +232,7 @@ namespace BTCPayServer.Tests
             if (userId != null)
             {
                 List<Claim> claims = new List<Claim>();
-                claims.Add(new Claim(OpenIdConnectConstants.Claims.Subject, userId));
+                claims.Add(new Claim(ClaimTypes.NameIdentifier, userId));
                 if (additionalClaims != null)
                     claims.AddRange(additionalClaims);
                 context.User = new ClaimsPrincipal(new ClaimsIdentity(claims.ToArray(), Policies.CookieAuthentication));

BTCPayServer.Tests/ChangellyTests.cs

@@ -27,7 +27,7 @@ namespace BTCPayServer.Tests
             Logs.LogProvider = new XUnitLogProvider(helper);
         }
 
-        [Fact(Timeout = 60000)]
+        [Fact]
         [Trait("Integration", "Integration")]
         public async void CanSetChangellyPaymentMethod()
         {
@@ -218,7 +218,7 @@ namespace BTCPayServer.Tests
                     tester.NetworkProvider, fetcher);
                 changellyController.IsTest = true;
                 Assert.IsType<decimal>(Assert
-                    .IsType<OkObjectResult>(await changellyController.CalculateAmount(user.StoreId, "ltc", "btc", 1.0m, default))
+                    .IsType<OkObjectResult>(await changellyController.CalculateAmount(user.StoreId, "ltc", "btc", 1.0m))
                     .Value);
             }
         }

BTCPayServer.Tests/CheckoutUITests.cs

@@ -1,180 +0,0 @@
-using System;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using BTCPayServer.Lightning;
-using BTCPayServer.Tests.Logging;
-using BTCPayServer.Views.Stores;
-using NBitpayClient;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Interactions;
-using OpenQA.Selenium.Support.UI;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace BTCPayServer.Tests
-{
-    [Trait("Selenium", "Selenium")]
-    public class CheckoutUITests
-    {
-        public CheckoutUITests(ITestOutputHelper helper)
-        {
-            Logs.Tester = new XUnitLog(helper) {Name = "Tests"};
-            Logs.LogProvider = new XUnitLogProvider(helper);
-        }
-       
-        
-        [Fact]
-        public void CanCreateInvoice()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                var store = s.CreateNewStore().storeName;
-                s.AddDerivationScheme();
-
-                s.CreateInvoice(store);
-
-                s.Driver.FindElement(By.ClassName("invoice-details-link")).Click();
-                s.Driver.AssertNoError();
-                s.Driver.Navigate().Back();
-                s.Driver.FindElement(By.ClassName("invoice-checkout-link")).Click();
-                Assert.NotEmpty(s.Driver.FindElements(By.Id("checkoutCtrl")));
-                s.Driver.Quit();
-            }
-        }
-        
-        [Fact]
-        public async Task CanHandleRefundEmailForm()
-        {
-
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                var store = s.CreateNewStore();
-                s.AddDerivationScheme("BTC");
-
-                var emailAlreadyThereInvoiceId =s.CreateInvoice(store.storeName, 100, "USD", "a@g.com");
-                s.GoToInvoiceCheckout(emailAlreadyThereInvoiceId);
-                s.Driver.AssertElementNotFound(By.Id("emailAddressFormInput"));
-                s.GoToHome();
-                var invoiceId = s.CreateInvoice(store.storeName);
-                s.GoToInvoiceCheckout(invoiceId);
-                Assert.True(s.Driver.FindElement(By.Id("emailAddressFormInput")).Displayed);
-                s.Driver.FindElement(By.Id("emailAddressFormInput")).SendKeys("xxx");
-                s.Driver.FindElement(By.Id("emailAddressForm")).FindElement(By.CssSelector("button.action-button"))
-                    .Click();
-                var formInput = s.Driver.FindElement(By.Id("emailAddressFormInput"));
-                
-                Assert.True(formInput.Displayed);
-                Assert.Contains("form-input-invalid", formInput.GetAttribute("class"));
-                formInput = s.Driver.FindElement(By.Id("emailAddressFormInput"));
-                formInput.SendKeys("@g.com");
-                
-                s.Driver.FindElement(By.Id("emailAddressForm")).FindElement(By.CssSelector("button.action-button"))
-                    .Click();
-                await Task.Delay(1000);
-                s.Driver.AssertElementNotFound(By.Id("emailAddressFormInput"));
-                
-                s.Driver.Navigate().Refresh();
-
-                s.Driver.AssertElementNotFound(By.Id("emailAddressFormInput"));
-            }
-        }
-
-        [Fact]
-        public async Task CanUseLanguageDropdown()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                var store = s.CreateNewStore();
-                s.AddDerivationScheme("BTC");
-
-                var invoiceId = s.CreateInvoice(store.storeName);
-                s.GoToInvoiceCheckout(invoiceId);
-                Assert.True(s.Driver.FindElement(By.Id("DefaultLang")).FindElements(By.TagName("option")).Count > 1);
-                var payWithTextEnglish = s.Driver.FindElement(By.Id("pay-with-text")).Text;
-                
-                var prettyDropdown = s.Driver.FindElement(By.Id("prettydropdown-DefaultLang"));
-                prettyDropdown.Click();
-                await Task.Delay(200);
-                prettyDropdown.FindElement(By.CssSelector("[data-value=\"da-DK\"]")).Click();
-                await Task.Delay(1000);
-                Assert.NotEqual(payWithTextEnglish, s.Driver.FindElement(By.Id("pay-with-text")).Text);
-                s.Driver.Navigate().GoToUrl(s.Driver.Url + "?lang=da-DK");
-                
-                Assert.NotEqual(payWithTextEnglish, s.Driver.FindElement(By.Id("pay-with-text")).Text);
-                
-                s.Driver.Quit();
-            }
-        }
-        
-        [Fact]
-        public void CanUsePaymentMethodDropdown()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                var store = s.CreateNewStore();
-                s.AddDerivationScheme("BTC");
-                
-                //check that there is no dropdown since only one payment method is set
-                var invoiceId = s.CreateInvoice(store.storeName, 10, "USD", "a@g.com");
-                s.GoToInvoiceCheckout(invoiceId);
-                s.Driver.FindElement(By.ClassName("payment__currencies_noborder"));
-                s.GoToHome();
-                s.GoToStore(store.storeId);
-                s.AddDerivationScheme("LTC");
-                s.AddLightningNode("BTC",LightningConnectionType.CLightning);
-                //there should be three now
-                invoiceId = s.CreateInvoice(store.storeName, 10, "USD", "a@g.com");
-                s.GoToInvoiceCheckout(invoiceId);
-                var currencyDropdownButton =  s.Driver.FindElement(By.ClassName("payment__currencies"));
-                Assert.Contains("BTC", currencyDropdownButton.Text);
-                currencyDropdownButton.Click();
-                
-                var elements = s.Driver.FindElement(By.ClassName("vex-content"))
-                    .FindElements(By.ClassName("vexmenuitem"));
-                Assert.Equal(3, elements.Count);
-                elements.Single(element => element.Text.Contains("LTC")).Click();
-                currencyDropdownButton =  s.Driver.FindElement(By.ClassName("payment__currencies"));
-                Assert.Contains("LTC", currencyDropdownButton.Text);
-                
-                elements = s.Driver.FindElement(By.ClassName("vex-content"))
-                    .FindElements(By.ClassName("vexmenuitem"));
-                
-                elements.Single(element => element.Text.Contains("Lightning")).Click();
-                
-                Assert.Contains("Lightning", currencyDropdownButton.Text);
-                
-                s.Driver.Quit();
-            }
-        }
-        
-        [Fact]
-        public void CanUseLightningSatsFeature()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                var store = s.CreateNewStore();
-                s.AddInternalLightningNode("BTC");
-                s.GoToStore(store.storeId, StoreNavPages.Checkout);
-                s.SetCheckbox(s, "LightningAmountInSatoshi", true);
-                var command = s.Driver.FindElement(By.Name("command"));
-               
-                command.ForceClick();
-                var invoiceId = s.CreateInvoice(store.storeName, 10, "USD", "a@g.com");
-                s.GoToInvoiceCheckout(invoiceId);
-                Assert.Contains("Sats", s.Driver.FindElement(By.ClassName("payment__currencies_noborder")).Text);
-                
-            }
-        }
-    }
-}

BTCPayServer.Tests/CoinSwitchTests.cs

@@ -5,7 +5,6 @@ using BTCPayServer.Tests.Logging;
 using Microsoft.AspNetCore.Mvc;
 using Xunit;
 using Xunit.Abstractions;
-using BTCPayServer.Data;
 
 namespace BTCPayServer.Tests
 {

BTCPayServer.Tests/CrowdfundTests.cs

@@ -109,7 +109,7 @@ namespace BTCPayServer.Tests
                 Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(0.01)
-                }, default));
+                }));
                 
                 Assert.IsType<NotFoundResult>(await anonAppPubsController.ViewCrowdfund(appId, string.Empty));
                 
@@ -118,7 +118,7 @@ namespace BTCPayServer.Tests
                 {
                     RedirectToCheckout = false,
                     Amount = new decimal(0.01)
-                }, default));
+                }));
                 Assert.IsType<ViewResult>(await publicApps.ViewCrowdfund(appId, string.Empty));
                 Assert.IsType<NotFoundResult>(await anonAppPubsController.ViewCrowdfund(appId, string.Empty));
                 
@@ -130,7 +130,7 @@ namespace BTCPayServer.Tests
                 Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(0.01)
-                }, default));
+                }));
                 
                 //Scenario 4: Enabled But End Date < Now - Not Allowed
                 
@@ -142,7 +142,7 @@ namespace BTCPayServer.Tests
                 Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(0.01)
-                }, default));
+                }));
                 
                 
                 //Scenario 5: Enabled and within correct timeframe, however target is enforced and Amount is Over - Not Allowed
@@ -156,13 +156,13 @@ namespace BTCPayServer.Tests
                 Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(1.01)
-                }, default));
+                }));
                 
                 //Scenario 6: Allowed
                 Assert.IsType<OkObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(0.05)
-                }, default));
+                }));
                 
             }
         }

BTCPayServer.Tests/Dockerfile

@@ -1,28 +1,17 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1.505-alpine3.7 AS builder
+FROM microsoft/dotnet:2.1.500-sdk-alpine3.7 AS builder
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
 RUN apk add --no-cache icu-libs
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 
+# This should be removed soon https://github.com/dotnet/corefx/issues/30003
+RUN apk add --no-cache curl 
+
 WORKDIR /source
-COPY Build/Common.csproj Build/Common.csproj
 COPY BTCPayServer/BTCPayServer.csproj BTCPayServer/BTCPayServer.csproj
-COPY BTCPayServer.Common/BTCPayServer.Common.csproj BTCPayServer.Common/BTCPayServer.Common.csproj
-COPY BTCPayServer.Rating/BTCPayServer.Rating.csproj BTCPayServer.Rating/BTCPayServer.Rating.csproj
 COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj
 RUN dotnet restore BTCPayServer.Tests/BTCPayServer.Tests.csproj
-
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
-
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-
-RUN apk add --no-cache chromium chromium-chromedriver icu-libs
-
-ENV SCREEN_HEIGHT 600 \
-    SCREEN_WIDTH 1200
-
 COPY . .
-RUN cd BTCPayServer.Tests && dotnet build
+RUN dotnet build
 WORKDIR /source/BTCPayServer.Tests
 ENTRYPOINT ["./docker-entrypoint.sh"]

BTCPayServer.Tests/Extensions.cs

@@ -1,87 +0,0 @@
-using System.Text;
-using System.Threading.Tasks;
-using BTCPayServer.Tests.Logging;
-using Microsoft.AspNetCore.Mvc;
-using OpenQA.Selenium;
-using Xunit;
-
-namespace BTCPayServer.Tests
-{
-    public static class Extensions
-    {
-        public static void ScrollTo(this IWebDriver driver, By by)
-        {
-            var element = driver.FindElement(by);
-        }
-        /// <summary>
-        /// Sometimes the chrome driver is fucked up and we need some magic to click on the element.
-        /// </summary>
-        /// <param name="element"></param>
-        public static void ForceClick(this IWebElement element)
-        {
-            element.SendKeys(Keys.Return);
-        }
-        public static void AssertNoError(this IWebDriver driver)
-        {
-            try
-            {
-                Assert.NotEmpty(driver.FindElements(By.ClassName("navbar-brand")));
-            }
-            catch
-            {
-                StringBuilder builder = new StringBuilder();
-                builder.AppendLine();
-                foreach (var logKind in new []{ LogType.Browser, LogType.Client, LogType.Driver, LogType.Server })
-                {
-                    try
-                    {
-                        var logs = driver.Manage().Logs.GetLog(logKind);
-                        builder.AppendLine($"Selenium [{logKind}]:");
-                        foreach (var entry in logs)
-                        {
-                            builder.AppendLine($"[{entry.Level}]: {entry.Message}");
-                        }
-                    }
-                    catch { }
-                    builder.AppendLine($"---------");
-                }
-                Logs.Tester.LogInformation(builder.ToString());
-                builder = new StringBuilder();
-                builder.AppendLine($"Selenium [Sources]:");
-                builder.AppendLine(driver.PageSource);
-                builder.AppendLine($"---------");
-                Logs.Tester.LogInformation(builder.ToString());
-                throw;
-            }
-        }
-        public static T AssertViewModel<T>(this IActionResult result)
-        {
-            Assert.NotNull(result);
-            var vr = Assert.IsType<ViewResult>(result);
-            return Assert.IsType<T>(vr.Model);
-        }
-        public static async Task<T> AssertViewModelAsync<T>(this Task<IActionResult> task)
-        {
-            var result = await task;
-            Assert.NotNull(result);
-            var vr = Assert.IsType<ViewResult>(result);
-            return Assert.IsType<T>(vr.Model);
-        }
-
-        public static IWebElement AssertElementNotFound(this IWebDriver driver, By by)
-        {
-            try
-            {
-                var webElement = driver.FindElement(by);
-                Assert.False(webElement.Displayed);
-                return webElement;
-            }
-            catch (NoSuchElementException)
-            {
-                
-            }
-
-            return null;
-        }
-    }
-}

BTCPayServer.Tests/MockDelay.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
@@ -36,29 +35,27 @@ namespace BTCPayServer.Tests
             }
         }
 
-        public async Task Advance(TimeSpan time)
+        public void Advance(TimeSpan time)
         {
             _Now += time;
-            List<WaitObj> overdue = new List<WaitObj>();
             lock (waits)
             {
                 foreach (var wait in waits.ToArray())
                 {
                     if (_Now >= wait.Expiration)
                     {
-                        overdue.Add(wait);
+                        wait.CTS.TrySetResult(true);
                         waits.Remove(wait);
                     }
                 }
             }
-            foreach (var o in overdue)
-                o.CTS.TrySetResult(true);
-            try
-            {
-                await Task.WhenAll(overdue.Select(o => o.CTS.Task).ToArray());
-            }
-            catch { }
         }
+
+        public void AdvanceMilliseconds(long milli)
+        {
+            Advance(TimeSpan.FromMilliseconds(milli));
+        }
+
         public override string ToString()
         {
             return _Now.Millisecond.ToString(CultureInfo.InvariantCulture);

BTCPayServer.Tests/Mocks/MockRateProvider.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using BTCPayServer.Services.Rates;
@@ -11,7 +10,7 @@ namespace BTCPayServer.Tests.Mocks
     public class MockRateProvider : IRateProvider
     {
         public ExchangeRates ExchangeRates { get; set; } = new ExchangeRates();
-        public Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public Task<ExchangeRates> GetRatesAsync()
         {
             return Task.FromResult(ExchangeRates);
         }

BTCPayServer.Tests/PSBTTests.cs

@@ -1,126 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using BTCPayServer.Controllers;
-using BTCPayServer.Models.WalletViewModels;
-using BTCPayServer.Tests.Logging;
-using Microsoft.AspNetCore.Mvc;
-using NBitcoin;
-using NBitpayClient;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace BTCPayServer.Tests
-{
-    public class PSBTTests
-    {
-        public PSBTTests(ITestOutputHelper helper)
-        {
-            Logs.Tester = new XUnitLog(helper) { Name = "Tests" };
-            Logs.LogProvider = new XUnitLogProvider(helper);
-        }
-        [Fact]
-        [Trait("Integration", "Integration")]
-        public async Task CanPlayWithPSBT()
-        {
-            using (var tester = ServerTester.Create())
-            {
-                tester.Start();
-                var user = tester.NewAccount();
-                user.GrantAccess();
-                user.RegisterDerivationScheme("BTC");
-                var invoice = user.BitPay.CreateInvoice(new Invoice()
-                {
-                    Price = 10,
-                    Currency = "USD",
-                    PosData = "posData",
-                    OrderId = "orderId",
-                    ItemDesc = "Some \", description",
-                    FullNotifications = true
-                }, Facade.Merchant);
-                var cashCow = tester.ExplorerNode;
-                var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, cashCow.Network);
-                cashCow.SendToAddress(invoiceAddress, Money.Coins(1.5m));
-                TestUtils.Eventually(() =>
-                {
-                    invoice = user.BitPay.GetInvoice(invoice.Id);
-                    Assert.Equal("paid", invoice.Status);
-                });
-
-                var walletController = tester.PayTester.GetController<WalletsController>(user.UserId);
-                var walletId = new WalletId(user.StoreId, "BTC");
-                var sendDestination = new Key().PubKey.Hash.GetAddress(user.SupportedNetwork.NBitcoinNetwork).ToString();
-                var sendModel = new WalletSendModel()
-                {
-                    Outputs = new List<WalletSendModel.TransactionOutput>()
-                    {
-                        new WalletSendModel.TransactionOutput()
-                        {
-                            DestinationAddress = sendDestination,
-                            Amount = 0.1m,
-                        }
-                    },
-                    FeeSatoshiPerByte = 1,
-                    CurrentBalance = 1.5m
-                };
-                var vmLedger = await walletController.WalletSend(walletId, sendModel, command: "ledger").AssertViewModelAsync<WalletSendLedgerModel>();
-                PSBT.Parse(vmLedger.PSBT, user.SupportedNetwork.NBitcoinNetwork);
-                BitcoinAddress.Create(vmLedger.HintChange, user.SupportedNetwork.NBitcoinNetwork);
-                Assert.NotNull(vmLedger.SuccessPath);
-                Assert.NotNull(vmLedger.WebsocketPath);
-
-                var redirectedPSBT = (string)Assert.IsType<RedirectToActionResult>(await walletController.WalletSend(walletId, sendModel, command: "analyze-psbt")).RouteValues["psbt"];
-                var vmPSBT = await walletController.WalletPSBT(walletId, new WalletPSBTViewModel() { PSBT = redirectedPSBT }).AssertViewModelAsync<WalletPSBTViewModel>();
-                var unsignedPSBT = PSBT.Parse(vmPSBT.PSBT, user.SupportedNetwork.NBitcoinNetwork);
-                Assert.NotNull(vmPSBT.Decoded);
-
-                var filePSBT = (FileContentResult)(await walletController.WalletPSBT(walletId, vmPSBT, "save-psbt"));
-                PSBT.Load(filePSBT.FileContents, user.SupportedNetwork.NBitcoinNetwork);
-
-                await walletController.WalletPSBT(walletId, vmPSBT, "ledger").AssertViewModelAsync<WalletSendLedgerModel>();
-                var vmPSBT2 = await walletController.WalletPSBT(walletId, vmPSBT, "broadcast").AssertViewModelAsync<WalletPSBTReadyViewModel>();
-                Assert.NotEmpty(vmPSBT2.Inputs.Where(i => i.Error != null));
-                Assert.Equal(vmPSBT.PSBT, vmPSBT2.PSBT);
-
-                var signedPSBT = unsignedPSBT.Clone();
-                signedPSBT.SignAll(user.DerivationScheme, user.ExtKey);
-                vmPSBT.PSBT = signedPSBT.ToBase64();
-                var psbtReady = await walletController.WalletPSBT(walletId, vmPSBT, "broadcast").AssertViewModelAsync<WalletPSBTReadyViewModel>();
-                Assert.Equal(2 + 1, psbtReady.Destinations.Count); // The fee is a destination
-                Assert.Contains(psbtReady.Destinations, d => d.Destination == sendDestination && !d.Positive);
-                Assert.Contains(psbtReady.Destinations, d => d.Positive);
-                var redirect = Assert.IsType<RedirectToActionResult>(await walletController.WalletPSBTReady(walletId, psbtReady, command: "broadcast"));
-                Assert.Equal(nameof(walletController.WalletTransactions), redirect.ActionName);
-
-                vmPSBT.PSBT = unsignedPSBT.ToBase64();
-                var combineVM = await walletController.WalletPSBT(walletId, vmPSBT, "combine").AssertViewModelAsync<WalletPSBTCombineViewModel>();
-                Assert.Equal(vmPSBT.PSBT, combineVM.OtherPSBT);
-                combineVM.PSBT = signedPSBT.ToBase64();
-                vmPSBT = await walletController.WalletPSBTCombine(walletId, combineVM).AssertViewModelAsync<WalletPSBTViewModel>();
-
-                var signedPSBT2 = PSBT.Parse(vmPSBT.PSBT, user.SupportedNetwork.NBitcoinNetwork);
-                Assert.True(signedPSBT.TryFinalize(out _));
-                Assert.True(signedPSBT2.TryFinalize(out _));
-                Assert.Equal(signedPSBT, signedPSBT2);
-
-                // Can use uploaded file?
-                combineVM.PSBT = null;
-                combineVM.UploadedPSBTFile = TestUtils.GetFormFile("signedPSBT", signedPSBT.ToBytes());
-                vmPSBT = await walletController.WalletPSBTCombine(walletId, combineVM).AssertViewModelAsync<WalletPSBTViewModel>();
-                signedPSBT2 = PSBT.Parse(vmPSBT.PSBT, user.SupportedNetwork.NBitcoinNetwork);
-                Assert.True(signedPSBT.TryFinalize(out _));
-                Assert.True(signedPSBT2.TryFinalize(out _));
-                Assert.Equal(signedPSBT, signedPSBT2);
-
-                var ready = (await walletController.WalletPSBTReady(walletId, signedPSBT.ToBase64())).AssertViewModel<WalletPSBTReadyViewModel>();
-                Assert.Equal(signedPSBT.ToBase64(), ready.PSBT);
-                redirect = Assert.IsType<RedirectToActionResult>(await walletController.WalletPSBTReady(walletId, ready, command: "analyze-psbt"));
-                Assert.Equal(signedPSBT.ToBase64(), (string)redirect.RouteValues["psbt"]);
-                redirect = Assert.IsType<RedirectToActionResult>(await walletController.WalletPSBTReady(walletId, ready, command: "broadcast"));
-                Assert.Equal(nameof(walletController.WalletTransactions), redirect.ActionName);
-            }
-        }
-    }
-}

BTCPayServer.Tests/PaymentHandlerTest.cs

@@ -1,239 +0,0 @@
-using BTCPayServer.Tests.Logging;
-using NBitcoin;
-using Xunit;
-using Xunit.Abstractions;
-using BTCPayServer.Data;
-using BTCPayServer.Services.Rates;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using BTCPayServer.Payments;
-using BTCPayServer.Payments.Bitcoin;
-using BTCPayServer.Payments.Lightning;
-using BTCPayServer.Rating;
-
-namespace BTCPayServer.Tests
-{
-    public class PaymentHandlerTest
-    {
-        private BitcoinLikePaymentHandler handlerBTC;
-        private LightningLikePaymentHandler handlerLN;
-        private Dictionary<CurrencyPair, Task<RateResult>> currencyPairRateResult;
-        
-        public PaymentHandlerTest(ITestOutputHelper helper)
-        {
- 
-#pragma warning disable CS0618            
-            
-            Logs.Tester = new XUnitLog(helper) { Name = "Tests" };
-            Logs.LogProvider = new XUnitLogProvider(helper);
-            
-            var dummy = new Key().PubKey.GetAddress(ScriptPubKeyType.Legacy, Network.RegTest).ToString();
-            var networkProvider = new BTCPayNetworkProvider(NetworkType.Regtest);
-
-            currencyPairRateResult = new Dictionary<CurrencyPair, Task<RateResult>>();
-            
-            var rateResultUSDBTC = new RateResult();
-            rateResultUSDBTC.BidAsk= new BidAsk(1m);
-
-            var rateResultBTCUSD = new RateResult();
-            rateResultBTCUSD.BidAsk= new BidAsk(1m);
-            
-            currencyPairRateResult.Add(new CurrencyPair("USD", "BTC"), Task.FromResult(rateResultUSDBTC));
-            currencyPairRateResult.Add(new CurrencyPair("BTC", "USD"), Task.FromResult(rateResultBTCUSD));
- 
-            handlerBTC = new BitcoinLikePaymentHandler(null, networkProvider, null, null);
-            handlerLN = new LightningLikePaymentHandler(null, null, networkProvider, null);
-            
-#pragma warning restore CS0618               
-        }
-
-        [Fact]
-        public void CanPayWithLightningWhenInvoiceTotalUnderLightningMaxValue()
-        {
-            
-#pragma warning disable CS0618
-            
-            //Given
-            var store = new StoreBlob
-            {
-                OnChainMinValue = null,
-                LightningMaxValue = new CurrencyValue() {Value = 100.00m, Currency = "USD"}
-            };
-            var paymentMethodId = new PaymentMethodId("BTC", PaymentTypes.LightningLike);
-            
-            //When
-            var totalInvoiceAmount = new Money(98m, MoneyUnit.BTC);
-            
-           
-            //Then
-            var errorMessage = handlerLN.IsPaymentMethodAllowedBasedOnInvoiceAmount(store, currencyPairRateResult,
-                totalInvoiceAmount, paymentMethodId);
-            
-            Assert.Equal(errorMessage.Result, string.Empty);
-
-#pragma warning restore CS0618     
-        }
-
-    
-        [Fact]
-        public void CannotPayWithLightningWhenInvoiceTotalAboveLightningMaxValue()
-        {
-            
-#pragma warning disable CS0618
-            
-            //Given
-            var store = new StoreBlob
-            {
-                OnChainMinValue = null,
-                LightningMaxValue = new CurrencyValue() {Value = 100.00m, Currency = "USD"}
-            };
-            var totalInvoiceAmount = new Money(102m, MoneyUnit.BTC);
-            
-            //When
-            var paymentMethodId = new PaymentMethodId("BTC", PaymentTypes.LightningLike);
-           
-            //Then
-            var errorMessage = handlerLN.IsPaymentMethodAllowedBasedOnInvoiceAmount(store, currencyPairRateResult,
-                totalInvoiceAmount, paymentMethodId);
-            
-            Assert.NotEqual(errorMessage.Result, string.Empty);
-
-#pragma warning restore CS0618     
-        }    
-        
-        [Fact]
-        public void CanPayWithLightningWhenInvoiceTotalEqualLightningMaxValue()
-        {
-            
-#pragma warning disable CS0618
-            
-            //Given
-            var store = new StoreBlob
-            {
-                OnChainMinValue = null,
-                LightningMaxValue = new CurrencyValue() {Value = 100.00m, Currency = "USD"}
-            };
-            var paymentMethodId = new PaymentMethodId("BTC", PaymentTypes.LightningLike);
-            
-            //When
-            var totalInvoiceAmount = new Money(100m, MoneyUnit.BTC);
-           
-            //Then
-            var errorMessage = handlerLN.IsPaymentMethodAllowedBasedOnInvoiceAmount(store, currencyPairRateResult,
-                totalInvoiceAmount, paymentMethodId);
-            
-            Assert.Equal(errorMessage.Result, string.Empty);
-
-#pragma warning restore CS0618     
-        }
-
-        [Fact]
-        public void CanPayWithBitcoinWhenInvoiceTotalAboveOnChainMinValue()
-        {
-            
-#pragma warning disable CS0618
-            
-            //Given
-            var store = new StoreBlob
-            {
-                OnChainMinValue = new CurrencyValue() {Value = 100.00m, Currency = "USD"},
-                LightningMaxValue = null
-            };
-            var paymentMethodId = new PaymentMethodId("BTC", PaymentTypes.BTCLike);
-            
-            //When
-            var totalInvoiceAmount = new Money(105m, MoneyUnit.BTC);
-            
-           
-            //Then
-            var errorMessage = handlerBTC.IsPaymentMethodAllowedBasedOnInvoiceAmount(store, currencyPairRateResult,
-                totalInvoiceAmount, paymentMethodId);
-            
-            Assert.Equal(errorMessage.Result, string.Empty);
-
-#pragma warning restore CS0618     
-        }
-
-    
-        [Fact]
-        public void CannotPayWithBitcoinWhenInvoiceTotalUnderOnChainMinValue()
-        {
-            
-#pragma warning disable CS0618
-            
-            //Given
-            var store = new StoreBlob
-            {
-                OnChainMinValue = new CurrencyValue() {Value = 100.00m, Currency = "USD"},
-                LightningMaxValue = null
-            };
-            var totalInvoiceAmount = new Money(98m, MoneyUnit.BTC);
-            
-            //When
-            var paymentMethodId = new PaymentMethodId("BTC", PaymentTypes.BTCLike);
-           
-            //Then
-            var errorMessage = handlerBTC.IsPaymentMethodAllowedBasedOnInvoiceAmount(store, currencyPairRateResult,
-                totalInvoiceAmount, paymentMethodId);
-            
-            Assert.NotEqual(errorMessage.Result, string.Empty);
-
-#pragma warning restore CS0618     
-        }    
-        
-        [Fact]
-        public void CanPayWithBitcoinWhenInvoiceTotalEqualOnChainMinValue()
-        {
-            
-#pragma warning disable CS0618
-            
-            //Given
-            var store = new StoreBlob
-            {
-                OnChainMinValue = new CurrencyValue() {Value = 100.00m, Currency = "USD"},
-                LightningMaxValue = null
-            };
-            var paymentMethodId = new PaymentMethodId("BTC", PaymentTypes.BTCLike);
-            
-            //When
-            var totalInvoiceAmount = new Money(100m, MoneyUnit.BTC);
-           
-            //Then
-            var errorMessage = handlerBTC.IsPaymentMethodAllowedBasedOnInvoiceAmount(store, currencyPairRateResult,
-                totalInvoiceAmount, paymentMethodId);
-            
-            Assert.Equal(errorMessage.Result, string.Empty);
-
-#pragma warning restore CS0618     
-        }
-   
-        
-        [Fact]
-        public void CannotPayWithBitcoinWhenInvoiceTotalUnderOnChainMinValueWhenLightningMaxValueIsGreater()
-        {
-            
-#pragma warning disable CS0618
-            
-            //Given
-            var store = new StoreBlob
-            {
-                OnChainMinValue = new CurrencyValue() {Value = 50.00m, Currency = "USD"},
-                LightningMaxValue = new CurrencyValue() {Value = 100.00m, Currency = "USD"}
-            };
-            var paymentMethodId = new PaymentMethodId("BTC", PaymentTypes.BTCLike);
-            
-            //When
-            var totalInvoiceAmount = new Money(45m, MoneyUnit.BTC);
-           
-            //Then
-            var errorMessage = handlerBTC.IsPaymentMethodAllowedBasedOnInvoiceAmount(store, currencyPairRateResult,
-                totalInvoiceAmount, paymentMethodId);
-            
-            Assert.NotEqual(errorMessage.Result, string.Empty);
-
-#pragma warning restore CS0618     
-        }  
-        
-        
-    }
-}

BTCPayServer.Tests/PaymentRequestTests.cs

@@ -92,7 +92,7 @@ namespace BTCPayServer.Tests
             }
         }
 
-        [Fact(Timeout = 60 * 2 * 1000)]
+        [Fact]
         [Trait("Integration", "Integration")]
         public async Task CanPayPaymentRequestWhenPossible()
         {
@@ -153,64 +153,5 @@ namespace BTCPayServer.Tests
                 
             }
         }
-        
-        [Fact(Timeout = 60 * 2 * 1000)]
-        [Trait("Integration", "Integration")]
-        public async Task CanCancelPaymentWhenPossible()
-        {
-            using (var tester = ServerTester.Create())
-            {
-                tester.Start();
-                var user = tester.NewAccount();
-                user.GrantAccess();
-                user.RegisterDerivationScheme("BTC");
-
-                var paymentRequestController = user.GetController<PaymentRequestController>();
-                
-                
-                Assert.IsType<NotFoundResult>(await 
-                    paymentRequestController.CancelUnpaidPendingInvoice(Guid.NewGuid().ToString(), false));
-
-
-                var request = new UpdatePaymentRequestViewModel()
-                {
-                    Title = "original juice",
-                    Currency = "BTC",
-                    Amount = 1,
-                    StoreId = user.StoreId,
-                    Description = "description"
-                };
-                var response = Assert
-                    .IsType<RedirectToActionResult>(paymentRequestController.EditPaymentRequest(null, request).Result)
-                    .RouteValues.First();
-
-                var paymentRequestId = response.Value.ToString();
-                
-                var invoiceId = Assert
-                    .IsType<OkObjectResult>(await paymentRequestController.PayPaymentRequest(paymentRequestId, false)).Value
-                    .ToString();
-
-                var actionResult = Assert
-                    .IsType<RedirectToActionResult>(await paymentRequestController.PayPaymentRequest(response.Value.ToString()));
-
-                Assert.Equal("Checkout", actionResult.ActionName);
-                Assert.Equal("Invoice", actionResult.ControllerName);
-                Assert.Contains(actionResult.RouteValues, pair => pair.Key == "Id" && pair.Value.ToString() == invoiceId);
-
-                var invoice = user.BitPay.GetInvoice(invoiceId, Facade.Merchant);
-Assert.Equal(InvoiceState.ToString(InvoiceStatus.New), invoice.Status);
-                Assert.IsType<OkObjectResult>(await 
-                    paymentRequestController.CancelUnpaidPendingInvoice(paymentRequestId, false));
-                
-                invoice = user.BitPay.GetInvoice(invoiceId, Facade.Merchant);
-                Assert.Equal(InvoiceState.ToString(InvoiceStatus.Invalid), invoice.Status);
-                
-                
-                Assert.IsType<BadRequestObjectResult>(await 
-                    paymentRequestController.CancelUnpaidPendingInvoice(paymentRequestId, false));
-                          
-                
-            }
-        }
     }
 }

BTCPayServer.Tests/README.md

@@ -41,13 +41,8 @@ You can call bitcoin-cli inside the container with `docker exec`, for example, i
 ```
 
 If you are using Powershell:
-```powershell
-.\docker-bitcoin-cli.ps1 sendtoaddress "mohu16LH66ptoWGEL1GtP6KHTBJYXMWhEf" 0.23111090
 ```
-
-You can also generate blocks:
-```powershell
-.\docker-bitcoin-generate.ps1 3
+.\docker-bitcoin-cli.ps1 sendtoaddress "mohu16LH66ptoWGEL1GtP6KHTBJYXMWhEf" 0.23111090
 ```
 
 ### Using the test litecoin-cli

BTCPayServer.Tests/RateRulesTest.cs

@@ -34,7 +34,7 @@ namespace BTCPayServer.Tests
             builder.AppendLine("DOGE_X = DOGE_BTC * BTC_X * 1.1");
             builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
             builder.AppendLine("// Some other cool comments");
-            builder.AppendLine("BTC_usd = kraken(BTC_USD)");
+            builder.AppendLine("BTC_usd = GDax(BTC_USD)");
             builder.AppendLine("BTC_X = Coinbase(BTC_X);");
             builder.AppendLine("X_X = CoinAverage(X_X) * 1.02");
 
@@ -45,14 +45,14 @@ namespace BTCPayServer.Tests
                 "DOGE_X = DOGE_BTC * BTC_X * 1.1;\n" +
                 "DOGE_BTC = bittrex(DOGE_BTC);\n" +
                 "// Some other cool comments\n" +
-                "BTC_USD = kraken(BTC_USD);\n" +
+                "BTC_USD = gdax(BTC_USD);\n" +
                 "BTC_X = coinbase(BTC_X);\n" +
                 "X_X = coinaverage(X_X) * 1.02;",
                 rules.ToString());
             var tests = new[]
             {
-                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * kraken(BTC_USD) * 1.1"),
-                (Pair: "BTC_USD", Expected: "kraken(BTC_USD)"),
+                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * gdax(BTC_USD) * 1.1"),
+                (Pair: "BTC_USD", Expected: "gdax(BTC_USD)"),
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)"),
                 (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02"),
@@ -62,14 +62,14 @@ namespace BTCPayServer.Tests
                 Assert.Equal(test.Expected, rules.GetRuleFor(CurrencyPair.Parse(test.Pair)).ToString());
             }
             rules.Spread = 0.2m;
-            Assert.Equal("(bittrex(DOGE_BTC) * kraken(BTC_USD) * 1.1) * (0.8, 1.2)", rules.GetRuleFor(CurrencyPair.Parse("DOGE_USD")).ToString());
+            Assert.Equal("(bittrex(DOGE_BTC) * gdax(BTC_USD) * 1.1) * (0.8, 1.2)", rules.GetRuleFor(CurrencyPair.Parse("DOGE_USD")).ToString());
             ////////////////
 
             // Check errors conditions
             builder = new StringBuilder();
             builder.AppendLine("DOGE_X = LTC_CAD * BTC_X * 1.1");
             builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
-            builder.AppendLine("BTC_usd = kraken(BTC_USD)");
+            builder.AppendLine("BTC_usd = GDax(BTC_USD)");
             builder.AppendLine("LTC_CHF = LTC_CHF * 1.01");
             builder.AppendLine("BTC_X = Coinbase(BTC_X)");
             Assert.True(RateRules.TryParse(builder.ToString(), out rules));
@@ -77,7 +77,7 @@ namespace BTCPayServer.Tests
             tests = new[]
             {
                 (Pair: "LTC_CAD", Expected: "ERR_NO_RULE_MATCH(LTC_CAD)"),
-                (Pair: "DOGE_USD", Expected: "ERR_NO_RULE_MATCH(LTC_CAD) * kraken(BTC_USD) * 1.1"),
+                (Pair: "DOGE_USD", Expected: "ERR_NO_RULE_MATCH(LTC_CAD) * gdax(BTC_USD) * 1.1"),
                 (Pair: "LTC_CHF", Expected: "ERR_TOO_MUCH_NESTED_CALLS(LTC_CHF) * 1.01"),
             };
             foreach (var test in tests)
@@ -90,15 +90,15 @@ namespace BTCPayServer.Tests
             builder = new StringBuilder();
             builder.AppendLine("DOGE_X = DOGE_BTC * BTC_X * 1.1");
             builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
-            builder.AppendLine("BTC_usd = kraken(BTC_USD)");
+            builder.AppendLine("BTC_usd = GDax(BTC_USD)");
             builder.AppendLine("BTC_X = Coinbase(BTC_X)");
             builder.AppendLine("X_X = CoinAverage(X_X) * 1.02");
             Assert.True(RateRules.TryParse(builder.ToString(), out rules));
 
             var tests2 = new[]
             {
-                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * kraken(BTC_USD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),kraken(BTC_USD)"),
-                (Pair: "BTC_USD", Expected: "kraken(BTC_USD)", ExpectedExchangeRates: "kraken(BTC_USD)"),
+                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * gdax(BTC_USD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),gdax(BTC_USD)"),
+                (Pair: "BTC_USD", Expected: "gdax(BTC_USD)", ExpectedExchangeRates: "gdax(BTC_USD)"),
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)", ExpectedExchangeRates: "coinbase(BTC_CAD)"),
                 (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),coinbase(BTC_CAD)"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02", ExpectedExchangeRates: "coinaverage(LTC_CAD)"),

BTCPayServer.Tests/SeleniumTester.cs

@@ -1,283 +0,0 @@
-using System;
-using BTCPayServer;
-using System.Linq;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Text;
-using NBitcoin;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Chrome;
-using Xunit;
-using System.IO;
-using System.Net.Http;
-using System.Reflection;
-using BTCPayServer.Tests.Logging;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Lightning;
-using BTCPayServer.Lightning.CLightning;
-using BTCPayServer.Views.Stores;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using OpenQA.Selenium.Interactions;
-
-namespace BTCPayServer.Tests
-{
-    public class SeleniumTester : IDisposable
-    {
-        public IWebDriver Driver { get; set; }
-        public ServerTester Server { get; set; }
-
-        public static SeleniumTester Create([CallerMemberNameAttribute] string scope = null)
-        {
-            var server = ServerTester.Create(scope);
-            return new SeleniumTester()
-            {
-                Server = server
-            };
-        }
-
-      
-        public void Start()
-        {
-            Server.Start();
-            ChromeOptions options = new ChromeOptions();
-            var isDebug = !Server.PayTester.InContainer;
-        
-            if (!isDebug)
-            {
-                options.AddArguments("headless"); // Comment to view browser
-                options.AddArguments("window-size=1200x1000"); // Comment to view browser
-            }  
-            options.AddArgument("shm-size=2g");
-            if (Server.PayTester.InContainer)
-            {
-                options.AddArgument("no-sandbox");
-            }
-            Driver = new ChromeDriver(Server.PayTester.InContainer ? "/usr/bin" : Directory.GetCurrentDirectory(), options);
-            if (isDebug)
-            {
-                //when running locally, depending on your resolution, the website may go into mobile responsive mode and screw with navigation of tests
-                Driver.Manage().Window.Maximize();
-            }
-            Logs.Tester.LogInformation("Selenium: Using chrome driver");
-            Logs.Tester.LogInformation("Selenium: Browsing to " + Server.PayTester.ServerUri);
-            Logs.Tester.LogInformation($"Selenium: Resolution {Driver.Manage().Window.Size}");
-            Driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(10);
-            Driver.Navigate().GoToUrl(Server.PayTester.ServerUri);
-            Driver.AssertNoError();
-        }
-
-        public string Link(string relativeLink)
-        {
-            return Server.PayTester.ServerUri.AbsoluteUri.WithoutEndingSlash() + relativeLink.WithStartingSlash();
-        }
-
-        public string RegisterNewUser(bool isAdmin = false)
-        {
-            var usr = RandomUtils.GetUInt256().ToString() + "@a.com";
-            Driver.FindElement(By.Id("Register")).Click();
-            Driver.FindElement(By.Id("Email")).SendKeys(usr);
-            Driver.FindElement(By.Id("Password")).SendKeys("123456");
-            Driver.FindElement(By.Id("ConfirmPassword")).SendKeys("123456");
-            if (isAdmin)
-                Driver.FindElement(By.Id("IsAdmin")).Click();
-            Driver.FindElement(By.Id("RegisterButton")).Click();
-            Driver.AssertNoError();
-            return usr;
-        }
-
-        public (string storeName, string storeId) CreateNewStore()
-        {
-            var usr = "Store" + RandomUtils.GetUInt64().ToString();
-            Driver.FindElement(By.Id("Stores")).Click();
-            Driver.FindElement(By.Id("CreateStore")).Click();
-            Driver.FindElement(By.Id("Name")).SendKeys(usr);
-            Driver.FindElement(By.Id("Create")).Click();
-            
-            return (usr, Driver.FindElement(By.Id("Id")).GetAttribute("value"));
-        }
-
-        public void AddDerivationScheme(string cryptoCode = "BTC", string derivationScheme = "xpub661MyMwAqRbcGABgHMUXDzPzH1tU7eZaAaJQXhDXsSxsqyQzQeU6kznNfSuAyqAK9UaWSaZaMFdNiY5BCF4zBPAzSnwfUAwUhwttuAKwfRX-[legacy]")
-        {
-            Driver.FindElement(By.Id($"Modify{cryptoCode}")).ForceClick();
-            Driver.FindElement(By.ClassName("store-derivation-scheme")).SendKeys(derivationScheme);
-            Driver.FindElement(By.Id("Continue")).ForceClick();
-            Driver.FindElement(By.Id("Confirm")).ForceClick();
-            Driver.FindElement(By.Id("Save")).ForceClick();
-            return;
-        }
-        
-        public void AddLightningNode(string cryptoCode, LightningConnectionType connectionType)
-        {
-            string connectionString = null;
-            if (connectionType == LightningConnectionType.Charge)
-                connectionString = "type=charge;server=" + Server.MerchantCharge.Client.Uri.AbsoluteUri;
-            else if (connectionType == LightningConnectionType.CLightning)
-                connectionString = "type=clightning;server=" + ((CLightningClient)Server.MerchantLightningD).Address.AbsoluteUri;
-            else if (connectionType == LightningConnectionType.LndREST)
-                connectionString = $"type=lnd-rest;server={Server.MerchantLnd.Swagger.BaseUrl};allowinsecure=true";
-            else
-                throw new NotSupportedException(connectionType.ToString());
-            
-            Driver.FindElement(By.Id($"Modify-Lightning{cryptoCode}")).ForceClick();
-            Driver.FindElement(By.Name($"ConnectionString")).SendKeys(connectionString);
-            Driver.FindElement(By.Id($"save")).ForceClick();
-        }
-        
-        public void AddInternalLightningNode(string cryptoCode)
-        {
-            Driver.FindElement(By.Id($"Modify-Lightning{cryptoCode}")).ForceClick();
-            Driver.FindElement(By.Id($"internal-ln-node-setter")).ForceClick();
-            Driver.FindElement(By.Id($"save")).ForceClick();
-        }
-
-        public void ClickOnAllSideMenus()
-        {
-            var links = Driver.FindElements(By.CssSelector(".nav-pills .nav-link")).Select(c => c.GetAttribute("href")).ToList();
-            Driver.AssertNoError();
-            Assert.NotEmpty(links);
-            foreach (var l in links)
-            {
-                Driver.Navigate().GoToUrl(l);
-                Driver.AssertNoError();
-            }
-        }
-
-       
-
-        public void Dispose()
-        {
-            if (Driver != null)
-            {
-                try
-                {
-                    Driver.Close();
-                }
-                catch { }
-                Driver.Dispose();
-            }
-            if (Server != null)
-                Server.Dispose();
-        }
-
-        internal void AssertNotFound()
-        {
-            Assert.Contains("Status Code: 404; Not Found", Driver.PageSource);
-        }
-
-        public void GoToHome()
-        {
-            Driver.Navigate().GoToUrl(Server.PayTester.ServerUri);
-        }
-
-        public void Logout()
-        {
-            Driver.FindElement(By.Id("Logout")).Click();
-        }
-
-        public void Login(string user, string password)
-        {
-            Driver.FindElement(By.Id("Email")).SendKeys(user);
-            Driver.FindElement(By.Id("Password")).SendKeys(password);
-            Driver.FindElement(By.Id("LoginButton")).Click();
-
-        }
-
-        public void GoToStore(string storeId, StoreNavPages storeNavPage = StoreNavPages.Index)
-        {
-            Driver.FindElement(By.Id("Stores")).Click();
-            Driver.FindElement(By.Id($"update-store-{storeId}")).Click();
-            if (storeNavPage != StoreNavPages.Index)
-            {
-                Driver.FindElement(By.Id(storeNavPage.ToString())).Click();
-            }
-        }
-        
-        public void GoToInvoiceCheckout(string invoiceId)
-        {
-            Driver.FindElement(By.Id("Invoices")).Click();
-            Driver.FindElement(By.Id($"invoice-checkout-{invoiceId}")).Click();
-            CheckForJSErrors();
-        }
-        
-        
-        public void SetCheckbox(IWebElement element, bool value)
-        {
-            if ((value && !element.Selected) || (!value && element.Selected))
-            {
-                element.Click();
-            }
-        }
-
-        public void SetCheckbox(SeleniumTester s, string inputName, bool value)
-        {
-            SetCheckbox(s.Driver.FindElement(By.Name(inputName)), value);
-        }
-
-        public void ScrollToElement(IWebElement element)
-        {
-            Actions actions = new Actions(Driver);
-            actions.MoveToElement(element);
-            actions.Perform();
-        }
-
-        public void GoToInvoices()
-        {
-            Driver.FindElement(By.Id("Invoices")).Click();
-        }
-
-        public void GoToCreateInvoicePage()
-        {
-            GoToInvoices();
-            Driver.FindElement(By.Id("CreateNewInvoice")).Click();
-        }
-
-        public string CreateInvoice(string store, decimal amount = 100, string currency = "USD", string refundEmail = "")
-        {
-            GoToInvoices();
-            Driver.FindElement(By.Id("CreateNewInvoice")).Click();
-            Driver.FindElement(By.Id("Amount")).SendKeys(amount.ToString(CultureInfo.InvariantCulture));
-            var currencyEl = Driver.FindElement(By.Id("Currency"));
-            currencyEl.Clear();
-            currencyEl.SendKeys(currency);
-            Driver.FindElement(By.Id("BuyerEmail")).SendKeys(refundEmail);
-            Driver.FindElement(By.Name("StoreId")).SendKeys(store + Keys.Enter);
-            Driver.FindElement(By.Id("Create")).ForceClick();
-            Assert.True(Driver.PageSource.Contains("just created!"), "Unable to create Invoice");
-            var statusElement = Driver.FindElement(By.ClassName("alert-success"));
-            var id = statusElement.Text.Split(" ")[1];
-
-            return id;
-        }
-
-
-        
-        private void CheckForJSErrors()
-        {
-            //wait for seleniun update: https://stackoverflow.com/questions/57520296/selenium-webdriver-3-141-0-driver-manage-logs-availablelogtypes-throwing-syste
-//            var errorStrings = new List<string> 
-//            { 
-//                "SyntaxError", 
-//                "EvalError", 
-//                "ReferenceError", 
-//                "RangeError", 
-//                "TypeError", 
-//                "URIError" 
-//            };
-//
-//            var jsErrors = Driver.Manage().Logs.GetLog(LogType.Browser).Where(x => errorStrings.Any(e => x.Message.Contains(e)));
-//
-//            if (jsErrors.Any())
-//            {
-//                Logs.Tester.LogInformation("JavaScript error(s):" + Environment.NewLine + jsErrors.Aggregate("", (s, entry) => s + entry.Message + Environment.NewLine));
-//            }
-//            Assert.Empty(jsErrors);
-
-        }
-
-      
-    }
-}

BTCPayServer.Tests/SeleniumTests.cs

@@ -1,367 +0,0 @@
-using System;
-using Xunit;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Chrome;
-using BTCPayServer.Tests.Logging;
-using Xunit.Abstractions;
-using OpenQA.Selenium.Interactions;
-using System.Linq;
-using NBitcoin;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Tests
-{
-    [Trait("Selenium", "Selenium")]
-    public class ChromeTests
-    {
-        public ChromeTests(ITestOutputHelper helper)
-        {
-            Logs.Tester = new XUnitLog(helper) { Name = "Tests" };
-            Logs.LogProvider = new XUnitLogProvider(helper);
-        }
-
-        [Fact]
-        public void CanNavigateServerSettings()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser(true);
-                s.Driver.FindElement(By.Id("ServerSettings")).Click();
-                s.Driver.AssertNoError();
-                s.ClickOnAllSideMenus();
-                s.Driver.Quit();
-            }
-        }
-
-        [Fact]
-        public void NewUserLogin()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                //Register & Log Out
-                var email = s.RegisterNewUser();
-                s.Driver.FindElement(By.Id("Logout")).Click();
-                s.Driver.AssertNoError();
-                s.Driver.FindElement(By.Id("Login")).Click();
-                s.Driver.AssertNoError();
-
-                s.Driver.Navigate().GoToUrl(s.Link("/invoices"));
-                Assert.Contains("ReturnUrl=%2Finvoices", s.Driver.Url);
-
-                // We should be redirected to login
-                //Same User Can Log Back In
-                s.Driver.FindElement(By.Id("Email")).SendKeys(email);
-                s.Driver.FindElement(By.Id("Password")).SendKeys("123456");
-                s.Driver.FindElement(By.Id("LoginButton")).Click();
-
-                // We should be redirected to invoice
-                Assert.EndsWith("/invoices", s.Driver.Url);
-
-                // Should not be able to reach server settings
-                s.Driver.Navigate().GoToUrl(s.Link("/server/users"));
-                Assert.Contains("ReturnUrl=%2Fserver%2Fusers", s.Driver.Url);
-
-                //Change Password & Log Out
-                s.Driver.FindElement(By.Id("MySettings")).Click();
-                s.Driver.FindElement(By.Id("ChangePassword")).Click();
-                s.Driver.FindElement(By.Id("OldPassword")).SendKeys("123456");
-                s.Driver.FindElement(By.Id("NewPassword")).SendKeys("abc???");
-                s.Driver.FindElement(By.Id("ConfirmPassword")).SendKeys("abc???");
-                s.Driver.FindElement(By.Id("UpdatePassword")).Click();
-                s.Driver.FindElement(By.Id("Logout")).Click();
-                s.Driver.AssertNoError();
-
-                //Log In With New Password
-                s.Driver.FindElement(By.Id("Login")).Click();
-                s.Driver.FindElement(By.Id("Email")).SendKeys(email);
-                s.Driver.FindElement(By.Id("Password")).SendKeys("abc???");
-                s.Driver.FindElement(By.Id("LoginButton")).Click();
-                Assert.True(s.Driver.PageSource.Contains("Stores"), "Can't Access Stores");
-
-                s.Driver.FindElement(By.Id("MySettings")).Click();
-                s.ClickOnAllSideMenus();
-
-                s.Driver.Quit();
-            }
-        }
-
-        static void LogIn(SeleniumTester s, string email)
-        {
-            s.Driver.FindElement(By.Id("Login")).Click();
-            s.Driver.FindElement(By.Id("Email")).SendKeys(email);
-            s.Driver.FindElement(By.Id("Password")).SendKeys("123456");
-            s.Driver.FindElement(By.Id("LoginButton")).Click();
-            s.Driver.AssertNoError();
-        }
-        [Fact]
-        public async Task CanUseSSHService()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                var alice = s.RegisterNewUser(isAdmin: true);
-                s.Driver.Navigate().GoToUrl(s.Link("/server/services"));
-                Assert.Contains("server/services/ssh", s.Driver.PageSource);
-                using (var client = await s.Server.PayTester.GetService<BTCPayServer.Configuration.BTCPayServerOptions>().SSHSettings.ConnectAsync())
-                {
-                    var result = await client.RunBash("echo hello");
-                    Assert.Equal(string.Empty, result.Error);
-                    Assert.Equal("hello\n", result.Output);
-                    Assert.Equal(0, result.ExitStatus);
-                }
-                s.Driver.Navigate().GoToUrl(s.Link("/server/services/ssh"));
-                s.Driver.AssertNoError();
-            }
-        }
-
-        [Fact]
-        public void CanUseDynamicDns()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                var alice = s.RegisterNewUser(isAdmin: true);
-                s.Driver.Navigate().GoToUrl(s.Link("/server/services"));
-                Assert.Contains("Dynamic DNS", s.Driver.PageSource);
-
-                s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns"));
-                s.Driver.AssertNoError();
-                if (s.Driver.PageSource.Contains("pouet.hello.com"))
-                {
-                    // Cleanup old test run
-                    s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns/pouet.hello.com/delete"));
-                    s.Driver.FindElement(By.Id("continue")).Click();
-                }
-                s.Driver.FindElement(By.Id("AddDynamicDNS")).Click();
-                s.Driver.AssertNoError();
-                // We will just cheat for test purposes by only querying the server
-                s.Driver.FindElement(By.Id("ServiceUrl")).SendKeys(s.Link("/"));
-                s.Driver.FindElement(By.Id("Settings_Hostname")).SendKeys("pouet.hello.com");
-                s.Driver.FindElement(By.Id("Settings_Login")).SendKeys("MyLog");
-                s.Driver.FindElement(By.Id("Settings_Password")).SendKeys("MyLog" + Keys.Enter);
-                s.Driver.AssertNoError();
-                Assert.Contains("The Dynamic DNS has been successfully queried", s.Driver.PageSource);
-                Assert.EndsWith("/server/services/dynamic-dns", s.Driver.Url);
-
-                // Try to do the same thing should fail (hostname already exists)
-                s.Driver.FindElement(By.Id("AddDynamicDNS")).Click();
-                s.Driver.AssertNoError();
-                s.Driver.FindElement(By.Id("ServiceUrl")).SendKeys(s.Link("/"));
-                s.Driver.FindElement(By.Id("Settings_Hostname")).SendKeys("pouet.hello.com");
-                s.Driver.FindElement(By.Id("Settings_Login")).SendKeys("MyLog");
-                s.Driver.FindElement(By.Id("Settings_Password")).SendKeys("MyLog" + Keys.Enter);
-                s.Driver.AssertNoError();
-                Assert.Contains("This hostname already exists", s.Driver.PageSource);
-
-                // Delete it
-                s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns"));
-                Assert.Contains("/server/services/dynamic-dns/pouet.hello.com/delete", s.Driver.PageSource);
-                s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns/pouet.hello.com/delete"));
-                s.Driver.FindElement(By.Id("continue")).Click();
-                s.Driver.AssertNoError();
-
-                Assert.DoesNotContain("/server/services/dynamic-dns/pouet.hello.com/delete", s.Driver.PageSource);
-            }
-        }
-
-        [Fact]
-        public void CanCreateStores()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                var alice = s.RegisterNewUser();
-                var store = s.CreateNewStore().storeName;
-                s.AddDerivationScheme();
-                s.Driver.AssertNoError();
-                Assert.Contains(store, s.Driver.PageSource);
-                var storeUrl = s.Driver.Url;
-                s.ClickOnAllSideMenus();
-                s.GoToInvoices();
-                s.CreateInvoice(store);
-                s.Driver.FindElement(By.ClassName("invoice-details-link")).Click();
-                var invoiceUrl = s.Driver.Url;
-
-                // When logout we should not be able to access store and invoice details
-                s.Driver.FindElement(By.Id("Logout")).Click();
-                s.Driver.Navigate().GoToUrl(storeUrl);
-                Assert.Contains("ReturnUrl", s.Driver.Url);
-                s.Driver.Navigate().GoToUrl(invoiceUrl);
-                Assert.Contains("ReturnUrl", s.Driver.Url);
-
-                // When logged we should not be able to access store and invoice details
-                var bob = s.RegisterNewUser();
-                s.Driver.Navigate().GoToUrl(storeUrl);
-                Assert.Contains("ReturnUrl", s.Driver.Url);
-                s.Driver.Navigate().GoToUrl(invoiceUrl);
-                s.AssertNotFound();
-                s.GoToHome();
-                s.Logout();
-
-                // Let's add Bob as a guest to alice's store
-                LogIn(s, alice);
-                s.Driver.Navigate().GoToUrl(storeUrl + "/users");
-                s.Driver.FindElement(By.Id("Email")).SendKeys(bob + Keys.Enter);
-                Assert.Contains("User added successfully", s.Driver.PageSource);
-                s.Logout();
-
-                // Bob should not have access to store, but should have access to invoice
-                LogIn(s, bob);
-                s.Driver.Navigate().GoToUrl(storeUrl);
-                Assert.Contains("ReturnUrl", s.Driver.Url);
-                s.Driver.Navigate().GoToUrl(invoiceUrl);
-                s.Driver.AssertNoError();
-            }
-        }
-
-
-     
-        [Fact]
-        public void CanCreateAppPoS()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                var store = s.CreateNewStore();
-
-                s.Driver.FindElement(By.Id("Apps")).Click();
-                s.Driver.FindElement(By.Id("CreateNewApp")).Click();
-                s.Driver.FindElement(By.Name("Name")).SendKeys("PoS" + Guid.NewGuid());
-                s.Driver.FindElement(By.Id("SelectedAppType")).SendKeys("PointOfSale" + Keys.Enter);
-                s.Driver.FindElement(By.Id("SelectedStore")).SendKeys(store + Keys.Enter);
-                s.Driver.FindElement(By.Id("Create")).Click();
-                s.Driver.FindElement(By.Id("EnableShoppingCart")).Click();
-                s.Driver.FindElement(By.Id("SaveSettings")).ForceClick();
-                s.Driver.FindElement(By.Id("ViewApp")).ForceClick();
-                s.Driver.SwitchTo().Window(s.Driver.WindowHandles.Last());
-                Assert.True(s.Driver.PageSource.Contains("Tea shop"), "Unable to create PoS");
-                s.Driver.Quit();
-            }
-        }
-
-        [Fact]
-        public void CanCreateAppCF()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                var store = s.CreateNewStore();
-                s.AddDerivationScheme();
-
-                s.Driver.FindElement(By.Id("Apps")).Click();
-                s.Driver.FindElement(By.Id("CreateNewApp")).Click();
-                s.Driver.FindElement(By.Name("Name")).SendKeys("CF" + Guid.NewGuid());
-                s.Driver.FindElement(By.Id("SelectedAppType")).SendKeys("Crowdfund" + Keys.Enter);
-                s.Driver.FindElement(By.Id("SelectedStore")).SendKeys(store + Keys.Enter);
-                s.Driver.FindElement(By.Id("Create")).Click();
-                s.Driver.FindElement(By.Id("Title")).SendKeys("Kukkstarter");
-                s.Driver.FindElement(By.CssSelector("div.note-editable.card-block")).SendKeys("1BTC = 1BTC");
-                s.Driver.FindElement(By.Id("TargetCurrency")).SendKeys("JPY");
-                s.Driver.FindElement(By.Id("TargetAmount")).SendKeys("700");
-                s.Driver.FindElement(By.Id("SaveSettings")).ForceClick();
-                s.Driver.FindElement(By.Id("ViewApp")).ForceClick();
-                s.Driver.SwitchTo().Window(s.Driver.WindowHandles.Last());
-                Assert.True(s.Driver.PageSource.Contains("Currently Active!"), "Unable to create CF");
-                s.Driver.Quit();
-            } 
-        }
-
-        [Fact]
-        public void CanCreatePayRequest()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                s.CreateNewStore();
-                s.AddDerivationScheme();
-
-                s.Driver.FindElement(By.Id("PaymentRequests")).Click();
-                s.Driver.FindElement(By.Id("CreatePaymentRequest")).Click();
-                s.Driver.FindElement(By.Id("Title")).SendKeys("Pay123");
-                s.Driver.FindElement(By.Id("Amount")).SendKeys("700");
-                s.Driver.FindElement(By.Id("Currency")).SendKeys("BTC");
-                s.Driver.FindElement(By.Id("SaveButton")).ForceClick();
-                s.Driver.FindElement(By.Name("ViewAppButton")).SendKeys(Keys.Return);
-                s.Driver.SwitchTo().Window(s.Driver.WindowHandles.Last());
-                Assert.True(s.Driver.PageSource.Contains("Amount due"), "Unable to create Payment Request");
-                s.Driver.Quit();
-            }
-        }
-
-        [Fact]
-        public void CanManageWallet()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                s.CreateNewStore();
-
-                // In this test, we try to spend from a manual seed. We import the xpub 49'/0'/0', then try to use the seed 
-                // to sign the transaction
-                var mnemonic = "usage fever hen zero slide mammal silent heavy donate budget pulse say brain thank sausage brand craft about save attract muffin advance illegal cabbage";
-                var root = new Mnemonic(mnemonic).DeriveExtKey();
-                s.AddDerivationScheme("BTC", "ypub6WWc2gWwHbdnAAyJDnR4SPL1phRh7REqrPBfZeizaQ1EmTshieRXJC3Z5YoU4wkcdKHEjQGkh6AYEzCQC1Kz3DNaWSwdc1pc8416hAjzqyD");
-                var tx = s.Server.ExplorerNode.SendToAddress(BitcoinAddress.Create("bcrt1qmxg8fgnmkp354vhe78j6sr4ut64tyz2xyejel4", Network.RegTest), Money.Coins(3.0m));
-                s.Server.ExplorerNode.Generate(1);
-
-                s.Driver.FindElement(By.Id("Wallets")).Click();
-                s.Driver.FindElement(By.LinkText("Manage")).Click();
-
-                s.ClickOnAllSideMenus();
-
-                // We setup the fingerprint and the account key path
-                s.Driver.FindElement(By.Id("WalletSettings")).ForceClick();
-                s.Driver.FindElement(By.Id("AccountKeys_0__MasterFingerprint")).SendKeys("8bafd160");
-                s.Driver.FindElement(By.Id("AccountKeys_0__AccountKeyPath")).SendKeys("m/49'/0'/0'" + Keys.Enter);
-
-                // Check the tx sent earlier arrived
-                s.Driver.FindElement(By.Id("WalletTransactions")).ForceClick();
-                var walletTransactionLink = s.Driver.Url;
-                Assert.Contains(tx.ToString(), s.Driver.PageSource);
-
-                
-                void SignWith(string signingSource)
-                {
-                    // Send to bob
-                    s.Driver.FindElement(By.Id("WalletSend")).Click();
-                    var bob = new Key().PubKey.Hash.GetAddress(Network.RegTest);
-                    SetTransactionOutput(0, bob, 1);
-                    s.Driver.ScrollTo(By.Id("SendMenu"));
-                    s.Driver.FindElement(By.Id("SendMenu")).ForceClick();
-                    s.Driver.FindElement(By.CssSelector("button[value=seed]")).Click();
-
-                    // Input the seed
-                    s.Driver.FindElement(By.Id("SeedOrKey")).SendKeys(signingSource + Keys.Enter);
-
-                    // Broadcast
-                    Assert.Contains(bob.ToString(), s.Driver.PageSource);
-                    Assert.Contains("1.00000000", s.Driver.PageSource);
-                    s.Driver.FindElement(By.CssSelector("button[value=broadcast]")).ForceClick();
-                    Assert.Equal(walletTransactionLink, s.Driver.Url);
-                }
-
-                void SetTransactionOutput(int index, BitcoinAddress dest, decimal amount, bool subtract = false)
-                {
-                    s.Driver.FindElement(By.Id($"Outputs_{index}__DestinationAddress")).SendKeys(dest.ToString());
-                    var amountElement = s.Driver.FindElement(By.Id($"Outputs_{index}__Amount"));
-                    amountElement.Clear();
-                    amountElement.SendKeys(amount.ToString());
-                    var checkboxElement = s.Driver.FindElement(By.Id($"Outputs_{index}__SubtractFeesFromOutput"));
-                    if (checkboxElement.Selected != subtract)
-                    {
-                        checkboxElement.Click();
-                    }
-                }
-                SignWith(mnemonic);
-                var accountKey = root.Derive(new KeyPath("m/49'/0'/0'")).GetWif(Network.RegTest).ToString();
-                SignWith(accountKey);
-            }
-        }
-    }
-}

BTCPayServer.Tests/ServerTester.cs

@@ -23,7 +23,6 @@ using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Lightning.CLightning;
 using BTCPayServer.Lightning;
 using BTCPayServer.Services;
-using BTCPayServer.Tests.Logging;
 
 namespace BTCPayServer.Tests
 {
@@ -44,14 +43,13 @@ namespace BTCPayServer.Tests
                 Directory.CreateDirectory(_Directory);
 
             NetworkProvider = new BTCPayNetworkProvider(NetworkType.Regtest);
-            ExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_BTCRPCCONNECTION", "server=http://127.0.0.1:43782;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork<BTCPayNetwork>("BTC").NBitcoinNetwork);
-            ExplorerNode.ScanRPCCapabilities();
-            LTCExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_LTCRPCCONNECTION", "server=http://127.0.0.1:43783;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork<BTCPayNetwork>("LTC").NBitcoinNetwork);
+            ExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_BTCRPCCONNECTION", "server=http://127.0.0.1:43782;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork("BTC").NBitcoinNetwork);
+            LTCExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_LTCRPCCONNECTION", "server=http://127.0.0.1:43783;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork("LTC").NBitcoinNetwork);
 
-            ExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork<BTCPayNetwork>("BTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_BTCNBXPLORERURL", "http://127.0.0.1:32838/")));
-            LTCExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork<BTCPayNetwork>("LTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_LTCNBXPLORERURL", "http://127.0.0.1:32838/")));
+            ExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork("BTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_BTCNBXPLORERURL", "http://127.0.0.1:32838/")));
+            LTCExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork("LTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_LTCNBXPLORERURL", "http://127.0.0.1:32838/")));
 
-            var btc = NetworkProvider.GetNetwork<BTCPayNetwork>("BTC").NBitcoinNetwork;
+            var btc = NetworkProvider.GetNetwork("BTC").NBitcoinNetwork;
             CustomerLightningD = LightningClientFactory.CreateClient(GetEnvironment("TEST_CUSTOMERLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30992/"), btc);
             MerchantLightningD = LightningClientFactory.CreateClient(GetEnvironment("TEST_MERCHANTLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30993/"), btc);
 
@@ -71,10 +69,6 @@ namespace BTCPayServer.Tests
             PayTester.Port = int.Parse(GetEnvironment("TESTS_PORT", Utils.FreeTcpPort().ToString(CultureInfo.InvariantCulture)), CultureInfo.InvariantCulture);
             PayTester.HostName = GetEnvironment("TESTS_HOSTNAME", "127.0.0.1");
             PayTester.InContainer = bool.Parse(GetEnvironment("TESTS_INCONTAINER", "false"));
-
-            PayTester.SSHPassword = GetEnvironment("TESTS_SSHPASSWORD", "opD3i2282D");
-            PayTester.SSHKeyFile = GetEnvironment("TESTS_SSHKEYFILE", "");
-            PayTester.SSHConnection = GetEnvironment("TESTS_SSHCONNECTION", "root@127.0.0.1:21622");
         }
 
         public bool Dockerized
@@ -91,11 +85,9 @@ namespace BTCPayServer.Tests
         /// Connect a customer LN node to the merchant LN node
         /// </summary>
         /// <returns></returns>
-        public async Task EnsureChannelsSetup()
+        public Task EnsureChannelsSetup()
         {
-            Logs.Tester.LogInformation("Connecting channels");
-            await BTCPayServer.Lightning.Tests.ConnectChannels.ConnectAll(ExplorerNode, GetLightningSenderClients(), GetLightningDestClients()).ConfigureAwait(false);
-            Logs.Tester.LogInformation("Channels connected");
+            return BTCPayServer.Lightning.Tests.ConnectChannels.ConnectAll(ExplorerNode, GetLightningSenderClients(), GetLightningDestClients());
         }
 
         private IEnumerable<ILightningClient> GetLightningSenderClients()

BTCPayServer.Tests/StorageTests.cs

@@ -1,258 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using BTCPayServer.Controllers;
-using BTCPayServer.Models;
-using BTCPayServer.Models.ServerViewModels;
-using BTCPayServer.Storage.Models;
-using BTCPayServer.Storage.Services.Providers.AzureBlobStorage.Configuration;
-using BTCPayServer.Storage.Services.Providers.FileSystemStorage.Configuration;
-using BTCPayServer.Storage.ViewModels;
-using BTCPayServer.Tests.Logging;
-using DBriize.Utils;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace BTCPayServer.Tests
-{
-    public class StorageTests
-    {
-        public StorageTests(ITestOutputHelper helper)
-        {
-            Logs.Tester = new XUnitLog(helper) {Name = "Tests"};
-            Logs.LogProvider = new XUnitLogProvider(helper);
-        }
-
-        [Fact]
-        [Trait("Integration", "Integration")]
-        public async void CanConfigureStorage()
-        {
-            using (var tester = ServerTester.Create())
-            {
-                tester.Start();
-                var user = tester.NewAccount();
-                user.GrantAccess();
-                var controller = tester.PayTester.GetController<ServerController>(user.UserId, user.StoreId);
-
-
-                //Once we select a provider, redirect to its view
-                var localResult = Assert
-                    .IsType<RedirectToActionResult>(controller.Storage(new StorageSettings()
-                    {
-                        Provider = StorageProvider.FileSystem
-                    }));
-                Assert.Equal(nameof(ServerController.StorageProvider), localResult.ActionName);
-                Assert.Equal(StorageProvider.FileSystem.ToString(), localResult.RouteValues["provider"]);
-
-
-                var AmazonS3result = Assert
-                    .IsType<RedirectToActionResult>(controller.Storage(new StorageSettings()
-                    {
-                        Provider = StorageProvider.AmazonS3
-                    }));
-                Assert.Equal(nameof(ServerController.StorageProvider), AmazonS3result.ActionName);
-                Assert.Equal(StorageProvider.AmazonS3.ToString(), AmazonS3result.RouteValues["provider"]);
-
-                var GoogleResult = Assert
-                    .IsType<RedirectToActionResult>(controller.Storage(new StorageSettings()
-                    {
-                        Provider = StorageProvider.GoogleCloudStorage
-                    }));
-                Assert.Equal(nameof(ServerController.StorageProvider), GoogleResult.ActionName);
-                Assert.Equal(StorageProvider.GoogleCloudStorage.ToString(), GoogleResult.RouteValues["provider"]);
-
-
-                var AzureResult = Assert
-                    .IsType<RedirectToActionResult>(controller.Storage(new StorageSettings()
-                    {
-                        Provider = StorageProvider.AzureBlobStorage
-                    }));
-                Assert.Equal(nameof(ServerController.StorageProvider), AzureResult.ActionName);
-                Assert.Equal(StorageProvider.AzureBlobStorage.ToString(), AzureResult.RouteValues["provider"]);
-
-                //Cool, we get redirected to the config pages
-                //Let's configure this stuff
-
-                //Let's try and cheat and go to an invalid storage provider config
-                Assert.Equal(nameof(Storage), (Assert
-                    .IsType<RedirectToActionResult>(await controller.StorageProvider("I am not a real provider"))
-                    .ActionName));
-
-                //ok no more messing around, let's configure this shit. 
-                var fileSystemStorageConfiguration = Assert.IsType<FileSystemStorageConfiguration>(Assert
-                    .IsType<ViewResult>(await controller.StorageProvider(StorageProvider.FileSystem.ToString()))
-                    .Model);
-
-                //local file system does not need config, easy days!
-                Assert.IsType<ViewResult>(
-                    await controller.EditFileSystemStorageProvider(fileSystemStorageConfiguration));
-
-                //ok cool, let's see if this got set right
-                var shouldBeRedirectingToLocalStorageConfigPage =
-                    Assert.IsType<RedirectToActionResult>(await controller.Storage());
-                Assert.Equal(nameof(StorageProvider), shouldBeRedirectingToLocalStorageConfigPage.ActionName);
-                Assert.Equal(StorageProvider.FileSystem,
-                    shouldBeRedirectingToLocalStorageConfigPage.RouteValues["provider"]);
-
-
-                //if we tell the settings page to force, it should allow us to select a new provider
-                Assert.IsType<ChooseStorageViewModel>(Assert.IsType<ViewResult>(await controller.Storage(true)).Model);
-
-                //awesome, now let's see if the files result says we're all set up
-                var viewFilesViewModel =
-                    Assert.IsType<ViewFilesViewModel>(Assert.IsType<ViewResult>(await controller.Files()).Model);
-                Assert.True(viewFilesViewModel.StorageConfigured);
-                Assert.Empty(viewFilesViewModel.Files);
-            }
-        }
-
-        [Fact]
-        [Trait("Integration", "Integration")]
-        public async void CanUseLocalProviderFiles()
-        {
-            using (var tester = ServerTester.Create())
-            {
-                tester.Start();
-                var user = tester.NewAccount();
-                user.GrantAccess();
-                var controller = tester.PayTester.GetController<ServerController>(user.UserId, user.StoreId);
-
-                var fileSystemStorageConfiguration = Assert.IsType<FileSystemStorageConfiguration>(Assert
-                    .IsType<ViewResult>(await controller.StorageProvider(StorageProvider.FileSystem.ToString()))
-                    .Model);
-                Assert.IsType<ViewResult>(
-                    await controller.EditFileSystemStorageProvider(fileSystemStorageConfiguration));
-                
-                var shouldBeRedirectingToLocalStorageConfigPage =
-                    Assert.IsType<RedirectToActionResult>(await controller.Storage());
-                Assert.Equal(nameof(StorageProvider), shouldBeRedirectingToLocalStorageConfigPage.ActionName);
-                Assert.Equal(StorageProvider.FileSystem,
-                    shouldBeRedirectingToLocalStorageConfigPage.RouteValues["provider"]);
-
-
-                await CanUploadRemoveFiles(controller);
-            }
-        }
-
-        [Fact]
-        [Trait("ExternalIntegration", "ExternalIntegration")]
-        public async Task CanUseAzureBlobStorage()
-        {
-            using (var tester = ServerTester.Create())
-            {
-                tester.Start();
-                var user = tester.NewAccount();
-                user.GrantAccess();
-                var controller = tester.PayTester.GetController<ServerController>(user.UserId, user.StoreId);
-                var azureBlobStorageConfiguration = Assert.IsType<AzureBlobStorageConfiguration>(Assert
-                    .IsType<ViewResult>(await controller.StorageProvider(StorageProvider.AzureBlobStorage.ToString()))
-                    .Model);
-
-                azureBlobStorageConfiguration.ConnectionString = GetFromSecrets("AzureBlobStorageConnectionString");
-                azureBlobStorageConfiguration.ContainerName = "testscontainer";
-                Assert.IsType<ViewResult>(
-                    await controller.EditAzureBlobStorageStorageProvider(azureBlobStorageConfiguration));
-
-
-                var shouldBeRedirectingToAzureStorageConfigPage =
-                    Assert.IsType<RedirectToActionResult>(await controller.Storage());
-                Assert.Equal(nameof(StorageProvider), shouldBeRedirectingToAzureStorageConfigPage.ActionName);
-                Assert.Equal(StorageProvider.AzureBlobStorage,
-                    shouldBeRedirectingToAzureStorageConfigPage.RouteValues["provider"]);
-
-                //seems like azure config worked, let's see if the conn string was actually saved
-
-                Assert.Equal(azureBlobStorageConfiguration.ConnectionString, Assert
-                    .IsType<AzureBlobStorageConfiguration>(Assert
-                        .IsType<ViewResult>(
-                            await controller.StorageProvider(StorageProvider.AzureBlobStorage.ToString()))
-                        .Model).ConnectionString);
-                
-                
-
-                await CanUploadRemoveFiles(controller);
-            }
-        }
-        
-        
-        private async Task CanUploadRemoveFiles(ServerController controller)
-        {
-            var fileContent = "content";
-            var uploadFormFileResult = Assert.IsType<RedirectToActionResult>(await controller.CreateFile(TestUtils.GetFormFile("uploadtestfile.txt", fileContent)));
-            Assert.True(uploadFormFileResult.RouteValues.ContainsKey("fileId"));
-            var fileId = uploadFormFileResult.RouteValues["fileId"].ToString();
-            Assert.Equal("Files", uploadFormFileResult.ActionName);
-
-            //check if file was uploaded and saved in db
-            var viewFilesViewModel =
-                Assert.IsType<ViewFilesViewModel>(Assert.IsType<ViewResult>(await controller.Files(fileId)).Model);
-
-            Assert.NotEmpty(viewFilesViewModel.Files);
-            Assert.Equal(fileId, viewFilesViewModel.SelectedFileId);
-            Assert.NotEmpty(viewFilesViewModel.DirectFileUrl);
-
-            
-            //verify file is available and the same
-            var net = new System.Net.WebClient();
-            var data = await net.DownloadStringTaskAsync(new Uri(viewFilesViewModel.DirectFileUrl));
-            Assert.Equal(fileContent, data);
-            
-            //create a temporary link to file
-            var tmpLinkGenerate = Assert.IsType<RedirectToActionResult>(await controller.CreateTemporaryFileUrl(fileId,
-                new ServerController.CreateTemporaryFileUrlViewModel()
-                {
-                    IsDownload = true,
-                    TimeAmount = 1,
-                    TimeType = ServerController.CreateTemporaryFileUrlViewModel.TmpFileTimeType.Minutes
-                }));
-            Assert.True(tmpLinkGenerate.RouteValues.ContainsKey("StatusMessage"));
-            var statusMessageModel = new StatusMessageModel(tmpLinkGenerate.RouteValues["StatusMessage"].ToString());
-            Assert.Equal(StatusMessageModel.StatusSeverity.Success, statusMessageModel.Severity);
-            var index = statusMessageModel.Html.IndexOf("target='_blank'>");
-            var url = statusMessageModel.Html.Substring(index).ReplaceMultiple(new Dictionary<string, string>()
-            {
-                {"</a>", string.Empty}, {"target='_blank'>", string.Empty}
-            });
-            //verify tmpfile is available and the same
-            data = await net.DownloadStringTaskAsync(new Uri(url));
-            Assert.Equal(fileContent, data);
-            
-            
-            //delete file
-            Assert.Equal(StatusMessageModel.StatusSeverity.Success, new StatusMessageModel(Assert
-                .IsType<RedirectToActionResult>(await controller.DeleteFile(fileId))
-                .RouteValues["statusMessage"].ToString()).Severity);
-            
-            //attempt to fetch deleted file
-            viewFilesViewModel =
-                Assert.IsType<ViewFilesViewModel>(Assert.IsType<ViewResult>(await controller.Files(fileId)).Model);
-
-            Assert.Null(viewFilesViewModel.DirectFileUrl);
-            Assert.Null(viewFilesViewModel.SelectedFileId);
-        }
-        
-        
-        
-
-      
-
-        private static string GetFromSecrets(string key)
-        {
-            var connStr = Environment.GetEnvironmentVariable($"TESTS_{key}");
-            if (!string.IsNullOrEmpty(connStr) && connStr != "none")
-                return connStr;
-            var builder = new ConfigurationBuilder();
-            builder.AddUserSecrets("AB0AC1DD-9D26-485B-9416-56A33F268117");
-            var config = builder.Build();
-            var token = config[key];
-            Assert.False(token == null, $"{key} is not set.\n Run \"dotnet user-secrets set {key} <value>\"");
-            return token;
-        }
-    }
-}

BTCPayServer.Tests/TestAccount.cs

@@ -18,8 +18,6 @@ using BTCPayServer.Tests.Logging;
 using BTCPayServer.Lightning;
 using BTCPayServer.Lightning.CLightning;
 using BTCPayServer.Data;
-using OpenIddict.Abstractions;
-using OpenIddict.Core;
 
 namespace BTCPayServer.Tests
 {
@@ -97,7 +95,7 @@ namespace BTCPayServer.Tests
         }
         public async Task<WalletId> RegisterDerivationSchemeAsync(string cryptoCode, bool segwit = false)
         {
-            SupportedNetwork = parent.NetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
+            SupportedNetwork = parent.NetworkProvider.GetNetwork(cryptoCode);
             var store = parent.PayTester.GetController<StoresController>(UserId, StoreId);
             ExtKey = new ExtKey().GetWif(SupportedNetwork.NBitcoinNetwork);
             DerivationScheme = new DerivationStrategyFactory(SupportedNetwork.NBitcoinNetwork).Parse(ExtKey.Neuter().ToString() + (segwit ? "" : "-[legacy]"));
@@ -115,18 +113,15 @@ namespace BTCPayServer.Tests
         private async Task RegisterAsync()
         {
             var account = parent.PayTester.GetController<AccountController>();
-            RegisterDetails = new RegisterViewModel()
+            await account.Register(new RegisterViewModel()
             {
                 Email = Guid.NewGuid() + "@toto.com",
                 ConfirmPassword = "Kitten0@",
                 Password = "Kitten0@",
-            };
-            await account.Register(RegisterDetails);
+            });
             UserId = account.RegisteredUserId;
         }
 
-        public RegisterViewModel RegisterDetails{ get; set; }
-
         public Bitpay BitPay
         {
             get; set;
@@ -168,14 +163,5 @@ namespace BTCPayServer.Tests
             if (storeController.ModelState.ErrorCount != 0)
                 Assert.False(true, storeController.ModelState.FirstOrDefault().Value.Errors[0].ErrorMessage);
         }
-
-        public async Task<BTCPayOpenIdClient> RegisterOpenIdClient(OpenIddictApplicationDescriptor descriptor, string secret = null)
-        {
-          var openIddictApplicationManager = parent.PayTester.GetService<OpenIddictApplicationManager<BTCPayOpenIdClient>>();
-          var client = new BTCPayOpenIdClient {ApplicationUserId = UserId};
-          await openIddictApplicationManager.PopulateAsync(client, descriptor);
-          await openIddictApplicationManager.CreateAsync(client, secret);
-          return client;
-        }
     }
 }

BTCPayServer.Tests/TestUtils.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Internal;
-using Xunit.Sdk;
-
-namespace BTCPayServer.Tests
-{
-    public static class TestUtils
-    {
-        public static FormFile GetFormFile(string filename, string content)
-        {
-            File.WriteAllText(filename, content);
-
-            var fileInfo = new FileInfo(filename);
-            FormFile formFile = new FormFile(
-                new FileStream(filename, FileMode.OpenOrCreate),
-                0,
-                fileInfo.Length, fileInfo.Name, fileInfo.Name)
-            {
-                Headers = new HeaderDictionary()
-            };
-            formFile.ContentType = "text/plain";
-            formFile.ContentDisposition = $"form-data; name=\"file\"; filename=\"{fileInfo.Name}\"";
-            return formFile;
-        }
-        public static FormFile GetFormFile(string filename, byte[] content)
-        {
-            File.WriteAllBytes(filename, content);
-
-            var fileInfo = new FileInfo(filename);
-            FormFile formFile = new FormFile(
-                new FileStream(filename, FileMode.OpenOrCreate),
-                0,
-                fileInfo.Length, fileInfo.Name, fileInfo.Name)
-            {
-                Headers = new HeaderDictionary()
-            };
-            formFile.ContentType = "application/octet-stream";
-            formFile.ContentDisposition = $"form-data; name=\"file\"; filename=\"{fileInfo.Name}\"";
-            return formFile;
-        }
-        public static void Eventually(Action act, int ms = 200000)
-        {
-            CancellationTokenSource cts = new CancellationTokenSource(ms);
-            while (true)
-            {
-                try
-                {
-                    act();
-                    break;
-                }
-                catch (XunitException) when (!cts.Token.IsCancellationRequested)
-                {
-                    cts.Token.WaitHandle.WaitOne(500);
-                }
-            }
-        }
-
-        public static async Task EventuallyAsync(Func<Task> act)
-        {
-            CancellationTokenSource cts = new CancellationTokenSource(20000);
-            while (true)
-            {
-                try
-                {
-                    await act();
-                    break;
-                }
-                catch (XunitException) when (!cts.Token.IsCancellationRequested)
-                {
-                    await Task.Delay(500);
-                }
-            }
-        }
-    }
-}

BTCPayServer.Tests/UtilitiesTests.cs

@@ -9,7 +9,6 @@ using NBitcoin.DataEncoders;
 using Newtonsoft.Json.Linq;
 using Xunit;
 using System.IO;
-using BTCPayServer.Services.Rates;
 
 namespace BTCPayServer.Tests
 {

BTCPayServer.Tests/docker-bitcoin-generate.ps1

@@ -1,3 +0,0 @@
-$bitcoind_container_id=$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=bitcoind)
-$address=$(docker exec -ti $bitcoind_container_id bitcoin-cli -datadir="/data" getnewaddress)
-docker exec -ti $bitcoind_container_id bitcoin-cli -datadir="/data" generatetoaddress $args $address

BTCPayServer.Tests/docker-compose.yml

@@ -16,18 +16,14 @@ services:
       TESTS_LTCNBXPLORERURL: http://nbxplorer:32838/
       TESTS_DB: "Postgres"
       TESTS_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver
+      TESTS_MYSQL: User ID=root;Host=mysql;Port=3306;Database=btcpayserver
       TESTS_PORT: 80
       TESTS_HOSTNAME: tests
-      TESTS_RUN_EXTERNAL_INTEGRATION: ${TESTS_RUN_EXTERNAL_INTEGRATION:-false}
-      TESTS_AzureBlobStorageConnectionString: ${TESTS_AzureBlobStorageConnectionString:-none}
       TEST_MERCHANTLIGHTNINGD: "type=clightning;server=unix://etc/merchant_lightningd_datadir/lightning-rpc"
       TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=unix://etc/customer_lightningd_datadir/lightning-rpc"
       TEST_MERCHANTCHARGE: "type=charge;server=http://lightning-charged:9112/;api-token=foiewnccewuify"
       TEST_MERCHANTLND: "https://lnd:lnd@merchant_lnd:8080/"
       TESTS_INCONTAINER: "true"
-      TESTS_SSHCONNECTION: "root@sshd:22"
-      TESTS_SSHPASSWORD: ""
-      TESTS_SSHKEYFILE: ""
     expose:
       - "80"
     links:
@@ -35,37 +31,12 @@ services:
     extra_hosts: 
       - "tests:127.0.0.1"
     volumes:
-      - "sshd_datadir:/root/.ssh"
       - "customer_lightningd_datadir:/etc/customer_lightningd_datadir"
       - "merchant_lightningd_datadir:/etc/merchant_lightningd_datadir"
 
   # The dev container is not actually used, it is just handy to run `docker-compose up dev` to start all services
   dev: 
-    image: alpine:3.7
-    command: [ "/bin/sh", "-c", "trap : TERM INT; while :; do echo Ready to code and debug like a rockstar!!!; sleep 2073600; done & wait" ]
-    links:
-      - nbxplorer
-      - postgres
-      - customer_lightningd
-      - merchant_lightningd
-      - lightning-charged
-      - customer_lnd
-      - merchant_lnd
-      - sshd
-
-  sshd:
-    build:
-        context: .
-        dockerfile: sshd.Dockerfile
-    ports:
-        - "21622:22"
-    expose:
-        - 22
-    volumes:
-        - "sshd_datadir:/root/.ssh"
-
-  devlnd: 
-    image: btcpayserver/bitcoin:0.18.0
+    image: btcpayserver/bitcoin:0.17.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
@@ -74,10 +45,31 @@ services:
     links:
       - nbxplorer
       - postgres
+      - mysql
+      - customer_lightningd
+      - merchant_lightningd
+      - lightning-charged
       - customer_lnd
       - merchant_lnd
+
+  devlnd: 
+    image: btcpayserver/bitcoin:0.17.0
+    environment:
+      BITCOIN_NETWORK: regtest
+      BITCOIN_EXTRA_ARGS: |
+        deprecatedrpc=signrawtransaction
+        connect=bitcoind:39388
+    links:
+      - nbxplorer
+      - postgres
+      - mysql
+      - customer_lnd
+      - merchant_lnd
+
+
+
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.0.0.57
+    image: nicolasdorier/nbxplorer:2.0.0.8
     restart: unless-stopped
     ports:
       - "32838:32838"
@@ -104,14 +96,13 @@ services:
 
   bitcoind:
     restart: unless-stopped
-    image: btcpayserver/bitcoin:0.18.0
+    image: btcpayserver/bitcoin:0.17.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |-
         rpcuser=ceiwHEbqWI83
         rpcpassword=DwubwWsoo3
         rpcport=43782
-        rpcbind=0.0.0.0:43782
         port=39388
         whitelist=0.0.0.0/0
         zmqpubrawblock=tcp://0.0.0.0:28332
@@ -128,19 +119,18 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v0.7.1-dev
+    image: btcpayserver/lightning:v0.6.2-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment: 
       EXPOSE_TCP: "true"
-      LIGHTNINGD_CHAIN: "btc"
-      LIGHTNINGD_NETWORK: "regtest"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
+        network=regtest
+        bind-addr=0.0.0.0
         announce-addr=customer_lightningd
         log-level=debug
-        funding-confirms=1
         dev-broadcast-interval=1000
         dev-bitcoind-poll=1
     ports:
@@ -175,17 +165,16 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v0.7.1-dev
+    image: btcpayserver/lightning:v0.6.2-dev
     stop_signal: SIGKILL
     environment: 
       EXPOSE_TCP: "true"
-      LIGHTNINGD_CHAIN: "btc"
-      LIGHTNINGD_NETWORK: "regtest"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
+        bind-addr=0.0.0.0
         announce-addr=merchant_lightningd
-        funding-confirms=1
+        network=regtest
         log-level=debug
         dev-broadcast-interval=1000
     ports:
@@ -222,9 +211,18 @@ services:
       - "39372:5432"
     expose:
       - "5432"
+      
+  mysql:
+    image:  mysql:8.0.12
+    expose:
+      - "3306"
+    ports:
+      - "33036:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.7.0-beta
+    image: btcpayserver/lnd:v0.5.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -239,7 +237,6 @@ services:
         bitcoind.zmqpubrawblock=tcp://bitcoind:28332
         bitcoind.zmqpubrawtx=tcp://bitcoind:28333
         externalip=merchant_lnd:9735
-        bitcoin.defaultchanconfs=1
         no-macaroons=1
         debuglevel=debug
         noseedbackup=1
@@ -255,7 +252,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.7.0-beta
+    image: btcpayserver/lnd:v0.5.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -270,7 +267,6 @@ services:
         bitcoind.zmqpubrawblock=tcp://bitcoind:28332
         bitcoind.zmqpubrawtx=tcp://bitcoind:28333
         externalip=customer_lnd:10009
-        bitcoin.defaultchanconfs=1
         no-macaroons=1
         debuglevel=debug
         noseedbackup=1
@@ -287,7 +283,6 @@ services:
       - bitcoind
 
 volumes:
-    sshd_datadir:
     bitcoin_datadir:
     customer_lightningd_datadir:
     merchant_lightningd_datadir:

BTCPayServer.Tests/docker-entrypoint.sh

@@ -1,9 +1,5 @@
 #!/bin/sh
 set -e
 
-FILTERS=" "
-if [[ "$TEST_FILTERS" ]]; then
-FILTERS="--filter $TEST_FILTERS"
-fi
-
-dotnet test $FILTERS --no-build -v n
+dotnet test --filter Fast=Fast --no-build
+dotnet test --filter Integration=Integration --no-build -v n

BTCPayServer.Tests/sshd.Dockerfile

@@ -1,12 +0,0 @@
-FROM alpine:3.8
-
-RUN apk add --no-cache openssh sudo bash
-RUN ssh-keygen -f /root/.ssh/id_rsa -t rsa -q -P "" -m PEM
-RUN echo 'root:opD3i2282D' | chpasswd
-RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-RUN ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa && \
-    ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa && \
-    ssh-keygen -f /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa && \
-    ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -N '' -t ed25519
-
-CMD ["/usr/sbin/sshd", "-D"]

BTCPayServer/Authentication/BitToken.cs

@@ -8,6 +8,10 @@ namespace BTCPayServer.Authentication
 {
     public class BitTokenEntity
     {
+        public string Facade
+        {
+            get; set;
+        }
         public string Value
         {
             get; set;
@@ -35,6 +39,7 @@ namespace BTCPayServer.Authentication
             return new BitTokenEntity()
             {
                 Label = Label,
+                Facade = Facade,
                 StoreId = StoreId,
                 PairingTime = PairingTime,
                 SIN = SIN,

BTCPayServer/Authentication/OpenId/AuthorizationCodeGrantTypeEventHandler.cs

@@ -1,27 +0,0 @@
-using AspNet.Security.OpenIdConnect.Primitives;
-using BTCPayServer.Data;
-using BTCPayServer.Models;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
-using OpenIddict.Core;
-
-namespace BTCPayServer.Authentication.OpenId
-{
-    public class AuthorizationCodeGrantTypeEventHandler : OpenIdGrantHandlerCheckCanSignIn
-    {
-        public AuthorizationCodeGrantTypeEventHandler(
-            OpenIddictApplicationManager<BTCPayOpenIdClient> applicationManager,
-            OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> authorizationManager,
-            SignInManager<ApplicationUser> signInManager,
-            IOptions<IdentityOptions> identityOptions,
-            UserManager<ApplicationUser> userManager) : base(applicationManager, authorizationManager, signInManager,
-            identityOptions, userManager)
-        {
-        }
-
-        protected override bool IsValid(OpenIdConnectRequest request)
-        {
-            return request.IsAuthorizationCodeGrantType();
-        }
-    }
-}

BTCPayServer/Authentication/OpenId/BaseOpenIdGrantHandler.cs

@@ -1,44 +0,0 @@
-using System.Threading.Tasks;
-using AspNet.Security.OpenIdConnect.Primitives;
-using BTCPayServer.Data;
-using BTCPayServer.Models;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
-using OpenIddict.Core;
-using OpenIddict.Server;
-
-namespace BTCPayServer.Authentication.OpenId
-{
-    public abstract class BaseOpenIdGrantHandler<T> : IOpenIddictServerEventHandler<T>
-        where T : class, IOpenIddictServerEvent
-    {
-        private readonly OpenIddictApplicationManager<BTCPayOpenIdClient> _applicationManager;
-        private readonly OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> _authorizationManager;
-        protected readonly SignInManager<ApplicationUser> _signInManager;
-        protected readonly IOptions<IdentityOptions> _identityOptions;
-
-        protected BaseOpenIdGrantHandler(
-            OpenIddictApplicationManager<BTCPayOpenIdClient> applicationManager,
-            OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> authorizationManager,
-            SignInManager<ApplicationUser> signInManager,
-            IOptions<IdentityOptions> identityOptions)
-        {
-            _applicationManager = applicationManager;
-            _authorizationManager = authorizationManager;
-            _signInManager = signInManager;
-            _identityOptions = identityOptions;
-        }
-
-
-        protected async Task<AuthenticationTicket> CreateTicketAsync(
-            OpenIdConnectRequest request, ApplicationUser user,
-            AuthenticationProperties properties = null)
-        {
-            return await OpenIdExtensions.CreateAuthenticationTicket(_applicationManager, _authorizationManager,
-                _identityOptions.Value, _signInManager, request, user, properties);
-        }
-
-        public abstract Task<OpenIddictServerEventState> HandleAsync(T notification);
-    }
-}

BTCPayServer/Authentication/OpenId/ClientCredentialsGrantTypeEventHandler.cs

@@ -1,64 +0,0 @@
-using System.Security.Claims;
-using System.Threading.Tasks;
-using AspNet.Security.OpenIdConnect.Extensions;
-using AspNet.Security.OpenIdConnect.Primitives;
-using BTCPayServer.Data;
-using BTCPayServer.Models;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
-using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
-using OpenIddict.Server;
-
-namespace BTCPayServer.Authentication.OpenId
-{
-    public class
-        ClientCredentialsGrantTypeEventHandler : BaseOpenIdGrantHandler<OpenIddictServerEvents.HandleTokenRequest>
-    {
-        private readonly OpenIddictApplicationManager<BTCPayOpenIdClient> _applicationManager;
-
-        private readonly UserManager<ApplicationUser> _userManager;
-
-        public ClientCredentialsGrantTypeEventHandler(
-            OpenIddictApplicationManager<BTCPayOpenIdClient> applicationManager,
-            OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> authorizationManager,
-            SignInManager<ApplicationUser> signInManager,
-            IOptions<IdentityOptions> identityOptions,
-            UserManager<ApplicationUser> userManager) : base(applicationManager, authorizationManager, signInManager,
-            identityOptions)
-        {
-            _applicationManager = applicationManager;
-            _userManager = userManager;
-        }
-
-        public override async Task<OpenIddictServerEventState> HandleAsync(
-            OpenIddictServerEvents.HandleTokenRequest notification)
-        {
-            var request = notification.Context.Request;
-            if (!request.IsClientCredentialsGrantType())
-            {
-                // Allow other handlers to process the event.
-                return OpenIddictServerEventState.Unhandled;
-            }
-
-            var application = await _applicationManager.FindByClientIdAsync(request.ClientId,
-                notification.Context.HttpContext.RequestAborted);
-            if (application == null)
-            {
-                notification.Context.Reject(
-                    error: OpenIddictConstants.Errors.InvalidClient,
-                    description: "The client application was not found in the database.");
-                // Don't allow other handlers to process the event.
-                return OpenIddictServerEventState.Handled;
-            }
-
-            var user = await _userManager.FindByIdAsync(application.ApplicationUserId);
-
-            notification.Context.Validate(await CreateTicketAsync(request, user));
-            // Don't allow other handlers to process the event.
-            return OpenIddictServerEventState.Handled;
-        }
-    }
-}

BTCPayServer/Authentication/OpenId/LogoutEventHandler.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using BTCPayServer.Data;
-using BTCPayServer.Models;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
-using OpenIddict.Core;
-using OpenIddict.Server;
-
-namespace BTCPayServer.Authentication.OpenId
-{
-    public class LogoutEventHandler : BaseOpenIdGrantHandler<OpenIddictServerEvents.HandleLogoutRequest>
-    {
-        public LogoutEventHandler(
-            OpenIddictApplicationManager<BTCPayOpenIdClient> applicationManager,
-            OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> authorizationManager,
-            SignInManager<ApplicationUser> signInManager, IOptions<IdentityOptions> identityOptions) : base(
-            applicationManager, authorizationManager,
-            signInManager, identityOptions)
-        {
-        }
-
-        public override async Task<OpenIddictServerEventState> HandleAsync(
-            OpenIddictServerEvents.HandleLogoutRequest notification)
-        {
-            // Ask ASP.NET Core Identity to delete the local and external cookies created
-            // when the user agent is redirected from the external identity provider
-            // after a successful authentication flow (e.g Google or Facebook).
-            await _signInManager.SignOutAsync();
-
-            // Returning a SignOutResult will ask OpenIddict to redirect the user agent
-            // to the post_logout_redirect_uri specified by the client application.
-            await notification.Context.HttpContext.SignOutAsync(OpenIddictServerDefaults.AuthenticationScheme);
-            notification.Context.HandleResponse();
-            return OpenIddictServerEventState.Handled;
-        }
-    }
-}

BTCPayServer/Authentication/OpenId/OpenIdExtensions.cs

@@ -1,139 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using AspNet.Security.OpenIdConnect.Extensions;
-using AspNet.Security.OpenIdConnect.Primitives;
-using BTCPayServer.Data;
-using BTCPayServer.Models;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.Server;
-
-namespace BTCPayServer.Authentication.OpenId
-{
-    public static class OpenIdExtensions
-    {
-        public static async Task<AuthenticationTicket> CreateAuthenticationTicket(
-            OpenIddictApplicationManager<BTCPayOpenIdClient> applicationManager,
-            OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> authorizationManager,
-            IdentityOptions identityOptions,
-            SignInManager<ApplicationUser> signInManager,
-            OpenIdConnectRequest request,
-            ApplicationUser user,
-            AuthenticationProperties properties = null)
-        {
-            // Create a new ClaimsPrincipal containing the claims that
-            // will be used to create an id_token, a token or a code.
-            var principal = await signInManager.CreateUserPrincipalAsync(user);
-
-            // Create a new authentication ticket holding the user identity.
-            var ticket = new AuthenticationTicket(principal, properties,
-                OpenIddictServerDefaults.AuthenticationScheme);
-
-            if (!request.IsAuthorizationCodeGrantType() && !request.IsRefreshTokenGrantType())
-            {
-                ticket.SetScopes(request.GetScopes());
-            }
-            else if (request.IsAuthorizationCodeGrantType() &&
-                     string.IsNullOrEmpty(ticket.GetInternalAuthorizationId()))
-            {
-                var app = await applicationManager.FindByClientIdAsync(request.ClientId);
-                var authorizationId = await IsUserAuthorized(authorizationManager, request, user.Id, app.Id);
-                if (!string.IsNullOrEmpty(authorizationId))
-                {
-                    ticket.SetInternalAuthorizationId(authorizationId);
-                }
-            }
-
-            foreach (var claim in ticket.Principal.Claims)
-            {
-                claim.SetDestinations(GetDestinations(identityOptions, claim, ticket));
-            }
-
-            return ticket;
-        }
-
-        private static IEnumerable<string> GetDestinations(IdentityOptions identityOptions, Claim claim,
-            AuthenticationTicket ticket)
-        {
-            // Note: by default, claims are NOT automatically included in the access and identity tokens.
-            // To allow OpenIddict to serialize them, you must attach them a destination, that specifies
-            // whether they should be included in access tokens, in identity tokens or in both.
-
-
-            switch (claim.Type)
-            {
-                case OpenIddictConstants.Claims.Name:
-                    yield return OpenIddictConstants.Destinations.AccessToken;
-
-                    if (ticket.HasScope(OpenIddictConstants.Scopes.Profile))
-                        yield return OpenIddictConstants.Destinations.IdentityToken;
-
-                    yield break;
-
-                case OpenIddictConstants.Claims.Email:
-                    yield return OpenIddictConstants.Destinations.AccessToken;
-
-                    if (ticket.HasScope(OpenIddictConstants.Scopes.Email))
-                        yield return OpenIddictConstants.Destinations.IdentityToken;
-
-                    yield break;
-
-                case OpenIddictConstants.Claims.Role:
-                    yield return OpenIddictConstants.Destinations.AccessToken;
-
-                    if (ticket.HasScope(OpenIddictConstants.Scopes.Roles))
-                        yield return OpenIddictConstants.Destinations.IdentityToken;
-
-                    yield break;
-                default:
-                    if (claim.Type == identityOptions.ClaimsIdentity.SecurityStampClaimType)
-                    {
-                        // Never include the security stamp in the access and identity tokens, as it's a secret value.
-                        yield break;
-                    }
-                    else
-                    {
-                        yield return OpenIddictConstants.Destinations.AccessToken;
-                        yield break;
-                    }
-            }
-        }
-
-        public static async Task<string> IsUserAuthorized(
-            OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> authorizationManager,
-            OpenIdConnectRequest request, string userId, string applicationId)
-        {
-            var authorizations =
-                await authorizationManager.ListAsync(queryable =>
-                    queryable.Where(authorization =>
-                        authorization.Subject.Equals(userId, StringComparison.OrdinalIgnoreCase) &&
-                        applicationId.Equals(authorization.Application.Id, StringComparison.OrdinalIgnoreCase) &&
-                        authorization.Status.Equals(OpenIddictConstants.Statuses.Valid,
-                            StringComparison.OrdinalIgnoreCase)));
-
-
-            if (authorizations.Length > 0)
-            {
-                var scopeTasks = authorizations.Select(authorization =>
-                    (authorizationManager.GetScopesAsync(authorization).AsTask(), authorization.Id));
-                await Task.WhenAll(scopeTasks.Select((tuple) => tuple.Item1));
-
-                var authorizationsWithSufficientScopes = scopeTasks
-                    .Select((tuple) => (tuple.Id, Scopes: tuple.Item1.Result))
-                    .Where((tuple) => !request.GetScopes().Except(tuple.Scopes).Any());
-
-                if (authorizationsWithSufficientScopes.Any())
-                {
-                    return authorizationsWithSufficientScopes.First().Id;
-                }
-            }
-
-            return null;
-        }
-    }
-}

BTCPayServer/Authentication/OpenId/OpenIdGrantHandlerCheckCanSignIn.cs

@@ -1,70 +0,0 @@
-using System.Threading.Tasks;
-using AspNet.Security.OpenIdConnect.Primitives;
-using BTCPayServer.Data;
-using BTCPayServer.Models;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
-using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.Server;
-
-namespace BTCPayServer.Authentication.OpenId
-{
-    public abstract class
-        OpenIdGrantHandlerCheckCanSignIn : BaseOpenIdGrantHandler<OpenIddictServerEvents.HandleTokenRequest>
-    {
-        private readonly UserManager<ApplicationUser> _userManager;
-
-        protected OpenIdGrantHandlerCheckCanSignIn(
-            OpenIddictApplicationManager<BTCPayOpenIdClient> applicationManager,
-            OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> authorizationManager,
-            SignInManager<ApplicationUser> signInManager,
-            IOptions<IdentityOptions> identityOptions, UserManager<ApplicationUser> userManager) : base(
-            applicationManager, authorizationManager, signInManager,
-            identityOptions)
-        {
-            _userManager = userManager;
-        }
-
-        protected abstract bool IsValid(OpenIdConnectRequest request);
-
-        public override async Task<OpenIddictServerEventState> HandleAsync(
-            OpenIddictServerEvents.HandleTokenRequest notification)
-        {
-            var request = notification.Context.Request;
-            if (!IsValid(request))
-            {
-                // Allow other handlers to process the event.
-                return OpenIddictServerEventState.Unhandled;
-            }
-
-            var scheme = notification.Context.Scheme.Name;
-            var authenticateResult = (await notification.Context.HttpContext.AuthenticateAsync(scheme));
-
-            var user = await _userManager.GetUserAsync(authenticateResult.Principal);
-            if (user == null)
-            {
-                notification.Context.Reject(
-                    error: OpenIddictConstants.Errors.InvalidGrant,
-                    description: "The token is no longer valid.");
-                // Don't allow other handlers to process the event.
-                return OpenIddictServerEventState.Handled;
-            }
-
-            // Ensure the user is still allowed to sign in.
-            if (!await _signInManager.CanSignInAsync(user))
-            {
-                notification.Context.Reject(
-                    error: OpenIddictConstants.Errors.InvalidGrant,
-                    description: "The user is no longer allowed to sign in.");
-                // Don't allow other handlers to process the event.
-                return OpenIddictServerEventState.Handled;
-            }
-
-            notification.Context.Validate(await CreateTicketAsync(request, user));
-            // Don't allow other handlers to process the event.
-            return OpenIddictServerEventState.Handled;
-        }
-    }
-}

BTCPayServer/Authentication/OpenId/PasswordGrantTypeEventHandler.cs

@@ -1,63 +0,0 @@
-using System.Threading.Tasks;
-using AspNet.Security.OpenIdConnect.Primitives;
-using BTCPayServer.Data;
-using BTCPayServer.Models;
-using BTCPayServer.Services.U2F;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
-using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.Server;
-
-namespace BTCPayServer.Authentication.OpenId
-{
-    public class PasswordGrantTypeEventHandler : BaseOpenIdGrantHandler<OpenIddictServerEvents.HandleTokenRequest>
-    {
-        private readonly UserManager<ApplicationUser> _userManager;
-        private readonly U2FService _u2FService;
-
-        public PasswordGrantTypeEventHandler(
-            OpenIddictApplicationManager<BTCPayOpenIdClient> applicationManager,
-            OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> authorizationManager,
-            SignInManager<ApplicationUser> signInManager,
-            UserManager<ApplicationUser> userManager,
-            IOptions<IdentityOptions> identityOptions, U2FService u2FService) : base(applicationManager,
-            authorizationManager, signInManager, identityOptions)
-        {
-            _userManager = userManager;
-            _u2FService = u2FService;
-        }
-
-        public override async Task<OpenIddictServerEventState> HandleAsync(
-            OpenIddictServerEvents.HandleTokenRequest notification)
-        {
-            var request = notification.Context.Request;
-            if (!request.IsPasswordGrantType())
-            {
-                // Allow other handlers to process the event.
-                return OpenIddictServerEventState.Unhandled;
-            }
-
-            // Validate the user credentials.
-            // Note: to mitigate brute force attacks, you SHOULD strongly consider
-            // applying a key derivation function like PBKDF2 to slow down
-            // the password validation process. You SHOULD also consider
-            // using a time-constant comparer to prevent timing attacks.
-            var user = await _userManager.FindByNameAsync(request.Username);
-            if (user == null || await _u2FService.HasDevices(user.Id) ||
-                !(await _signInManager.CheckPasswordSignInAsync(user, request.Password, lockoutOnFailure: true))
-                    .Succeeded)
-            {
-                notification.Context.Reject(
-                    error: OpenIddictConstants.Errors.InvalidGrant,
-                    description: "The specified credentials are invalid.");
-                // Don't allow other handlers to process the event.
-                return OpenIddictServerEventState.Handled;
-            }
-
-            notification.Context.Validate(await CreateTicketAsync(request, user));
-            // Don't allow other handlers to process the event.
-            return OpenIddictServerEventState.Handled;
-        }
-    }
-}

BTCPayServer/Authentication/OpenId/RefreshTokenGrantTypeEventHandler.cs

@@ -1,27 +0,0 @@
-using AspNet.Security.OpenIdConnect.Primitives;
-using BTCPayServer.Data;
-using BTCPayServer.Models;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
-using OpenIddict.Core;
-
-namespace BTCPayServer.Authentication.OpenId
-{
-    public class RefreshTokenGrantTypeEventHandler : OpenIdGrantHandlerCheckCanSignIn
-    {
-        public RefreshTokenGrantTypeEventHandler(
-            OpenIddictApplicationManager<BTCPayOpenIdClient> applicationManager,
-            OpenIddictAuthorizationManager<BTCPayOpenIdAuthorization> authorizationManager,
-            SignInManager<ApplicationUser> signInManager,
-            IOptions<IdentityOptions> identityOptions, UserManager<ApplicationUser> userManager) : base(
-            applicationManager, authorizationManager, signInManager,
-            identityOptions, userManager)
-        {
-        }
-
-        protected override bool IsValid(OpenIdConnectRequest request)
-        {
-            return request.IsRefreshTokenGrantType();
-        }
-    }
-}

BTCPayServer/Authentication/PairingCodeEntity.cs

@@ -11,6 +11,11 @@ namespace BTCPayServer.Authentication
             get;
             set;
         }
+        public string Facade
+        {
+            get;
+            set;
+        }
         public string Label
         {
             get;

BTCPayServer/Authentication/TokenRepository.cs

@@ -1,5 +1,5 @@
 using BTCPayServer.Data;
-using DBriize;
+using DBreeze;
 using NBitcoin;
 using NBitcoin.DataEncoders;
 using Newtonsoft.Json;
@@ -90,6 +90,7 @@ namespace BTCPayServer.Authentication
             return new BitTokenEntity()
             {
                 Label = data.Label,
+                Facade = data.Facade,
                 Value = data.Id,
                 SIN = data.SIN,
                 PairingTime = data.PairingTime,
@@ -128,6 +129,7 @@ namespace BTCPayServer.Authentication
             {
                 var pairingCode = await ctx.PairingCodes.FindAsync(pairingCodeEntity.Id);
                 pairingCode.Label = pairingCodeEntity.Label;
+                pairingCode.Facade = pairingCodeEntity.Facade;
                 await ctx.SaveChangesAsync();
                 return CreatePairingCodeEntity(pairingCode);
             }
@@ -176,6 +178,7 @@ namespace BTCPayServer.Authentication
                 {
                     Id = pairingCode.TokenValue,
                     PairingTime = DateTime.UtcNow,
+                    Facade = pairingCode.Facade,
                     Label = pairingCode.Label,
                     StoreDataId = pairingCode.StoreDataId,
                     SIN = pairingCode.SIN
@@ -210,6 +213,7 @@ namespace BTCPayServer.Authentication
                 return null;
             return new PairingCodeEntity()
             {
+                Facade = data.Facade,
                 Id = data.Id,
                 Label = data.Label,
                 Expiration = data.Expiration,

BTCPayServer/BTCPayNetwork.cs

@@ -3,18 +3,13 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Invoices;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
-using Newtonsoft.Json;
 
 namespace BTCPayServer
 {
-    public enum DerivationType
-    {
-        Legacy,
-        SegwitP2SH,
-        Segwit
-    }
     public class BTCPayDefaultSettings
     {
         static BTCPayDefaultSettings()
@@ -43,69 +38,13 @@ namespace BTCPayServer
         public string DefaultConfigurationFile { get; set; }
         public int DefaultPort { get; set; }
     }
-
-    public class BTCPayNetwork:BTCPayNetworkBase
+    public class BTCPayNetwork
     {
         public Network NBitcoinNetwork { get; set; }
-        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 KeyPath GetRootKeyPath(DerivationType type)
-        {
-            KeyPath baseKey;
-            if (!NBitcoinNetwork.Consensus.SupportSegwit)
-            {
-                baseKey = new KeyPath("44'");
-            }
-            else
-            {
-                switch (type)
-                {
-                    case DerivationType.Legacy:
-                        baseKey = new KeyPath("44'");
-                        break;
-                    case DerivationType.SegwitP2SH:
-                        baseKey = new KeyPath("49'");
-                        break;
-                    case DerivationType.Segwit:
-                        baseKey = new KeyPath("84'");
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(type), type, null);
-                }
-            }
-            return baseKey
-                .Derive(CoinType);
-        }
-
-        public KeyPath GetRootKeyPath()
-        {
-            return new KeyPath(NBitcoinNetwork.Consensus.SupportSegwit ? "49'" : "44'")
-                .Derive(CoinType);
-        }
-
-        public override T ToObject<T>(string json)
-        {
-            return NBXplorerNetwork.Serializer.ToObject<T>(json);
-        }
-
-        public override string ToString<T>(T obj)
-        {
-            return NBXplorerNetwork.Serializer.ToString(obj);
-        }
-    }
-
-    public abstract class BTCPayNetworkBase
-    {
-        
         public string CryptoCode { get; internal set; }
         public string BlockExplorerLink { get; internal set; }
         public string UriScheme { get; internal set; }
+        public Money MinFee { get; internal set; }
         public string DisplayName { get; set; }
 
         [Obsolete("Should not be needed")]
@@ -118,22 +57,23 @@ namespace BTCPayServer
         }
 
         public string CryptoImagePath { get; set; }
+        public string LightningImagePath { get; set; }
+        public NBXplorer.NBXplorerNetwork NBXplorerNetwork { get; set; }
 
+        public BTCPayDefaultSettings DefaultSettings { get; set; }
+        public KeyPath CoinType { get; internal set; }
         public int MaxTrackedConfirmation { get; internal set; } = 6;
         public string[] DefaultRateRules { get; internal set; } = Array.Empty<string>();
+
         public override string ToString()
         {
             return CryptoCode;
         }
 
-        public virtual T ToObject<T>(string json)
+        internal KeyPath GetRootKeyPath()
         {
-            return JsonConvert.DeserializeObject<T>(json);
-        }
-
-        public virtual string ToString<T>(T obj)
-        {
-            return JsonConvert.SerializeObject(obj);
+            return new KeyPath(NBitcoinNetwork.Consensus.SupportSegwit ? "49'" : "44'")
+                        .Derive(CoinType); 
         }
     }
 }

BTCPayServer/BTCPayNetworkProvider.Bitcoin.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
+using NBitpayClient;
 using NBXplorer;
 
 namespace BTCPayServer
@@ -16,29 +18,14 @@ namespace BTCPayServer
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Bitcoin",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://blockstream.info/tx/{0}" : "https://blockstream.info/testnet/tx/{0}",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://www.smartbit.com.au/tx/{0}" : "https://testnet.smartbit.com.au/tx/{0}",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "bitcoin",
                 CryptoImagePath = "imlegacy/bitcoin.svg",
                 LightningImagePath = "imlegacy/bitcoin-lightning.svg",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("0'") : new KeyPath("1'"),
-                SupportRBF = true,
-                //https://github.com/spesmilo/electrum/blob/11733d6bc271646a00b69ff07657119598874da4/electrum/constants.py
-                ElectrumMapping = NetworkType == NetworkType.Mainnet
-                    ? new Dictionary<uint, DerivationType>()
-                    {
-                        {0x0488b21eU, DerivationType.Legacy }, // xpub
-                        {0x049d7cb2U, DerivationType.SegwitP2SH }, // ypub
-                        {0x4b24746U, DerivationType.Segwit }, //zpub
-                    }
-                    : new Dictionary<uint, DerivationType>()
-                    {
-                        {0x043587cfU, DerivationType.Legacy},
-                        {0x044a5262U, DerivationType.SegwitP2SH},
-                        {0x045f1cf6U, DerivationType.Segwit}
-                    }
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("0'") : new KeyPath("1'")
             });
         }
     }

BTCPayServer/BTCPayNetworkProvider.Bitcoinplus.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer/BTCPayNetworkProvider.Bitcore.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer/BTCPayNetworkProvider.Dash.cs

@@ -27,7 +27,8 @@ namespace BTCPayServer
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
                 //https://github.com/satoshilabs/slips/blob/master/slip-0044.md
                 CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("5'")
-                    : new KeyPath("1'")
+                    : new KeyPath("1'"),
+                MinFee = Money.Satoshis(1m)
             });
         }
     }

BTCPayServer/BTCPayNetworkProvider.Dogecoin.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
 
@@ -27,7 +28,8 @@ namespace BTCPayServer
                 },
                 CryptoImagePath = "imlegacy/dogecoin.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("3'") : new KeyPath("1'")
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("3'") : new KeyPath("1'"),
+                MinFee = Money.Coins(1m)
             });
         }
     }

BTCPayServer/BTCPayNetworkProvider.Feathercoin.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer/BTCPayNetworkProvider.Groestlcoin.cs

@@ -10,21 +10,20 @@ namespace BTCPayServer
     {
         public void InitGroestlcoin()
         {
+
             var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("GRS");
             Add(new BTCPayNetwork()
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Groestlcoin",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet
-                    ? "https://chainz.cryptoid.info/grs/tx.dws?{0}.htm"
-                    : "https://chainz.cryptoid.info/grs-test/tx.dws?{0}.htm",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/grs/tx.dws?{0}.htm" : "https://chainz.cryptoid.info/grs-test/tx.dws?{0}.htm",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "groestlcoin",
                 DefaultRateRules = new[]
                 {
-                    "GRS_X = GRS_BTC * BTC_X",
-                    "GRS_BTC = bittrex(GRS_BTC)"
+                                "GRS_X = GRS_BTC * BTC_X",
+                                "GRS_BTC = bittrex(GRS_BTC)"
                 },
                 CryptoImagePath = "imlegacy/groestlcoin.png",
                 LightningImagePath = "imlegacy/groestlcoin-lightning.svg",

BTCPayServer/BTCPayNetworkProvider.Litecoin.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
 
@@ -16,30 +17,14 @@ namespace BTCPayServer
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Litecoin",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet
-                    ? "https://live.blockcypher.com/ltc/tx/{0}/"
-                    : "http://explorer.litecointools.com/tx/{0}",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://live.blockcypher.com/ltc/tx/{0}/" : "http://explorer.litecointools.com/tx/{0}",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "litecoin",
                 CryptoImagePath = "imlegacy/litecoin.svg",
                 LightningImagePath = "imlegacy/litecoin-lightning.svg",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("2'") : new KeyPath("1'"),
-                //https://github.com/pooler/electrum-ltc/blob/0d6989a9d2fb2edbea421c116e49d1015c7c5a91/electrum_ltc/constants.py
-                ElectrumMapping = NetworkType == NetworkType.Mainnet
-                    ? new Dictionary<uint, DerivationType>()
-                    {
-                        {0x0488b21eU, DerivationType.Legacy },
-                        {0x049d7cb2U, DerivationType.SegwitP2SH },
-                        {0x04b24746U, DerivationType.Segwit },
-                    }
-                    : new Dictionary<uint, DerivationType>()
-                    {
-                        {0x043587cfU, DerivationType.Legacy },
-                        {0x044a5262U, DerivationType.SegwitP2SH },
-                        {0x045f1cf6U, DerivationType.Segwit }
-                    }
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("2'") : new KeyPath("1'")
             });
         }
     }

BTCPayServer/BTCPayNetworkProvider.Monacoin.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer/BTCPayNetworkProvider.Polis.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer/BTCPayNetworkProvider.Ufo.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer/BTCPayNetworkProvider.Viacoin.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer/BTCPayNetworkProvider.cs

@@ -3,14 +3,17 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using Microsoft.Extensions.Caching.Memory;
 using NBitcoin;
+using NBitpayClient;
 using NBXplorer;
 
 namespace BTCPayServer
 {
     public partial class BTCPayNetworkProvider
     {
-        Dictionary<string, BTCPayNetworkBase> _Networks = new Dictionary<string, BTCPayNetworkBase>();
+        Dictionary<string, BTCPayNetwork> _Networks = new Dictionary<string, BTCPayNetwork>();
 
 
         private readonly NBXplorerNetworkProvider _NBXplorerNetworkProvider;
@@ -22,14 +25,13 @@ namespace BTCPayServer
             }
         }
 
-        BTCPayNetworkProvider(BTCPayNetworkProvider unfiltered, string[] cryptoCodes)
+        BTCPayNetworkProvider(BTCPayNetworkProvider filtered, string[] cryptoCodes)
         {
-            UnfilteredNetworks = unfiltered.UnfilteredNetworks ?? unfiltered;
-            NetworkType = unfiltered.NetworkType;
-            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(unfiltered.NetworkType);
-            _Networks = new Dictionary<string, BTCPayNetworkBase>();
+            NetworkType = filtered.NetworkType;
+            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(filtered.NetworkType);
+            _Networks = new Dictionary<string, BTCPayNetwork>();
             cryptoCodes = cryptoCodes.Select(c => c.ToUpperInvariant()).ToArray();
-            foreach (var network in unfiltered._Networks)
+            foreach (var network in filtered._Networks)
             {
                 if(cryptoCodes.Contains(network.Key))
                 {
@@ -38,12 +40,9 @@ namespace BTCPayServer
             }
         }
 
-        public BTCPayNetworkProvider UnfilteredNetworks { get; }
-
         public NetworkType NetworkType { get; private set; }
         public BTCPayNetworkProvider(NetworkType networkType)
         {
-            UnfilteredNetworks = this;
             _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(networkType);
             NetworkType = networkType;
             InitBitcoin();
@@ -56,21 +55,6 @@ namespace BTCPayServer
             InitFeathercoin();
             InitGroestlcoin();
             InitViacoin();
-            // Assume that electrum mappings are same as BTC if not specified
-            foreach (var network in _Networks.Values.OfType<BTCPayNetwork>())
-            {
-                if(network.ElectrumMapping.Count == 0)
-                {
-                    network.ElectrumMapping = GetNetwork<BTCPayNetwork>("BTC").ElectrumMapping;
-                    if (!network.NBitcoinNetwork.Consensus.SupportSegwit)
-                    {
-                        network.ElectrumMapping =
-                            network.ElectrumMapping
-                            .Where(kv => kv.Value == DerivationType.Legacy)
-                            .ToDictionary(k => k.Key, k => k.Value);
-                    }
-                }
-            }
 
             // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
             //InitPolis();
@@ -89,14 +73,20 @@ namespace BTCPayServer
         }
 
         [Obsolete("To use only for legacy stuff")]
-        public BTCPayNetwork BTC => GetNetwork<BTCPayNetwork>("BTC");
+        public BTCPayNetwork BTC
+        {
+            get
+            {
+                return GetNetwork("BTC");
+            }
+        }
 
-        public void Add(BTCPayNetworkBase network)
+        public void Add(BTCPayNetwork network)
         {
             _Networks.Add(network.CryptoCode.ToUpperInvariant(), network);
         }
 
-        public IEnumerable<BTCPayNetworkBase> GetAll()
+        public IEnumerable<BTCPayNetwork> GetAll()
         {
             return _Networks.Values.ToArray();
         }
@@ -105,20 +95,15 @@ namespace BTCPayServer
         {
             return _Networks.ContainsKey(cryptoCode.ToUpperInvariant());
         }
-        public BTCPayNetworkBase GetNetwork(string cryptoCode)
+
+        public BTCPayNetwork GetNetwork(string cryptoCode)
         {
-            return GetNetwork<BTCPayNetworkBase>(cryptoCode);
-        }
-        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 BTCPayNetwork network))
             {
                 if (cryptoCode == "XBT")
-                    return GetNetwork<T>("BTC");
+                    return GetNetwork("BTC");
             }
-            return network as T;
+            return network;
         }
     }
 }

BTCPayServer/BTCPayServer.csproj

@@ -1,8 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
-  <Import Project="../Build/Common.csproj" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+		<Version>1.0.3.68</Version>
+    <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
@@ -26,33 +30,36 @@
     <None Remove="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="bundleconfig.json" />
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.1" />
-    <PackageReference Include="BuildBundlerMinifier" Version="3.0.415" />
-    <PackageReference Include="BundlerMinifier.Core" Version="3.0.415" />
-    <PackageReference Include="BundlerMinifier.TagHelpers" Version="3.0.415" />
-    <PackageReference Include="HtmlSanitizer" Version="4.0.217" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.9" />
+    <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
+    <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
+    <PackageReference Include="HtmlSanitizer" Version="4.0.199" />
     <PackageReference Include="LedgerWallet" Version="2.0.0.3" />
+    <PackageReference Include="Meziantou.AspNetCore.BundleTagHelpers" Version="2.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NBitpayClient" Version="1.0.0.34" />	  
-    <PackageReference Include="DBriize" Version="1.0.0.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="NBitcoin" Version="4.1.1.78" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.31" />	  
+    <PackageReference Include="DBreeze" Version="1.92.0" />
+    <PackageReference Include="NBXplorer.Client" Version="2.0.0.3" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
-    <PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.9" />
+    <PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.18" />
-    <PackageReference Include="OpenIddict" Version="2.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
     <PackageReference Include="Serilog" Version="2.7.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="SSH.NET" Version="2016.1.0" />
+    <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
     <PackageReference Include="Text.Analyzers" Version="2.6.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -60,13 +67,7 @@
   </ItemGroup>
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
-    <PackageReference Include="TwentyTwenty.Storage" Version="2.11.2" />
-    <PackageReference Include="TwentyTwenty.Storage.Amazon" Version="2.11.2" />
-    <PackageReference Include="TwentyTwenty.Storage.Azure" Version="2.11.2" />
-    <PackageReference Include="TwentyTwenty.Storage.Google" Version="2.11.2" />
-    <PackageReference Include="TwentyTwenty.Storage.Local" Version="2.11.2" />
-    <PackageReference Include="U2F.Core" Version="1.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.6" />
 		<PackageReference Include="YamlDotNet" Version="5.2.1" />
 	</ItemGroup>
 
@@ -75,6 +76,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <None Include="wwwroot\checkout\js\core.js" />
 	  <None Include="wwwroot\vendor\bootstrap4-creativestart\creative.js" />
 	  <None Include="wwwroot\vendor\font-awesome\fonts\fontawesome-webfont.svg" />
 	  <None Include="wwwroot\vendor\font-awesome\fonts\fontawesome-webfont.woff2" />
@@ -120,19 +122,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Folder Include="Authentication\OpenId\Models\" />
 	  <Folder Include="Build\" />
-	  <Folder Include="U2F\Services" />
 	  <Folder Include="wwwroot\vendor\clipboard.js\" />
 	  <Folder Include="wwwroot\vendor\highlightjs\" />
 	  <Folder Include="wwwroot\vendor\summernote" />
-	  <Folder Include="wwwroot\vendor\u2f" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <ProjectReference Include="..\BTCPayServer.Data\BTCPayServer.Data.csproj" />
-	  <ProjectReference Include="..\BTCPayServer.Rating\BTCPayServer.Rating.csproj" />
-	  <ProjectReference Include="..\BTCPayServer.Common\BTCPayServer.Common.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -143,21 +136,12 @@
     <Content Update="Views\Home\BitpayTranslator.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
-    <Content Update="Views\Server\DynamicDnsServices.cshtml">
-      <Pack>$(IncludeRazorContentInPack)</Pack>
-    </Content>
     <Content Update="Views\Server\LightningChargeServices.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
     <Content Update="Views\Server\LightningWalletServices.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
-    <Content Update="Views\Server\P2PService.cshtml">
-      <Pack>$(IncludeRazorContentInPack)</Pack>
-    </Content>
-    <Content Update="Views\Server\DynamicDnsService.cshtml">
-      <Pack>$(IncludeRazorContentInPack)</Pack>
-    </Content>
     <Content Update="Views\Server\SSHService.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
@@ -185,15 +169,6 @@
 	  <Content Update="Views\Wallets\ListWallets.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>
-	  <Content Update="Views\Wallets\WalletPSBTCombine.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
-	  <Content Update="Views\Wallets\WalletPSBTReady.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
-	  <Content Update="Views\Wallets\WalletPSBT.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
 	  <Content Update="Views\Wallets\WalletRescan.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -6,9 +6,16 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
+using System.Text;
+using StandardConfiguration;
 using Microsoft.Extensions.Configuration;
+using NBXplorer;
+using BTCPayServer.Payments.Lightning;
+using Renci.SshNet;
+using NBitcoin.DataEncoders;
 using BTCPayServer.SSH;
 using BTCPayServer.Lightning;
+using BTCPayServer.Configuration.External;
 using Serilog.Events;
 
 namespace BTCPayServer.Configuration
@@ -42,8 +49,12 @@ namespace BTCPayServer.Configuration
             get;
             private set;
         }
-        public EndPoint SocksEndpoint { get; set; }
-        
+        public List<IPEndPoint> Listen
+        {
+            get;
+            set;
+        }
+
         public List<NBXplorerConnectionSetting> NBXplorerConnectionSettings
         {
             get;
@@ -69,24 +80,22 @@ namespace BTCPayServer.Configuration
         public void LoadArgs(IConfiguration conf)
         {
             NetworkType = DefaultConfiguration.GetNetworkType(conf);
-            DataDir = conf.GetDataDir(NetworkType);
+            var defaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType);
+            DataDir = conf.GetOrDefault<string>("datadir", defaultSettings.DefaultDataDirectory);
             Logs.Configuration.LogInformation("Network: " + NetworkType.ToString());
 
-            if (conf.GetOrDefault<bool>("launchsettings", false) && NetworkType != NetworkType.Regtest)
-                throw new ConfigException($"You need to run BTCPayServer with the run.sh or run.ps1 script");
-
             var supportedChains = conf.GetOrDefault<string>("chains", "btc")
                                       .Split(',', StringSplitOptions.RemoveEmptyEntries)
                                       .Select(t => t.ToUpperInvariant());
             NetworkProvider = new BTCPayNetworkProvider(NetworkType).Filter(supportedChains.ToArray());
             foreach (var chain in supportedChains)
             {
-                if (NetworkProvider.GetNetwork<BTCPayNetworkBase>(chain) == null)
+                if (NetworkProvider.GetNetwork(chain) == null)
                     throw new ConfigException($"Invalid chains \"{chain}\"");
             }
 
             var validChains = new List<string>();
-            foreach (var net in NetworkProvider.GetAll().OfType<BTCPayNetwork>())
+            foreach (var net in NetworkProvider.GetAll())
             {
                 NBXplorerConnectionSetting setting = new NBXplorerConnectionSetting();
                 setting.CryptoCode = net.CryptoCode;
@@ -105,8 +114,6 @@ namespace BTCPayServer.Configuration
                                 $"If you have a lightning charge server: 'type=charge;server=https://charge.example.com;api-token=yourapitoken'" + Environment.NewLine +
                                 $"If you have a lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
                                 $"              lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                $"If you have an eclair server: 'type=eclair;server=http://eclair.com:4570;password=eclairpassword;bitcoin-host=bitcoind:37393;bitcoin-auth=bitcoinrpcuser:bitcoinrpcpassword" + Environment.NewLine +
-                                $"               eclair server: 'type=eclair;server=http://eclair.com:4570;password=eclairpassword;bitcoin-host=bitcoind:37393" + Environment.NewLine +
                                 $"Error: {error}" + Environment.NewLine +
                                 "This service will not be exposed through BTCPay Server");
                         }
@@ -121,7 +128,85 @@ namespace BTCPayServer.Configuration
                     }
                 }
 
-                ExternalServices.Load(net.CryptoCode, conf);
+                void externalLnd<T>(string code, string lndType)
+                {
+                    var lightning = conf.GetOrDefault<string>(code, string.Empty);
+                    if (lightning.Length != 0)
+                    {
+                        if (!LightningConnectionString.TryParse(lightning, false, out var connectionString, out var error))
+                        {
+                            Logs.Configuration.LogWarning($"Invalid setting {code}, " + Environment.NewLine +
+                                $"lnd server: 'type={lndType};server=https://lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
+                                $"lnd server: 'type={lndType};server=https://lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
+                                $"Error: {error}" + Environment.NewLine +
+                                "This service will not be exposed through BTCPay Server");
+                        }
+                        else
+                        {
+                            var instanceType = typeof(T);
+                            ExternalServicesByCryptoCode.Add(net.CryptoCode, (ExternalService)Activator.CreateInstance(instanceType, connectionString));
+                        }
+                    }
+                };
+
+                externalLnd<ExternalLndGrpc>($"{net.CryptoCode}.external.lnd.grpc", "lnd-grpc");
+                externalLnd<ExternalLndRest>($"{net.CryptoCode}.external.lnd.rest", "lnd-rest");
+
+                {
+                    var spark = conf.GetOrDefault<string>($"{net.CryptoCode}.external.spark", string.Empty);
+                    if (spark.Length != 0)
+                    {
+                        if (!SparkConnectionString.TryParse(spark, out var connectionString, out var error))
+                        {
+                            Logs.Configuration.LogWarning($"Invalid setting {net.CryptoCode}.external.spark, " + Environment.NewLine +
+                                $"Valid example: 'server=https://btcpay.example.com/spark/btc/;cookiefile=/etc/clightning_bitcoin_spark/.cookie'" + Environment.NewLine + 
+                                $"Error: {error}" + Environment.NewLine +
+                                "This service will not be exposed through BTCPay Server");
+                        }
+                        else
+                        {
+                            ExternalServicesByCryptoCode.Add(net.CryptoCode, new ExternalSpark(connectionString));
+                        }
+                    }
+                }
+
+                {
+                    var rtl = conf.GetOrDefault<string>($"{net.CryptoCode}.external.rtl", string.Empty);
+                    if (rtl.Length != 0)
+                    {
+                        if (!SparkConnectionString.TryParse(rtl, out var connectionString, out var error))
+                        {
+                            Logs.Configuration.LogWarning($"Invalid setting {net.CryptoCode}.external.rtl, " + Environment.NewLine +
+                                $"Valid example: 'server=https://btcpay.example.com/rtl/btc/;cookiefile=/etc/clightning_bitcoin_rtl/.cookie'" + Environment.NewLine +
+                                $"Error: {error}" + Environment.NewLine +
+                                "This service will not be exposed through BTCPay Server");
+                        }
+                        else
+                        {
+                            ExternalServicesByCryptoCode.Add(net.CryptoCode, new ExternalRTL(connectionString));
+                        }
+                    }
+                }
+
+                var charge = conf.GetOrDefault<string>($"{net.CryptoCode}.external.charge", string.Empty);
+                if (charge.Length != 0)
+                {
+                    if (!LightningConnectionString.TryParse(charge, false, out var chargeConnectionString, out var chargeError))
+                        LightningConnectionString.TryParse("type=charge;" + charge, false, out chargeConnectionString, out chargeError);
+
+                    if (chargeConnectionString == null || chargeConnectionString.ConnectionType != LightningConnectionType.Charge)
+                    {
+                        Logs.Configuration.LogWarning($"Invalid setting {net.CryptoCode}.external.charge, " + Environment.NewLine +
+                                $"lightning charge server: 'type=charge;server=https://charge.example.com;api-token=2abdf302...'" + Environment.NewLine +
+                                $"lightning charge server: 'type=charge;server=https://charge.example.com;cookiefilepath=/root/.charge/.cookie'" + Environment.NewLine +
+                                $"Error: {chargeError ?? string.Empty}" + Environment.NewLine +
+                                $"This service will not be exposed through BTCPay Server");
+                    }
+                    else
+                    {
+                        ExternalServicesByCryptoCode.Add(net.CryptoCode, new ExternalCharge(chargeConnectionString));
+                    }
+                }
             }
 
             Logs.Configuration.LogInformation("Supported chains: " + String.Join(',', supportedChains.ToArray()));
@@ -135,25 +220,13 @@ namespace BTCPayServer.Configuration
                                                 .Select(p => (Name: p.p.Substring(0, p.SeparatorIndex), 
                                                               Link: p.p.Substring(p.SeparatorIndex + 1))))
                 {
-                    if (Uri.TryCreate(service.Link, UriKind.RelativeOrAbsolute, out var uri))
-                        OtherExternalServices.AddOrReplace(service.Name, uri);
+                    ExternalServices.AddOrReplace(service.Name, service.Link);
                 }
             }
 
             PostgresConnectionString = conf.GetOrDefault<string>("postgres", null);
             MySQLConnectionString = conf.GetOrDefault<string>("mysql", null);
             BundleJsCss = conf.GetOrDefault<bool>("bundlejscss", true);
-            AllowAdminRegistration = conf.GetOrDefault<bool>("allow-admin-registration", false);
-            TorrcFile = conf.GetOrDefault<string>("torrcfile", null);
-
-            var socksEndpointString = conf.GetOrDefault<string>("socksendpoint", null);
-            if(!string.IsNullOrEmpty(socksEndpointString))
-            {
-                if (!Utils.TryParseEndpoint(socksEndpointString, 9050, out var endpoint))
-                    throw new ConfigException("Invalid value for socksendpoint");
-                SocksEndpoint = endpoint;
-            }
-            
 
             var sshSettings = ParseSSHConfiguration(conf);
             if ((!string.IsNullOrEmpty(sshSettings.Password) || !string.IsNullOrEmpty(sshSettings.KeyFile)) && !string.IsNullOrEmpty(sshSettings.Server))
@@ -175,16 +248,12 @@ namespace BTCPayServer.Configuration
                 try
                 {
                     sshSettings.CreateConnectionInfo();
-                    SSHSettings = sshSettings;
-                }
-                catch (NotSupportedException ex)
-                {
-                    Logs.Configuration.LogWarning($"The SSH key is not supported ({ex.Message}), try to generate the key with ssh-keygen using \"-m PEM\". Skipping SSH configuration...");
                 }
                 catch
                 {
                     throw new ConfigException($"sshkeyfilepassword is invalid");
                 }
+                SSHSettings = sshSettings;
             }
 
             var fingerPrints = conf.GetOrDefault<string>("sshtrustedfingerprints", "");
@@ -194,7 +263,7 @@ namespace BTCPayServer.Configuration
                 {
                     if (!SSHFingerprint.TryParse(fingerprint, out var f))
                         throw new ConfigException($"Invalid ssh fingerprint format {fingerprint}");
-                    SSHSettings?.TrustedFingerprints.Add(f);
+                    TrustedFingerprints.Add(f);
                 }
             }
 
@@ -217,6 +286,7 @@ namespace BTCPayServer.Configuration
 
         private SSHSettings ParseSSHConfiguration(IConfiguration conf)
         {
+            var externalUrl = conf.GetOrDefault<Uri>("externalurl", null);
             var settings = new SSHSettings();
             settings.Server = conf.GetOrDefault<string>("sshconnection", null);
             if (settings.Server != null)
@@ -243,17 +313,28 @@ namespace BTCPayServer.Configuration
                     settings.Username = "root";
                 }
             }
+            else if (externalUrl != null)
+            {
+                settings.Port = 22;
+                settings.Username = "root";
+                settings.Server = externalUrl.DnsSafeHost;
+            }
             settings.Password = conf.GetOrDefault<string>("sshpassword", "");
             settings.KeyFile = conf.GetOrDefault<string>("sshkeyfile", "");
             settings.KeyFilePassword = conf.GetOrDefault<string>("sshkeyfilepassword", "");
             return settings;
         }
 
+        internal bool IsTrustedFingerprint(byte[] fingerPrint, byte[] hostKey)
+        {
+            return TrustedFingerprints.Any(f => f.Match(fingerPrint, hostKey));
+        }
+
         public string RootPath { get; set; }
         public Dictionary<string, LightningConnectionString> InternalLightningByCryptoCode { get; set; } = new Dictionary<string, LightningConnectionString>();
+        public Dictionary<string, string> ExternalServices { get; set; } = new Dictionary<string, string>();
 
-        public Dictionary<string, Uri> OtherExternalServices { get; set; } = new Dictionary<string, Uri>();
-        public ExternalServices ExternalServices { get; set; } = new ExternalServices();
+        public ExternalServices ExternalServicesByCryptoCode { get; set; } = new ExternalServices();
 
         public BTCPayNetworkProvider NetworkProvider { get; set; }
         public string PostgresConnectionString
@@ -271,12 +352,11 @@ namespace BTCPayServer.Configuration
             get;
             set;
         }
-        public bool AllowAdminRegistration { get; set; }
+        public List<SSHFingerprint> TrustedFingerprints { get; set; } = new List<SSHFingerprint>();
         public SSHSettings SSHSettings
         {
             get;
             set;
         }
-        public string TorrcFile { get; set; }
     }
 }

BTCPayServer/Configuration/ConfigurationExtensions.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Primitives;
-using NBitcoin;
 
 namespace BTCPayServer.Configuration
 {
@@ -58,17 +57,5 @@ namespace BTCPayServer.Configuration
                 throw new NotSupportedException("Configuration value does not support time " + typeof(T).Name);
             }
         }
-        
-        public static string GetDataDir(this IConfiguration configuration)
-        {
-            var networkType = DefaultConfiguration.GetNetworkType(configuration);
-            return GetDataDir(configuration, networkType);
-        }
-
-        public static string GetDataDir(this IConfiguration configuration, NetworkType networkType)
-        {
-            var defaultSettings = BTCPayDefaultSettings.GetDefaultSettings(networkType);
-            return configuration.GetOrDefault("datadir", defaultSettings.DefaultDataDirectory);
-        }
     }
 }

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -29,10 +29,10 @@ namespace BTCPayServer.Configuration
             app.Option("-n | --network", $"Set the network among (mainnet,testnet,regtest) (default: mainnet)", CommandOptionType.SingleValue);
             app.Option("--testnet | -testnet", $"Use testnet (deprecated, use --network instead)", CommandOptionType.BoolValue);
             app.Option("--regtest | -regtest", $"Use regtest (deprecated, use --network instead)", CommandOptionType.BoolValue);
-            app.Option("--allow-admin-registration", $"For debug only, will show a checkbox when a new user register to add himself as admin. (default: false)", CommandOptionType.BoolValue);
             app.Option("--chains | -c", $"Chains to support as a comma separated (default: btc; available: {chains})", CommandOptionType.SingleValue);
             app.Option("--postgres", $"Connection string to a PostgreSQL database (default: SQLite)", CommandOptionType.SingleValue);
             app.Option("--mysql", $"Connection string to a MySQL database (default: SQLite)", CommandOptionType.SingleValue);
+            app.Option("--externalurl", $"The expected external URL of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
             app.Option("--externalservices", $"Links added to external services inside Server Settings / Services under the format service1:path2;service2:path2.(default: empty)", CommandOptionType.SingleValue);
             app.Option("--bundlejscss", $"Bundle JavaScript and CSS files for better performance (default: true)", CommandOptionType.SingleValue);
             app.Option("--rootpath", "The root path in the URL to access BTCPay (default: /)", CommandOptionType.SingleValue);
@@ -41,20 +41,16 @@ namespace BTCPayServer.Configuration
             app.Option("--sshkeyfile", "SSH private key file to manage BTCPay (default: empty)", CommandOptionType.SingleValue);
             app.Option("--sshkeyfilepassword", "Password of the SSH keyfile (default: empty)", CommandOptionType.SingleValue);
             app.Option("--sshtrustedfingerprints", "SSH Host public key fingerprint or sha256 (default: empty, it will allow untrusted connections)", CommandOptionType.SingleValue);
-            app.Option("--torrcfile", "Path to torrc file containing hidden services directories (default: empty)", CommandOptionType.SingleValue);
-            app.Option("--socksendpoint", "Socks endpoint to connect to onion urls (default: empty)", CommandOptionType.SingleValue);
             app.Option("--debuglog", "A rolling log file for debug messages.", CommandOptionType.SingleValue);
             app.Option("--debugloglevel", "The severity you log (default:information)", CommandOptionType.SingleValue);
             app.Option("--disable-registration", "Disables new user registrations (default:true)", CommandOptionType.SingleValue);
-            foreach (var network in provider.GetAll().OfType<BTCPayNetwork>())
+            foreach (var network in provider.GetAll())
             {
                 var crypto = network.CryptoCode.ToLowerInvariant();
                 app.Option($"--{crypto}explorerurl", $"URL of the NBXplorer for {network.CryptoCode} (default: {network.NBXplorerNetwork.DefaultSettings.DefaultUrl})", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}explorercookiefile", $"Path to the cookie file (default: {network.NBXplorerNetwork.DefaultSettings.DefaultCookieFile})", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}lightning", $"Easy configuration of lightning for the server administrator: Must be a UNIX socket of c-lightning (lightning-rpc) or URL to a charge server (default: empty)", CommandOptionType.SingleValue);
-                app.Option($"--{crypto}externallndgrpc", $"The LND gRPC configuration BTCPay will expose to easily connect to the internal lnd wallet from an external wallet (default: empty)", CommandOptionType.SingleValue);
-                app.Option($"--{crypto}externallndrest", $"The LND REST configuration BTCPay will expose to easily connect to the internal lnd wallet from an external wallet (default: empty)", CommandOptionType.SingleValue);
-                app.Option($"--{crypto}externalrtl", $"The Ride the Lightning configuration so BTCPay will expose to easily open it in server settings (default: empty)", CommandOptionType.SingleValue);
+                app.Option($"--{crypto}externallndgrpc", $"The LND gRPC configuration BTCPay will expose to easily connect to the internal lnd wallet from Zap wallet (default: empty)", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}externalspark", $"Show spark information in Server settings / Server. The connection string to spark server (default: empty)", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}externalcharge", $"Show lightning charge information in Server settings/Server. The connection string to charge server (default: empty)", CommandOptionType.SingleValue);
             }
@@ -123,7 +119,7 @@ namespace BTCPayServer.Configuration
             builder.AppendLine("#mysql=User ID=root;Password=myPassword;Host=localhost;Port=3306;Database=myDataBase;");
             builder.AppendLine();
             builder.AppendLine("### NBXplorer settings ###");
-            foreach (var n in new BTCPayNetworkProvider(networkType).GetAll().OfType<BTCPayNetwork>())
+            foreach (var n in new BTCPayNetworkProvider(networkType).GetAll())
             {
                 builder.AppendLine($"#{n.CryptoCode}.explorer.url={n.NBXplorerNetwork.DefaultSettings.DefaultUrl}");
                 builder.AppendLine($"#{n.CryptoCode}.explorer.cookiefile={ n.NBXplorerNetwork.DefaultSettings.DefaultCookieFile}");

BTCPayServer/Configuration/External/ExternalCharge.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Lightning;
+
+namespace BTCPayServer.Configuration.External
+{
+    public class ExternalCharge : ExternalService
+    {
+        public ExternalCharge(LightningConnectionString connectionString)
+        {
+            if (connectionString == null)
+                throw new ArgumentNullException(nameof(connectionString));
+            ConnectionString = connectionString;
+        }
+        public LightningConnectionString ConnectionString { get; }
+    }
+}

BTCPayServer/Configuration/External/ExternalLnd.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Lightning;
+
+namespace BTCPayServer.Configuration.External
+{
+    public abstract class ExternalLnd : ExternalService
+    {
+        public ExternalLnd(LightningConnectionString connectionString, string type)
+        {
+            ConnectionString = connectionString;
+            Type = type;
+        }
+
+        public string Type { get; set; }
+        public LightningConnectionString ConnectionString { get; set; }
+    }
+
+    public class ExternalLndGrpc : ExternalLnd
+    {
+        public ExternalLndGrpc(LightningConnectionString connectionString) : base(connectionString, "lnd-grpc") { }
+    }
+
+    public class ExternalLndRest : ExternalLnd
+    {
+        public ExternalLndRest(LightningConnectionString connectionString) : base(connectionString, "lnd-rest") { }
+    }
+}

BTCPayServer/Configuration/External/ExternalRTL.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Configuration.External
+{
+    public class ExternalRTL : ExternalService, IAccessKeyService
+    {
+        public SparkConnectionString ConnectionString { get; }
+
+        public ExternalRTL(SparkConnectionString connectionString)
+        {
+            if (connectionString == null)
+                throw new ArgumentNullException(nameof(connectionString));
+            ConnectionString = connectionString;
+        }
+
+        public async Task<string> ExtractAccessKey()
+        {
+            if (ConnectionString?.CookeFile == null)
+                throw new FormatException("Invalid connection string");
+            return await System.IO.File.ReadAllTextAsync(ConnectionString.CookeFile);
+        }
+    }
+}

BTCPayServer/Configuration/External/ExternalService.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Lightning;
+
+namespace BTCPayServer.Configuration.External
+{
+    public class ExternalServices : MultiValueDictionary<string, ExternalService>
+    {
+        public IEnumerable<T> GetServices<T>(string cryptoCode) where T : ExternalService
+        {
+            if (!this.TryGetValue(cryptoCode.ToUpperInvariant(), out var services))
+                return Array.Empty<T>();
+            return services.OfType<T>();
+        }
+    }
+
+    public class ExternalService
+    {
+    }
+}

BTCPayServer/Configuration/External/ExternalSpark.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Configuration.External
+{
+    public interface IAccessKeyService
+    {
+        SparkConnectionString ConnectionString { get; }
+        Task<string> ExtractAccessKey();
+    }
+    public class ExternalSpark : ExternalService, IAccessKeyService
+    {
+        public SparkConnectionString ConnectionString { get; }
+
+        public ExternalSpark(SparkConnectionString connectionString)
+        {
+            if (connectionString == null)
+                throw new ArgumentNullException(nameof(connectionString));
+            ConnectionString = connectionString;
+        }
+
+        public async Task<string> ExtractAccessKey()
+        {
+            if (ConnectionString?.CookeFile == null)
+                throw new FormatException("Invalid connection string");
+            var cookie = (ConnectionString.CookeFile == "fake"
+                        ? "fake:fake:fake" // Hacks for testing
+                        : await System.IO.File.ReadAllTextAsync(ConnectionString.CookeFile)).Split(':');
+            if (cookie.Length >= 3)
+            {
+                return cookie[2];
+            }
+            throw new FormatException("Invalid cookiefile format");
+        }
+    }
+}

BTCPayServer/Configuration/ExternalConnectionString.cs

@@ -1,204 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Controllers;
-using NBitcoin;
-
-namespace BTCPayServer.Configuration
-{
-    public class ExternalConnectionString
-    {
-        public ExternalConnectionString()
-        {
-
-        }
-        public ExternalConnectionString(Uri server)
-        {
-            Server = server;
-        }
-        public Uri Server { get; set; }
-        public byte[] Macaroon { get; set; }
-        public Macaroons Macaroons { get; set; }
-        public string MacaroonFilePath { get; set; }
-        public string CertificateThumbprint { get; set; }
-        public string MacaroonDirectoryPath { get; set; }
-        public string APIToken { get; set; }
-        public string CookieFilePath { get; set; }
-        public string AccessKey { get; set; }
-
-        /// <summary>
-        /// Return a connectionString which does not depends on external resources or information like relative path or file path
-        /// </summary>
-        /// <returns></returns>
-        public async Task<ExternalConnectionString> Expand(Uri absoluteUrlBase, ExternalServiceTypes serviceType, NetworkType network)
-        {
-            var connectionString = this.Clone();
-            // Transform relative URI into absolute URI
-            var serviceUri = connectionString.Server.IsAbsoluteUri ? connectionString.Server : ToRelative(absoluteUrlBase, connectionString.Server.ToString());
-            var isSecure = network != NetworkType.Mainnet ||
-                       serviceUri.Scheme == "https" ||
-                       serviceUri.DnsSafeHost.EndsWith(".onion", StringComparison.OrdinalIgnoreCase) ||
-                       Extensions.IsLocalNetwork(serviceUri.DnsSafeHost);
-            if (!isSecure)
-            {
-                throw new System.Security.SecurityException($"Insecure transport protocol to access this service, please use HTTPS or TOR");
-            }
-            connectionString.Server = serviceUri;
-
-            if (serviceType == ExternalServiceTypes.LNDGRPC || serviceType == ExternalServiceTypes.LNDRest)
-            {
-                // Read the MacaroonDirectory
-                if (connectionString.MacaroonDirectoryPath != null)
-                {
-                    try
-                    {
-                        connectionString.Macaroons = await Macaroons.GetFromDirectoryAsync(connectionString.MacaroonDirectoryPath);
-                        connectionString.MacaroonDirectoryPath = null;
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new System.IO.DirectoryNotFoundException("Macaroon directory path not found", ex);
-                    }
-                }
-
-                // Read the MacaroonFilePath
-                if (connectionString.MacaroonFilePath != null)
-                {
-                    try
-                    {
-                        connectionString.Macaroon = await System.IO.File.ReadAllBytesAsync(connectionString.MacaroonFilePath);
-                        connectionString.MacaroonFilePath = null;
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new System.IO.FileNotFoundException("Macaroon not found", ex);
-                    }
-                }
-            }
-
-            if (serviceType == ExternalServiceTypes.Charge || serviceType == ExternalServiceTypes.RTL || serviceType == ExternalServiceTypes.Spark)
-            {
-                // Read access key from cookie file
-                if (connectionString.CookieFilePath != null)
-                {
-                    string cookieFileContent = null;
-                    bool isFake = false;
-                    try
-                    {
-                        cookieFileContent = await System.IO.File.ReadAllTextAsync(connectionString.CookieFilePath);
-                        isFake = connectionString.CookieFilePath == "fake";
-                        connectionString.CookieFilePath = null;
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new System.IO.FileNotFoundException("Cookie file path not found", ex);
-                    }
-                    if (serviceType == ExternalServiceTypes.RTL)
-                    {
-                        connectionString.AccessKey = cookieFileContent;
-                    }
-                    else if (serviceType == ExternalServiceTypes.Spark)
-                    {
-                        var cookie = (isFake ? "fake:fake:fake" // Hacks for testing
-                                    : cookieFileContent).Split(':');
-                        if (cookie.Length >= 3)
-                        {
-                            connectionString.AccessKey = cookie[2];
-                        }
-                        else
-                        {
-                            throw new FormatException("Invalid cookiefile format");
-                        }
-                    }
-                    else if (serviceType == ExternalServiceTypes.Charge)
-                    {
-                        connectionString.APIToken = isFake ? "fake" : cookieFileContent;
-                    }
-                }
-            }
-            return connectionString;
-        }
-
-        private Uri ToRelative(Uri absoluteUrlBase, string path)
-        {
-            if (path.StartsWith('/'))
-                path = path.Substring(1);
-            return new Uri($"{absoluteUrlBase.AbsoluteUri.WithTrailingSlash()}{path}", UriKind.Absolute);
-        }
-
-        public ExternalConnectionString Clone()
-        {
-            return new ExternalConnectionString()
-            {
-                MacaroonFilePath = MacaroonFilePath,
-                CertificateThumbprint = CertificateThumbprint,
-                Macaroon = Macaroon,
-                MacaroonDirectoryPath = MacaroonDirectoryPath,
-                Server = Server,
-                APIToken = APIToken,
-                CookieFilePath = CookieFilePath,
-                AccessKey = AccessKey,
-                Macaroons = Macaroons?.Clone()
-            };
-        }
-        public static bool TryParse(string str, out ExternalConnectionString result, out string error)
-        {
-            if (str == null)
-                throw new ArgumentNullException(nameof(str));
-            error = null;
-            result = null;
-            var resultTemp = new ExternalConnectionString();
-            foreach(var kv in str.Split(';')
-                        .Select(part => part.Split('='))
-                        .Where(kv => kv.Length == 2))
-            {
-                switch (kv[0].ToLowerInvariant())
-                {
-                    case "server":
-                        if (resultTemp.Server != null)
-                        {
-                            error = "Duplicated server attribute";
-                            return false;
-                        }
-                        if (!Uri.IsWellFormedUriString(kv[1], UriKind.RelativeOrAbsolute))
-                        {
-                            error = "Invalid URI";
-                            return false;
-                        }
-                        resultTemp.Server = new Uri(kv[1], UriKind.RelativeOrAbsolute);
-                        if (!resultTemp.Server.IsAbsoluteUri && (kv[1].Length == 0 || kv[1][0] != '/'))
-                            resultTemp.Server = new Uri($"/{kv[1]}", UriKind.RelativeOrAbsolute);
-                        break;
-                    case "cookiefile":
-                    case "cookiefilepath":
-                        if (resultTemp.CookieFilePath != null)
-                        {
-                            error = "Duplicated cookiefile attribute";
-                            return false;
-                        }
-                            
-                        resultTemp.CookieFilePath = kv[1];
-                        break;
-                    case "macaroondirectorypath":
-                        resultTemp.MacaroonDirectoryPath = kv[1];
-                        break;
-                    case "certthumbprint":
-                        resultTemp.CertificateThumbprint = kv[1];
-                        break;
-                    case "macaroonfilepath":
-                        resultTemp.MacaroonFilePath = kv[1];
-                        break;
-                    case "api-token":
-                        resultTemp.APIToken = kv[1];
-                        break;
-                    case "access-key":
-                        resultTemp.AccessKey = kv[1];
-                        break;
-                }
-            }
-            result = resultTemp;
-            return true;
-        }
-    }
-}

BTCPayServer/Configuration/ExternalService.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Lightning;
-using Microsoft.Extensions.Configuration;
-
-namespace BTCPayServer.Configuration
-{
-    public class ExternalServices : List<ExternalService>
-    {
-        public void Load(string cryptoCode, IConfiguration configuration)
-        {
-            Load(configuration, cryptoCode, "lndgrpc", ExternalServiceTypes.LNDGRPC, "Invalid setting {0}, " + Environment.NewLine +
-                                "lnd server: 'server=https://lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                "lnd server: 'server=https://lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                "lnd server: 'server=https://lnd.example.com;macaroondirectorypath=/root/.lnd;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                "Error: {1}",
-                                "LND (gRPC server)");
-            Load(configuration, cryptoCode, "lndrest", ExternalServiceTypes.LNDRest, "Invalid setting {0}, " + Environment.NewLine +
-                                "lnd server: 'server=https://lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                "lnd server: 'server=https://lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                "lnd server: 'server=https://lnd.example.com;macaroondirectorypath=/root/.lnd;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                "Error: {1}",
-                                "LND (REST server)");
-            Load(configuration, cryptoCode, "spark", ExternalServiceTypes.Spark, "Invalid setting {0}, " + Environment.NewLine +
-                                $"Valid example: 'server=https://btcpay.example.com/spark/btc/;cookiefile=/etc/clightning_bitcoin_spark/.cookie'" + Environment.NewLine +
-                                "Error: {1}",
-                                "C-Lightning (Spark server)");
-            Load(configuration, cryptoCode, "rtl", ExternalServiceTypes.RTL, "Invalid setting {0}, " + Environment.NewLine +
-                                $"Valid example: 'server=https://btcpay.example.com/rtl/btc/;cookiefile=/etc/clightning_bitcoin_rtl/.cookie'" + Environment.NewLine +
-                                "Error: {1}",
-                                "LND (Ride the Lightning server)");
-            Load(configuration, cryptoCode, "charge", ExternalServiceTypes.Charge, "Invalid setting {0}, " + Environment.NewLine +
-                                $"lightning charge server: 'type=charge;server=https://charge.example.com;api-token=2abdf302...'" + Environment.NewLine +
-                                $"lightning charge server: 'type=charge;server=https://charge.example.com;cookiefilepath=/root/.charge/.cookie'" + Environment.NewLine +
-                                "Error: {1}",
-                                "C-Lightning (Charge server)");
-        }
-
-        void Load(IConfiguration configuration, string cryptoCode, string serviceName, ExternalServiceTypes type, string errorMessage, string displayName)
-        {
-            var setting = $"{cryptoCode}.external.{serviceName}";
-            var connStr = configuration.GetOrDefault<string>(setting, string.Empty);
-            if (connStr.Length != 0)
-            {
-                if (!ExternalConnectionString.TryParse(connStr, out var connectionString, out var error))
-                {
-                    throw new ConfigException(string.Format(CultureInfo.InvariantCulture, errorMessage, setting, error));
-                }
-                this.Add(new ExternalService() { Type = type, ConnectionString = connectionString, CryptoCode = cryptoCode, DisplayName = displayName, ServiceName = serviceName });
-            }
-        }
-
-        public ExternalService GetService(string serviceName, string cryptoCode)
-        {
-            return this.FirstOrDefault(o => o.CryptoCode.Equals(cryptoCode, StringComparison.OrdinalIgnoreCase) &&
-                                                                                    o.ServiceName.Equals(serviceName, StringComparison.OrdinalIgnoreCase));
-        }
-    }
-
-    public class ExternalService
-    {
-        public string DisplayName { get; set; }
-        public ExternalServiceTypes Type { get; set; }
-        public ExternalConnectionString ConnectionString { get; set; }
-        public string CryptoCode { get; set; }
-        public string ServiceName { get; set; }
-    }
-
-    public enum ExternalServiceTypes
-    {
-        LNDRest,
-        LNDGRPC,
-        Spark,
-        RTL,
-        Charge,
-        P2P
-    }
-}

BTCPayServer/Configuration/SparkConnectionString.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Configuration
+{
+    public class SparkConnectionString
+    {
+        public Uri Server { get; private set; }
+        public string CookeFile { get; private set; }
+
+        public static bool TryParse(string str, out SparkConnectionString result, out string error)
+        {
+            if (str == null)
+                throw new ArgumentNullException(nameof(str));
+            error = null;
+            result = null;
+            var resultTemp = new SparkConnectionString();
+            foreach(var kv in str.Split(';')
+                        .Select(part => part.Split('='))
+                        .Where(kv => kv.Length == 2))
+            {
+                switch (kv[0].ToLowerInvariant())
+                {
+                    case "server":
+                        if (resultTemp.Server != null)
+                        {
+                            error = "Duplicated server attribute";
+                            return false;
+                        }
+                        if (!Uri.IsWellFormedUriString(kv[1], UriKind.Absolute))
+                        {
+                            error = "Invalid URI";
+                            return false;
+                        }
+                        resultTemp.Server = new Uri(kv[1], UriKind.Absolute);
+                        if(resultTemp.Server.Scheme == "http")
+                        {
+                            error = "Insecure transport protocol (http)";
+                            return false;
+                        }
+                        break;
+                    case "cookiefile":
+                    case "cookiefilepath":
+                        if (resultTemp.CookeFile != null)
+                        {
+                            error = "Duplicated cookiefile attribute";
+                            return false;
+                        }
+                            
+                        resultTemp.CookeFile = kv[1];
+                        break;
+                    default:
+                        return false;
+                }
+            }
+            result = resultTemp;
+            return true;
+        }
+    }
+}

BTCPayServer/Controllers/AccessTokenController.cs

@@ -35,19 +35,20 @@ namespace BTCPayServer.Controllers
         [AllowAnonymous]
         public async Task<DataWrapper<List<PairingCodeResponse>>> Tokens([FromBody] TokenRequest request)
         {
-            if (request == null)
-                throw new BitpayHttpException(400, "The request body is missing");
             PairingCodeEntity pairingEntity = null;
             if (string.IsNullOrEmpty(request.PairingCode))
             {
                 if (string.IsNullOrEmpty(request.Id) || !NBitpayClient.Extensions.BitIdExtensions.ValidateSIN(request.Id))
                     throw new BitpayHttpException(400, "'id' property is required");
+                if (string.IsNullOrEmpty(request.Facade))
+                    throw new BitpayHttpException(400, "'facade' property is required");
 
                 var pairingCode = await _TokenRepository.CreatePairingCodeAsync();
                 await _TokenRepository.PairWithSINAsync(pairingCode, request.Id);
                 pairingEntity = await _TokenRepository.UpdatePairingCode(new PairingCodeEntity()
                 {
                     Id = pairingCode,
+                    Facade = request.Facade,
                     Label = request.Label
                 });
 
@@ -83,7 +84,7 @@ namespace BTCPayServer.Controllers
                         PairingCode = pairingEntity.Id,
                         PairingExpiration = pairingEntity.Expiration,
                         DateCreated = pairingEntity.CreatedTime,
-                        Facade = "merchant",
+                        Facade = pairingEntity.Facade,
                         Token = pairingEntity.TokenValue,
                         Label = pairingEntity.Label
                     }

BTCPayServer/Controllers/AccountController.cs

@@ -18,11 +18,7 @@ using BTCPayServer.Services.Stores;
 using BTCPayServer.Logging;
 using BTCPayServer.Security;
 using System.Globalization;
-using BTCPayServer.Services.U2F;
-using BTCPayServer.Services.U2F.Models;
-using Newtonsoft.Json;
 using NicolasDorier.RateLimits;
-using BTCPayServer.Data;
 
 namespace BTCPayServer.Controllers
 {
@@ -37,8 +33,6 @@ namespace BTCPayServer.Controllers
         RoleManager<IdentityRole> _RoleManager;
         SettingsRepository _SettingsRepository;
         Configuration.BTCPayServerOptions _Options;
-        private readonly BTCPayServerEnvironment _btcPayServerEnvironment;
-        private readonly U2FService _u2FService;
         ILogger _logger;
 
         public AccountController(
@@ -48,9 +42,7 @@ namespace BTCPayServer.Controllers
             SignInManager<ApplicationUser> signInManager,
             EmailSenderFactory emailSenderFactory,
             SettingsRepository settingsRepository,
-            Configuration.BTCPayServerOptions options,
-            BTCPayServerEnvironment btcPayServerEnvironment,
-            U2FService u2FService)
+            Configuration.BTCPayServerOptions options)
         {
             this.storeRepository = storeRepository;
             _userManager = userManager;
@@ -59,8 +51,6 @@ namespace BTCPayServer.Controllers
             _RoleManager = roleManager;
             _SettingsRepository = settingsRepository;
             _Options = options;
-            _btcPayServerEnvironment = btcPayServerEnvironment;
-            _u2FService = u2FService;
             _logger = Logs.PayServer;
         }
 
@@ -74,8 +64,6 @@ namespace BTCPayServer.Controllers
         [AllowAnonymous]
         public async Task<IActionResult> Login(string returnUrl = null)
         {
-            if (User.Identity.IsAuthenticated && string.IsNullOrEmpty(returnUrl))
-                return RedirectToLocal();
             // Clear the existing external cookie to ensure a clean login process
             await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
 
@@ -103,44 +91,8 @@ namespace BTCPayServer.Controllers
                         return View(model);
                     }
                 }
-                else
-                {
-                    ModelState.AddModelError(string.Empty, "Invalid login attempt.");
-                    return View(model);
-                }
-
-                if (!await _userManager.IsLockedOutAsync(user) && await _u2FService.HasDevices(user.Id))
-                {
-                    if (await _userManager.CheckPasswordAsync(user, model.Password))
-                    {
-                        LoginWith2faViewModel twoFModel = null;
-                        
-                        if (user.TwoFactorEnabled)
-                        {
-                            // we need to do an actual sign in attempt so that 2fa can function in next step
-                            await _signInManager.PasswordSignInAsync(model.Email, model.Password, model.RememberMe, lockoutOnFailure: true);
-                            twoFModel = new LoginWith2faViewModel
-                            {
-                                RememberMe = model.RememberMe
-                            };
-                        }
-
-                        return View("SecondaryLogin", new SecondaryLoginViewModel()
-                        {
-                            LoginWith2FaViewModel = twoFModel,
-                            LoginWithU2FViewModel = await BuildU2FViewModel(model.RememberMe, user)
-                        });
-                    }
-                    else
-                    {
-                      var incrementAccessFailedResult = await  _userManager.AccessFailedAsync(user);
-                      ModelState.AddModelError(string.Empty, "Invalid login attempt.");
-                      return View(model);
-                      
-                    }
-                }
-                
-               
+                // This doesn't count login failures towards account lockout
+                // To enable password failures to trigger account lockout, set lockoutOnFailure: true
                 var result = await _signInManager.PasswordSignInAsync(model.Email, model.Password, model.RememberMe, lockoutOnFailure: true);
                 if (result.Succeeded)
                 {
@@ -149,12 +101,10 @@ namespace BTCPayServer.Controllers
                 }
                 if (result.RequiresTwoFactor)
                 {
-                    return View("SecondaryLogin", new SecondaryLoginViewModel()
+                    return RedirectToAction(nameof(LoginWith2fa), new
                     {
-                        LoginWith2FaViewModel = new LoginWith2faViewModel()
-                        {
-                            RememberMe = model.RememberMe
-                        }
+                        returnUrl,
+                        model.RememberMe
                     });
                 }
                 if (result.IsLockedOut)
@@ -173,71 +123,6 @@ namespace BTCPayServer.Controllers
             return View(model);
         }
 
-        private async Task<LoginWithU2FViewModel> BuildU2FViewModel(bool rememberMe, ApplicationUser user)
-        {
-            if (_btcPayServerEnvironment.IsSecure)
-            {
-                var u2fChallenge = await _u2FService.GenerateDeviceChallenges(user.Id,
-                    Request.GetAbsoluteUriNoPathBase().ToString().TrimEnd('/'));
-
-                return new LoginWithU2FViewModel()
-                {
-                    Version = u2fChallenge[0].version,
-                    Challenge = u2fChallenge[0].challenge,
-                    Challenges = u2fChallenge,
-                    AppId = u2fChallenge[0].appId,
-                    UserId = user.Id,
-                    RememberMe = rememberMe
-                };
-            }
-
-            return null;
-        }
-
-        [HttpPost]
-        [AllowAnonymous]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> LoginWithU2F(LoginWithU2FViewModel viewModel, string returnUrl = null)
-        {
-            ViewData["ReturnUrl"] = returnUrl;
-            var user = await _userManager.FindByIdAsync(viewModel.UserId);
-
-            if (user == null)
-            {
-                return NotFound();
-            }
-
-            var errorMessage = string.Empty;
-            try
-            {
-                if (await _u2FService.AuthenticateUser(viewModel.UserId, viewModel.DeviceResponse))
-                {
-                    await _signInManager.SignInAsync(user, viewModel.RememberMe, "U2F");
-                    _logger.LogInformation("User logged in.");
-                    return RedirectToLocal(returnUrl);
-                }
-
-                errorMessage = "Invalid login attempt.";
-            }
-            catch (Exception e)
-            {
-
-                errorMessage = e.Message;
-            }
-
-            ModelState.AddModelError(string.Empty, errorMessage);
-            return View("SecondaryLogin", new SecondaryLoginViewModel()
-            {
-                LoginWithU2FViewModel = viewModel,
-                LoginWith2FaViewModel = !user.TwoFactorEnabled
-                    ? null
-                    : new LoginWith2faViewModel()
-                    {
-                        RememberMe = viewModel.RememberMe
-                    }
-            });
-        }
-
         [HttpGet]
         [AllowAnonymous]
         public async Task<IActionResult> LoginWith2fa(bool rememberMe, string returnUrl = null)
@@ -250,13 +135,10 @@ namespace BTCPayServer.Controllers
                 throw new ApplicationException($"Unable to load two-factor authentication user.");
             }
 
+            var model = new LoginWith2faViewModel { RememberMe = rememberMe };
             ViewData["ReturnUrl"] = returnUrl;
 
-            return View("SecondaryLogin", new SecondaryLoginViewModel()
-            {
-                LoginWith2FaViewModel = new LoginWith2faViewModel { RememberMe = rememberMe },
-                LoginWithU2FViewModel =  (await _u2FService.HasDevices(user.Id))? await BuildU2FViewModel(rememberMe, user): null
-            });
+            return View(model);
         }
 
         [HttpPost]
@@ -293,11 +175,7 @@ namespace BTCPayServer.Controllers
             {
                 _logger.LogWarning("Invalid authenticator code entered for user with ID {UserId}.", user.Id);
                 ModelState.AddModelError(string.Empty, "Invalid authenticator code.");
-                return View("SecondaryLogin", new SecondaryLoginViewModel()
-                {
-                    LoginWith2FaViewModel = model,
-                    LoginWithU2FViewModel =  (await _u2FService.HasDevices(user.Id))? await BuildU2FViewModel(rememberMe, user): null
-                });
+                return View();
             }
         }
 
@@ -371,7 +249,6 @@ namespace BTCPayServer.Controllers
                 return RedirectToAction(nameof(HomeController.Index), "Home");
             ViewData["ReturnUrl"] = returnUrl;
             ViewData["Logon"] = logon.ToString(CultureInfo.InvariantCulture).ToLowerInvariant();
-            ViewData["AllowIsAdmin"] = _Options.AllowAdminRegistration;
             return View();
         }
 
@@ -382,7 +259,6 @@ namespace BTCPayServer.Controllers
         {
             ViewData["ReturnUrl"] = returnUrl;
             ViewData["Logon"] = logon.ToString(CultureInfo.InvariantCulture).ToLowerInvariant();
-            ViewData["AllowIsAdmin"] = _Options.AllowAdminRegistration;
             var policies = await _SettingsRepository.GetSettingAsync<PoliciesSettings>() ?? new PoliciesSettings();
             if (policies.LockSubscription && !User.IsInRole(Roles.ServerAdmin))
                 return RedirectToAction(nameof(HomeController.Index), "Home");
@@ -394,7 +270,7 @@ namespace BTCPayServer.Controllers
                 {
                     var admin = await _userManager.GetUsersInRoleAsync(Roles.ServerAdmin);
                     Logs.PayServer.LogInformation($"A new user just registered {user.Email} {(admin.Count == 0 ? "(admin)" : "")}");
-                    if (admin.Count == 0 || (model.IsAdmin && _Options.AllowAdminRegistration))
+                    if (admin.Count == 0)
                     {
                         await _RoleManager.CreateAsync(new IdentityRole(Roles.ServerAdmin));
                         await _userManager.AddToRoleAsync(user, Roles.ServerAdmin);
@@ -648,9 +524,9 @@ namespace BTCPayServer.Controllers
             }
         }
 
-        private IActionResult RedirectToLocal(string returnUrl = null)
+        private IActionResult RedirectToLocal(string returnUrl)
         {
-            if (!string.IsNullOrEmpty(returnUrl) && Url.IsLocalUrl(returnUrl))
+            if (Url.IsLocalUrl(returnUrl))
             {
                 return Redirect(returnUrl);
             }

BTCPayServer/Controllers/AppsController.Crowdfund.cs

@@ -1,11 +1,9 @@
 using System;
-using System.Linq;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Services.Apps;
-using BTCPayServer.Services.Mails;
 using Microsoft.AspNetCore.Mvc;
 
 namespace BTCPayServer.Controllers
@@ -34,9 +32,7 @@ namespace BTCPayServer.Controllers
             var settings = app.GetSettings<CrowdfundSettings>();
             var vm = new UpdateCrowdfundViewModel()
             {
-                NotificationEmailWarning = !await IsEmailConfigured(app.StoreDataId),
                 Title = settings.Title,
-                StoreId = app.StoreDataId,
                 Enabled = settings.Enabled,
                 EnforceTargetAmount = settings.EnforceTargetAmount,
                 StartDate = settings.StartDate,
@@ -60,9 +56,7 @@ namespace BTCPayServer.Controllers
                 AppId = appId,
                 SearchTerm = app.TagAllInvoices ? $"storeid:{app.StoreDataId}" : $"orderid:{AppService.GetCrowdfundOrderId(appId)}",
                 DisplayPerksRanking = settings.DisplayPerksRanking,
-                SortPerksByPopularity = settings.SortPerksByPopularity,
-                Sounds                = string.Join(Environment.NewLine, settings.Sounds),
-                AnimationColors                = string.Join(Environment.NewLine, settings.AnimationColors)
+                SortPerksByPopularity = settings.SortPerksByPopularity
             };
             return View(vm);
         }
@@ -96,24 +90,6 @@ namespace BTCPayServer.Controllers
             {
                 ModelState.AddModelError(nameof(vm.DisplayPerksRanking), "You must sort by popularity in order to display ranking.");
             }
-
-            var parsedSounds = vm.Sounds.Split(
-                new[] {"\r\n", "\r", "\n"},
-                StringSplitOptions.None
-            ).Select(s => s.Trim()).ToArray();
-            if (vm.SoundsEnabled && !parsedSounds.Any())
-            {
-                ModelState.AddModelError(nameof(vm.Sounds), "You must have at least one sound if you enable sounds");
-            }
-            
-            var parsedAnimationColors = vm.AnimationColors.Split(
-                new[] { "\r\n", "\r", "\n" },
-                StringSplitOptions.None
-            ).Select(s => s.Trim()).ToArray();
-            if (vm.AnimationsEnabled && !parsedAnimationColors.Any())
-            {
-                ModelState.AddModelError(nameof(vm.AnimationColors), "You must have at least one animation color if you enable animations");
-            }
             
             if (!ModelState.IsValid)
             {
@@ -130,16 +106,15 @@ namespace BTCPayServer.Controllers
                 Title = vm.Title,
                 Enabled = vm.Enabled,
                 EnforceTargetAmount = vm.EnforceTargetAmount,
-                StartDate = vm.StartDate?.ToUniversalTime(),
+                StartDate = vm.StartDate,
                 TargetCurrency = vm.TargetCurrency,
-                Description = vm.Description,
-                EndDate = vm.EndDate?.ToUniversalTime(),
+                Description = _htmlSanitizer.Sanitize( vm.Description),
+                EndDate = vm.EndDate,
                 TargetAmount = vm.TargetAmount,
                 CustomCSSLink = vm.CustomCSSLink,
                 MainImageUrl = vm.MainImageUrl,
                 EmbeddedCSS = vm.EmbeddedCSS,
                 NotificationUrl = vm.NotificationUrl,
-                NotificationEmail = vm.NotificationEmail,
                 Tagline = vm.Tagline,
                 PerksTemplate = vm.PerksTemplate,
                 DisqusEnabled = vm.DisqusEnabled,
@@ -149,14 +124,12 @@ namespace BTCPayServer.Controllers
                 ResetEveryAmount = vm.ResetEveryAmount,
                 ResetEvery = Enum.Parse<CrowdfundResetEvery>(vm.ResetEvery),
                 DisplayPerksRanking = vm.DisplayPerksRanking,
-                SortPerksByPopularity = vm.SortPerksByPopularity,
-                Sounds = parsedSounds,
-                AnimationColors = parsedAnimationColors
+                SortPerksByPopularity = vm.SortPerksByPopularity
             };
 
             app.TagAllInvoices = vm.UseAllStoreInvoices;
             app.SetSettings(newSettings);
-            await _AppService.UpdateOrCreateApp(app);
+            await UpdateAppSettings(app);
 
             _EventAggregator.Publish(new AppUpdated()
             {

BTCPayServer/Controllers/AppsController.PointOfSale.cs

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Services.Apps;
-using BTCPayServer.Services.Mails;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
@@ -53,7 +52,6 @@ namespace BTCPayServer.Controllers
                     "  title: Fruit Tea\n" +
                     "  description: The Tibetan Himalayas, the land is majestic and beautiful—a spiritual place where, despite the perilous environment, many journey seeking enlightenment. Pay us what you want!\n" +
                     "  image: https://cdn.pixabay.com/photo/2016/09/16/11/24/darts-1673812__480.jpg\n" +
-                    "  inventory: 5\n" +
                     "  custom: true";
                 EnableShoppingCart = false;
                 ShowCustomAmount = true;
@@ -79,13 +77,6 @@ namespace BTCPayServer.Controllers
 
 
             public string CustomCSSLink { get; set; }
-            
-            public string EmbeddedCSS { get; set; }
-            
-            public string Description { get; set; }
-            public string NotificationEmail { get; set; }
-            public string NotificationUrl { get; set; }
-            public bool? RedirectAutomatically { get; set; }
         }
 
         [HttpGet]
@@ -96,12 +87,9 @@ namespace BTCPayServer.Controllers
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<PointOfSaleSettings>();
-          
             var vm = new UpdatePointOfSaleViewModel()
             {
-                NotificationEmailWarning = !await IsEmailConfigured(app.StoreDataId),
                 Id = appId,
-                StoreId = app.StoreDataId,
                 Title = settings.Title,
                 EnableShoppingCart = settings.EnableShoppingCart,
                 ShowCustomAmount = settings.ShowCustomAmount,
@@ -113,13 +101,7 @@ namespace BTCPayServer.Controllers
                 CustomButtonText = settings.CustomButtonText ?? PointOfSaleSettings.CUSTOM_BUTTON_TEXT_DEF,
                 CustomTipText = settings.CustomTipText ?? PointOfSaleSettings.CUSTOM_TIP_TEXT_DEF,
                 CustomTipPercentages = settings.CustomTipPercentages != null ? string.Join(",", settings.CustomTipPercentages) : string.Join(",", PointOfSaleSettings.CUSTOM_TIP_PERCENTAGES_DEF),
-                CustomCSSLink = settings.CustomCSSLink,
-                EmbeddedCSS = settings.EmbeddedCSS,
-                Description = settings.Description,
-                NotificationEmail = settings.NotificationEmail,
-                NotificationUrl = settings.NotificationUrl,
-                SearchTerm = $"storeid:{app.StoreDataId}",
-                RedirectAutomatically = settings.RedirectAutomatically.HasValue? settings.RedirectAutomatically.Value? "true": "false" : "" 
+                CustomCSSLink = settings.CustomCSSLink
             };
             if (HttpContext?.Request != null)
             {
@@ -192,19 +174,24 @@ namespace BTCPayServer.Controllers
                 CustomButtonText = vm.CustomButtonText,
                 CustomTipText = vm.CustomTipText,
                 CustomTipPercentages = ListSplit(vm.CustomTipPercentages),
-                CustomCSSLink = vm.CustomCSSLink,
-                NotificationUrl = vm.NotificationUrl,
-                NotificationEmail = vm.NotificationEmail,
-                Description = vm.Description,
-                EmbeddedCSS = vm.EmbeddedCSS,
-                RedirectAutomatically = string.IsNullOrEmpty(vm.RedirectAutomatically)? (bool?) null: bool.Parse(vm.RedirectAutomatically)
-                
+                CustomCSSLink = vm.CustomCSSLink
             });
-            await _AppService.UpdateOrCreateApp(app);
+            await UpdateAppSettings(app);
             StatusMessage = "App updated";
-            return RedirectToAction(nameof(UpdatePointOfSale), new { appId });
+            return RedirectToAction(nameof(ListApps));
         }
 
+        private async Task UpdateAppSettings(AppData app)
+        {
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                ctx.Apps.Add(app);
+                ctx.Entry<AppData>(app).State = EntityState.Modified;
+                ctx.Entry<AppData>(app).Property(a => a.Settings).IsModified = true;
+                ctx.Entry<AppData>(app).Property(a => a.TagAllInvoices).IsModified = true;
+                await ctx.SaveChangesAsync();
+            }
+        }
 
         private int[] ListSplit(string list, string separator = ",")
         {

BTCPayServer/Controllers/AppsController.cs

@@ -7,7 +7,6 @@ using BTCPayServer.Models;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Security;
 using BTCPayServer.Services.Apps;
-using BTCPayServer.Services.Mails;
 using BTCPayServer.Services.Rates;
 using Ganss.XSS;
 using Microsoft.AspNetCore.Authorization;
@@ -30,7 +29,7 @@ namespace BTCPayServer.Controllers
             EventAggregator eventAggregator,
             BTCPayNetworkProvider networkProvider,
             CurrencyNameTable currencies,
-            EmailSenderFactory emailSenderFactory,
+            HtmlSanitizer htmlSanitizer,
             AppService AppService)
         {
             _UserManager = userManager;
@@ -38,7 +37,7 @@ namespace BTCPayServer.Controllers
             _EventAggregator = eventAggregator;
             _NetworkProvider = networkProvider;
             _currencies = currencies;
-            _emailSenderFactory = emailSenderFactory;
+            _htmlSanitizer = htmlSanitizer;
             _AppService = AppService;
         }
 
@@ -47,7 +46,7 @@ namespace BTCPayServer.Controllers
         private readonly EventAggregator _EventAggregator;
         private BTCPayNetworkProvider _NetworkProvider;
         private readonly CurrencyNameTable _currencies;
-        private readonly EmailSenderFactory _emailSenderFactory;
+        private readonly HtmlSanitizer _htmlSanitizer;
         private AppService _AppService;
 
         [TempData]
@@ -85,7 +84,7 @@ namespace BTCPayServer.Controllers
                 StatusMessage = new StatusMessageModel()
                 {
                     Html =
-                        $"Error: You need to create at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
+                        $"Error: You must have created at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
                     Severity = StatusMessageModel.StatusSeverity.Error
                 }.ToString();
                 return RedirectToAction(nameof(ListApps));
@@ -105,7 +104,7 @@ namespace BTCPayServer.Controllers
                 StatusMessage = new StatusMessageModel()
                 {
                     Html =
-                        $"Error: You need to create at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
+                        $"Error: You must have created at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
                     Severity = StatusMessageModel.StatusSeverity.Error
                 }.ToString();
                 return RedirectToAction(nameof(ListApps));
@@ -127,25 +126,29 @@ namespace BTCPayServer.Controllers
                 StatusMessage = "Error: You are not owner of this store";
                 return RedirectToAction(nameof(ListApps));
             }
-            var appData = new AppData
+            var id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(20));
+            using (var ctx = _ContextFactory.CreateContext())
             {
-                StoreDataId = selectedStore, 
-                Name = vm.Name, 
-                AppType = appType.ToString()
-            };
-            await _AppService.UpdateOrCreateApp(appData);
+                var appData = new AppData() { Id = id };
+                appData.StoreDataId = selectedStore;
+                appData.Name = vm.Name;
+                appData.AppType = appType.ToString();
+                ctx.Apps.Add(appData);
+                await ctx.SaveChangesAsync();
+            }
             StatusMessage = "App successfully created";
-            CreatedAppId = appData.Id;
+            CreatedAppId = id;
 
             switch (appType)
             {
                 case AppType.PointOfSale:
-                    return RedirectToAction(nameof(UpdatePointOfSale), new { appId = appData.Id });
+                    return RedirectToAction(nameof(UpdatePointOfSale), new { appId = id });
                 case AppType.Crowdfund:
-                    return RedirectToAction(nameof(UpdateCrowdfund), new { appId = appData.Id });
+                    return RedirectToAction(nameof(UpdateCrowdfund), new { appId = id });
                 default:
                     return RedirectToAction(nameof(ListApps));
             }
+                
         }
 
         [HttpGet]
@@ -173,10 +176,5 @@ namespace BTCPayServer.Controllers
         {
             return _UserManager.GetUserId(User);
         }
-
-        private async Task<bool> IsEmailConfigured(string storeId)
-        {
-            return (await (_emailSenderFactory.GetEmailSender(storeId) as EmailSender)?.GetEmailSettings())?.IsComplete() is true;
-        }
     }
 }