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,8 +0,0 @@
-#!/bin/sh
-set -e
-
-cd ../BTCPayServer.Tests
-docker-compose -v
-docker-compose down --v
-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="../Version.csproj" Condition="Exists('../Version.csproj')" />
-  <Import Project="../Common.csproj" />
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
-    <PackageReference Include="NBitcoin" Version="4.1.2.35" />
-    <PackageReference Include="NBXplorer.Client" Version="2.0.0.17" />
-  </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.Rating/BTCPayServer.Rating.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../Version.csproj" Condition="Exists('../Version.csproj')" />
-  <Import Project="../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" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.34" />
-  </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/ByllsRateProvider.cs

@@ -1,29 +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 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.Tests/BTCPayServer.Tests.csproj

@@ -10,9 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="74.0.3729.6" />
+    <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

@@ -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,18 +101,15 @@ 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 (TestDatabase == TestDatabases.MySQL && !String.IsNullOrEmpty(MySQL))
@@ -127,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)
@@ -149,17 +139,13 @@ namespace BTCPayServer.Tests
                     .UseStartup<Startup>()
                     .Build();
             _Host.Start();
-
-            var urls = _Host.ServerFeatures.Get<IServerAddressesFeature>().Addresses;
-            foreach (var url in urls)
-            {
-                Logs.Tester.LogInformation("Listening on " + url);
-            }
-            Logs.Tester.LogInformation("Server URI " + ServerUri);
-
             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)
             {
@@ -220,45 +206,8 @@ namespace BTCPayServer.Tests
                 });
                 rateProvider.Providers.Add("bittrex", bittrex);
             }
-
-            
-
-            WaitSiteIsOperational().GetAwaiter().GetResult();
         }
 
-        private async Task WaitSiteIsOperational()
-        {
-            var synching = WaitIsFullySynched();
-            var accessingHomepage = WaitCanAccessHomepage();
-            await Task.WhenAll(synching, accessingHomepage).ConfigureAwait(false);
-        }
-
-        private async Task WaitCanAccessHomepage()
-        {
-            var resp = await HttpClient.GetAsync("/").ConfigureAwait(false);
-            while (resp.StatusCode != HttpStatusCode.OK)
-            {
-                await Task.Delay(10).ConfigureAwait(false);
-            }
-        }
-
-        private async Task WaitIsFullySynched()
-        {
-            var dashBoard = GetService<NBXplorerDashboard>();
-            while (!dashBoard.IsFullySynched())
-            {
-                await Task.Delay(10).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;
@@ -266,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; }
 
@@ -275,8 +223,6 @@ namespace BTCPayServer.Tests
             return _Host.Services.GetRequiredService<T>();
         }
 
-        public IServiceProvider ServiceProvider => _Host.Services; 
-
         public T GetController<T>(string userId = null, string storeId = null, Claim[] additionalClaims = null) where T : Controller
         {
             var context = new DefaultHttpContext();
@@ -286,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/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 Common.csproj 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,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-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);
-            ((IJavaScriptExecutor)driver).ExecuteScript($"window.scrollBy({element.Location.X},{element.Location.Y});");
-        }
-        /// <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);
-        }
-    }
-}

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

@@ -1,143 +0,0 @@
-using System;
-using BTCPayServer;
-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Text;
-using NBitcoin;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Chrome;
-using Xunit;
-using System.IO;
-using BTCPayServer.Tests.Logging;
-using System.Threading;
-
-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();
-            options.AddArguments("headless"); // Comment to view browser
-            options.AddArguments("window-size=1200x600"); // 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);
-            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 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;
-        }
-
-        public void AddDerivationScheme(string derivationScheme = "xpub661MyMwAqRbcGABgHMUXDzPzH1tU7eZaAaJQXhDXsSxsqyQzQeU6kznNfSuAyqAK9UaWSaZaMFdNiY5BCF4zBPAzSnwfUAwUhwttuAKwfRX-[legacy]")
-        {
-            Driver.FindElement(By.Id("ModifyBTC")).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 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 CreateInvoice(string random)
-        {
-            Driver.FindElement(By.Id("Invoices")).Click();
-            Driver.FindElement(By.Id("CreateNewInvoice")).Click();
-            Driver.FindElement(By.CssSelector("input#Amount.form-control")).SendKeys("100");
-            Driver.FindElement(By.Name("StoreId")).SendKeys("Deriv" + random + Keys.Enter);
-            Driver.FindElement(By.Id("Create")).Click();
-            return;
-        }
-
-
-        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);
-        }
-
-        internal void GoToHome()
-        {
-            Driver.Navigate().GoToUrl(Server.PayTester.ServerUri);
-        }
-
-        internal void Logout()
-        {
-            Driver.FindElement(By.Id("Logout")).Click();
-        }
-    }
-}

BTCPayServer.Tests/SeleniumTests.cs

@@ -1,323 +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;
-
-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();
-            }
-        }
-
-        private 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 void CanCreateStores()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                var alice = s.RegisterNewUser();
-                var store = s.CreateNewStore();
-                s.AddDerivationScheme();
-                s.Driver.AssertNoError();
-                Assert.Contains(store, s.Driver.PageSource);
-                var storeUrl = s.Driver.Url;
-                s.ClickOnAllSideMenus();
-
-                CreateInvoice(s, 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 CanCreateInvoice()
-        {
-            using (var s = SeleniumTester.Create())
-            {
-                s.Start();
-                s.RegisterNewUser();
-                var store = s.CreateNewStore();
-                s.AddDerivationScheme();
-
-                CreateInvoice(s, 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();
-            }
-        }
-
-        private static void CreateInvoice(SeleniumTester s, string store)
-        {
-            s.Driver.FindElement(By.Id("Invoices")).Click();
-            s.Driver.FindElement(By.Id("CreateNewInvoice")).Click();
-            s.Driver.FindElement(By.CssSelector("input#Amount.form-control")).SendKeys("100");
-            s.Driver.FindElement(By.Name("StoreId")).SendKeys(store + Keys.Enter);
-            s.Driver.FindElement(By.Id("Create")).Click();
-            Assert.True(s.Driver.PageSource.Contains("just created!"), "Unable to create Invoice");
-        }
-
-        [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" + store);
-                s.Driver.FindElement(By.CssSelector("select#SelectedAppType.form-control")).SendKeys("PointOfSale" + Keys.Enter);
-                s.Driver.FindElement(By.CssSelector("select#SelectedStore.form-control")).SendKeys(store + Keys.Enter);
-                s.Driver.FindElement(By.Id("Create")).Click();
-                s.Driver.FindElement(By.CssSelector("input#EnableShoppingCart.form-check")).Click();
-                s.Driver.FindElement(By.Id("SaveSettings")).ForceClick();
-                Assert.True(s.Driver.PageSource.Contains("App updated"), "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" + store);
-                s.Driver.FindElement(By.CssSelector("select#SelectedAppType.form-control")).SendKeys("Crowdfund" + Keys.Enter);
-                s.Driver.FindElement(By.CssSelector("select#SelectedStore.form-control")).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")).Submit();
-                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")).Submit();
-                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("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);
 
@@ -87,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

@@ -95,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]"));
@@ -113,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;

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)
-        {
-            CancellationTokenSource cts = new CancellationTokenSource(20000);
-            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/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

@@ -19,8 +19,6 @@ services:
       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"
@@ -38,7 +36,7 @@ services:
 
   # The dev container is not actually used, it is just handy to run `docker-compose up dev` to start all services
   dev: 
-    image: btcpayserver/bitcoin:0.18.0
+    image: btcpayserver/bitcoin:0.17.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
@@ -55,7 +53,7 @@ services:
       - merchant_lnd
 
   devlnd: 
-    image: btcpayserver/bitcoin:0.18.0
+    image: btcpayserver/bitcoin:0.17.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
@@ -71,7 +69,7 @@ services:
 
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.0.0.48
+    image: nicolasdorier/nbxplorer:2.0.0.8
     restart: unless-stopped
     ports:
       - "32838:32838"
@@ -98,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
@@ -122,7 +119,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v0.7.0-1-dev
+    image: btcpayserver/lightning:v0.6.2-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment: 
@@ -134,7 +131,6 @@ services:
         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:
@@ -169,7 +165,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v0.7.0-1-dev
+    image: btcpayserver/lightning:v0.6.2-dev
     stop_signal: SIGKILL
     environment: 
       EXPOSE_TCP: "true"
@@ -178,7 +174,6 @@ services:
         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
@@ -227,7 +222,7 @@ services:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.6-beta
+    image: btcpayserver/lnd:v0.5.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -242,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
@@ -258,7 +252,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.6-beta
+    image: btcpayserver/lnd:v0.5.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -273,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

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/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/Models/BTCPayOpenIdAuthorization.cs

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

BTCPayServer/Authentication/OpenId/Models/BTCPayOpenIdClient.cs

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

BTCPayServer/Authentication/OpenId/Models/BTCPayOpenIdToken.cs

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

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;
@@ -26,7 +29,7 @@ namespace BTCPayServer
         {
             NetworkType = filtered.NetworkType;
             _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(filtered.NetworkType);
-            _Networks = new Dictionary<string, BTCPayNetworkBase>();
+            _Networks = new Dictionary<string, BTCPayNetwork>();
             cryptoCodes = cryptoCodes.Select(c => c.ToUpperInvariant()).ToArray();
             foreach (var network in filtered._Networks)
             {
@@ -53,22 +56,6 @@ namespace BTCPayServer
             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();
             //InitBitcoinplus();
@@ -86,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();
         }
@@ -103,14 +96,14 @@ namespace BTCPayServer
             return _Networks.ContainsKey(cryptoCode.ToUpperInvariant());
         }
 
-        public T GetNetwork<T>(string cryptoCode) where T: BTCPayNetworkBase
+        public BTCPayNetwork GetNetwork(string 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="../Version.csproj" Condition="Exists('../Version.csproj')" />
-  <Import Project="../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,37 +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.0.19" />
-    <PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
-    <PackageReference Include="BundlerMinifier.Core" Version="2.9.406" />
-    <PackageReference Include="BundlerMinifier.TagHelpers" Version="2.9.406" />
-    <PackageReference Include="HtmlSanitizer" Version="4.0.207" />
+    <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.3" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.18" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
-    <PackageReference Include="OpenIddict" Version="2.0.0" />
-    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="2.0.0" />
     <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>
@@ -64,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>
 
@@ -126,16 +123,9 @@
 
 	<ItemGroup>
 	  <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.Rating\BTCPayServer.Rating.csproj" />
-	  <ProjectReference Include="..\BTCPayServer.Common\BTCPayServer.Common.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -152,9 +142,6 @@
     <Content Update="Views\Server\LightningWalletServices.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
-    <Content Update="Views\Server\P2PService.cshtml">
-      <Pack>$(IncludeRazorContentInPack)</Pack>
-    </Content>
     <Content Update="Views\Server\SSHService.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
@@ -182,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))
@@ -213,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)
@@ -239,6 +313,12 @@ 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", "");
@@ -252,9 +332,9 @@ namespace BTCPayServer.Configuration
 
         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
@@ -272,13 +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,12 +41,10 @@ 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);
@@ -121,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,200 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Controllers;
-
-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)
-        {
-            var connectionString = this.Clone();
-            // Transform relative URI into absolute URI
-            var serviceUri = connectionString.Server.IsAbsoluteUri ? connectionString.Server : ToRelative(absoluteUrlBase, connectionString.Server.ToString());
-            if (!serviceUri.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase) &&
-               !serviceUri.DnsSafeHost.EndsWith(".onion", StringComparison.OrdinalIgnoreCase))
-            {
-                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,9 +18,6 @@ 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;
 
 namespace BTCPayServer.Controllers
@@ -36,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(
@@ -47,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;
@@ -58,8 +51,6 @@ namespace BTCPayServer.Controllers
             _RoleManager = roleManager;
             _SettingsRepository = settingsRepository;
             _Options = options;
-            _btcPayServerEnvironment = btcPayServerEnvironment;
-            _u2FService = u2FService;
             _logger = Logs.PayServer;
         }
 
@@ -100,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)
                 {
@@ -146,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)
@@ -170,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 = JsonConvert.SerializeObject(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)
@@ -247,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]
@@ -290,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();
             }
         }
 
@@ -368,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();
         }
 
@@ -379,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");
@@ -391,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);

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,7 +32,6 @@ namespace BTCPayServer.Controllers
             var settings = app.GetSettings<CrowdfundSettings>();
             var vm = new UpdateCrowdfundViewModel()
             {
-                NotificationEmailWarning = !await IsEmailConfigured(app.StoreDataId),
                 Title = settings.Title,
                 Enabled = settings.Enabled,
                 EnforceTargetAmount = settings.EnforceTargetAmount,
@@ -59,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);
         }
@@ -95,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)
             {
@@ -129,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 = _htmlSanitizer.Sanitize( vm.Description),
-                EndDate = vm.EndDate?.ToUniversalTime(),
+                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,
@@ -148,9 +124,7 @@ 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;

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;
 
@@ -78,9 +77,6 @@ namespace BTCPayServer.Controllers
 
 
             public string CustomCSSLink { get; set; }
-            public string NotificationEmail { get; set; }
-            public string NotificationUrl { get; set; }
-            public bool? RedirectAutomatically { get; set; }
         }
 
         [HttpGet]
@@ -91,10 +87,8 @@ namespace BTCPayServer.Controllers
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<PointOfSaleSettings>();
-          
             var vm = new UpdatePointOfSaleViewModel()
             {
-                NotificationEmailWarning = !await IsEmailConfigured(app.StoreDataId),
                 Id = appId,
                 Title = settings.Title,
                 EnableShoppingCart = settings.EnableShoppingCart,
@@ -107,10 +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,
-                NotificationEmail = settings.NotificationEmail,
-                NotificationUrl = settings.NotificationUrl,
-                RedirectAutomatically = settings.RedirectAutomatically.HasValue? settings.RedirectAutomatically.Value? "true": "false" : "" 
+                CustomCSSLink = settings.CustomCSSLink
             };
             if (HttpContext?.Request != null)
             {
@@ -183,11 +174,7 @@ namespace BTCPayServer.Controllers
                 CustomButtonText = vm.CustomButtonText,
                 CustomTipText = vm.CustomTipText,
                 CustomTipPercentages = ListSplit(vm.CustomTipPercentages),
-                CustomCSSLink = vm.CustomCSSLink,
-                NotificationUrl = vm.NotificationUrl,
-                NotificationEmail = vm.NotificationEmail,
-                RedirectAutomatically = string.IsNullOrEmpty(vm.RedirectAutomatically)? (bool?) null: bool.Parse(vm.RedirectAutomatically)
-                
+                CustomCSSLink = vm.CustomCSSLink
             });
             await UpdateAppSettings(app);
             StatusMessage = "App updated";

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;
@@ -31,7 +30,6 @@ namespace BTCPayServer.Controllers
             BTCPayNetworkProvider networkProvider,
             CurrencyNameTable currencies,
             HtmlSanitizer htmlSanitizer,
-            EmailSenderFactory emailSenderFactory,
             AppService AppService)
         {
             _UserManager = userManager;
@@ -40,7 +38,6 @@ namespace BTCPayServer.Controllers
             _NetworkProvider = networkProvider;
             _currencies = currencies;
             _htmlSanitizer = htmlSanitizer;
-            _emailSenderFactory = emailSenderFactory;
             _AppService = AppService;
         }
 
@@ -50,7 +47,6 @@ namespace BTCPayServer.Controllers
         private BTCPayNetworkProvider _NetworkProvider;
         private readonly CurrencyNameTable _currencies;
         private readonly HtmlSanitizer _htmlSanitizer;
-        private readonly EmailSenderFactory _emailSenderFactory;
         private AppService _AppService;
 
         [TempData]
@@ -88,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));
@@ -108,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));
@@ -180,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;
-        }
     }
 }

BTCPayServer/Controllers/AppsPublicController.cs

@@ -5,12 +5,9 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Security.Claims;
-using System.Threading;
 using System.Threading.Tasks;
-using BTCPayServer.Configuration;
 using BTCPayServer.Data;
 using BTCPayServer.Filters;
-using BTCPayServer.ModelBinders;
 using BTCPayServer.Models;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Payments;
@@ -33,19 +30,16 @@ namespace BTCPayServer.Controllers
 {
     public class AppsPublicController : Controller
     {
-        public AppsPublicController(AppService AppService,
-            BTCPayServerOptions btcPayServerOptions,
+        public AppsPublicController(AppService AppService, 
             InvoiceController invoiceController,
             UserManager<ApplicationUser> userManager)
         {
             _AppService = AppService;
-            _BtcPayServerOptions = btcPayServerOptions;
             _InvoiceController = invoiceController;
             _UserManager = userManager;
         }
 
         private AppService _AppService;
-        private readonly BTCPayServerOptions _BtcPayServerOptions;
         private InvoiceController _InvoiceController;
         private readonly UserManager<ApplicationUser> _UserManager;
 
@@ -90,6 +84,125 @@ namespace BTCPayServer.Controllers
                 AppId = appId
             });
         }
+        
+        
+        [HttpGet]
+        [Route("/apps/{appId}/crowdfund")]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
+        public async Task<IActionResult> ViewCrowdfund(string appId, string statusMessage)
+        
+        {
+            var app = await _AppService.GetApp(appId, AppType.Crowdfund, true);
+            
+            if (app == null)
+                return NotFound();
+            var settings = app.GetSettings<CrowdfundSettings>();
+            
+            var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
+            
+            var hasEnoughSettingsToLoad = !string.IsNullOrEmpty(settings.TargetCurrency );
+            if (!hasEnoughSettingsToLoad)
+            {
+                if(!isAdmin)
+                    return NotFound();
+
+                return NotFound("A Target Currency must be set for this app in order to be loadable.");
+            }
+            if (settings.Enabled) return View(await _AppService.GetAppInfo(appId));
+            if(!isAdmin)
+                return NotFound();
+
+            return View(await _AppService.GetAppInfo(appId));
+        }
+
+        [HttpPost]
+        [Route("/apps/{appId}/crowdfund")]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
+        [IgnoreAntiforgeryToken]
+        [EnableCors(CorsPolicies.All)]
+        public async Task<IActionResult> ContributeToCrowdfund(string appId, ContributeToCrowdfund request)
+        {
+            var app = await _AppService.GetApp(appId, AppType.Crowdfund, true);
+
+            if (app == null)
+                return NotFound();
+            var settings = app.GetSettings<CrowdfundSettings>();
+
+
+            var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
+
+            if (!settings.Enabled)
+            {
+                if (!isAdmin)
+                    return NotFound("Crowdfund is not currently active");
+            }
+
+            var info = (ViewCrowdfundViewModel)await _AppService.GetAppInfo(appId);
+
+            if (!isAdmin &&
+                ((settings.StartDate.HasValue && DateTime.Now < settings.StartDate) ||
+                 (settings.EndDate.HasValue && DateTime.Now > settings.EndDate) ||
+                 (settings.EnforceTargetAmount &&
+                  (info.Info.PendingProgressPercentage.GetValueOrDefault(0) +
+                   info.Info.ProgressPercentage.GetValueOrDefault(0)) >= 100)))
+            {
+                return NotFound("Crowdfund is not currently active");
+            }
+
+            var store = await _AppService.GetStore(app);
+            var title = settings.Title;
+            var price = request.Amount;
+            ViewPointOfSaleViewModel.Item choice = null;
+            if (!string.IsNullOrEmpty(request.ChoiceKey))
+            {
+                var choices = _AppService.Parse(settings.PerksTemplate, settings.TargetCurrency);
+                choice = choices.FirstOrDefault(c => c.Id == request.ChoiceKey);
+                if (choice == null)
+                    return NotFound("Incorrect option provided");
+                title = choice.Title;
+                price = choice.Price.Value;
+                if (request.Amount > price)
+                    price = request.Amount;
+            }
+
+            if (!isAdmin && (settings.EnforceTargetAmount && info.TargetAmount.HasValue && price >
+                             (info.TargetAmount - (info.Info.CurrentAmount + info.Info.CurrentPendingAmount))))
+            {
+                return NotFound("Contribution Amount is more than is currently allowed.");
+            }
+
+            store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
+            try
+            {
+                var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
+                {
+                    OrderId = AppService.GetCrowdfundOrderId(appId),
+                    Currency = settings.TargetCurrency,
+                    ItemCode = request.ChoiceKey ?? string.Empty,
+                    ItemDesc = title,
+                    BuyerEmail = request.Email,
+                    Price = price,
+                    NotificationURL = settings.NotificationUrl,
+                    FullNotifications = true,
+                    ExtendedNotifications = true,
+                    RedirectURL = request.RedirectUrl ?? Request.GetDisplayUrl()
+                }, store, HttpContext.Request.GetAbsoluteRoot(), new List<string> { AppService.GetAppInternalTag(appId) });
+                if (request.RedirectToCheckout)
+                {
+                    return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice",
+                        new {invoiceId = invoice.Data.Id});
+                }
+                else
+                {
+                    return Ok(invoice.Data.Id);
+                }
+            }
+            catch (BitpayHttpException e)
+            {
+                return BadRequest(e.Message);
+            }
+            
+        }
 
         [HttpPost]
         [Route("/apps/{appId}/pos")]
@@ -97,13 +210,13 @@ namespace BTCPayServer.Controllers
         [IgnoreAntiforgeryToken]
         [EnableCors(CorsPolicies.All)]
         public async Task<IActionResult> ViewPointOfSale(string appId,
-                                                        [ModelBinder(typeof(InvariantDecimalModelBinder))] decimal amount,
+                                                        decimal amount,
                                                         string email,
                                                         string orderId,
                                                         string notificationUrl,
                                                         string redirectUrl,
                                                         string choiceKey,
-                                                        string posData = null, CancellationToken cancellationToken = default)
+                                                        string posData = null)
         {
             var app = await _AppService.GetApp(appId, AppType.PointOfSale);
             if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
@@ -148,145 +261,15 @@ namespace BTCPayServer.Controllers
                 Price = price,
                 BuyerEmail = email,
                 OrderId = orderId,
-                NotificationURL =
-                        string.IsNullOrEmpty(notificationUrl) ? settings.NotificationUrl : notificationUrl,
-                NotificationEmail = settings.NotificationEmail,
-                RedirectURL = redirectUrl ?? Request.GetDisplayUrl(),
+                NotificationURL = notificationUrl,
+                RedirectURL = redirectUrl  ?? Request.GetDisplayUrl(),
                 FullNotifications = true,
-                ExtendedNotifications = true,
-                PosData = string.IsNullOrEmpty(posData) ? null : posData,
-                RedirectAutomatically = settings.RedirectAutomatically,
-            }, store, HttpContext.Request.GetAbsoluteRoot(),
-                new List<string>() { AppService.GetAppInternalTag(appId) },
-                cancellationToken);
+                PosData = string.IsNullOrEmpty(posData) ? null : posData
+            }, store, HttpContext.Request.GetAbsoluteRoot());
             return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
         }
-
-
-        [HttpGet]
-        [Route("/apps/{appId}/crowdfund")]
-        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
-        public async Task<IActionResult> ViewCrowdfund(string appId, string statusMessage)
-        {
-            var app = await _AppService.GetApp(appId, AppType.Crowdfund, true);
-
-            if (app == null)
-                return NotFound();
-            var settings = app.GetSettings<CrowdfundSettings>();
-
-            var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
-
-            var hasEnoughSettingsToLoad = !string.IsNullOrEmpty(settings.TargetCurrency);
-            if (!hasEnoughSettingsToLoad)
-            {
-                if (!isAdmin)
-                    return NotFound();
-
-                return NotFound("A Target Currency must be set for this app in order to be loadable.");
-            }
-            var appInfo = (ViewCrowdfundViewModel)(await _AppService.GetAppInfo(appId));
-            appInfo.HubPath = AppHub.GetHubPath(this.Request);
-            if (settings.Enabled)
-                return View(appInfo);
-            if (!isAdmin)
-                return NotFound();
-
-            return View(appInfo);
-        }
-
-        [HttpPost]
-        [Route("/apps/{appId}/crowdfund")]
-        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
-        [IgnoreAntiforgeryToken]
-        [EnableCors(CorsPolicies.All)]
-        public async Task<IActionResult> ContributeToCrowdfund(string appId, ContributeToCrowdfund request, CancellationToken cancellationToken)
-        {
-            var app = await _AppService.GetApp(appId, AppType.Crowdfund, true);
-
-            if (app == null)
-                return NotFound();
-            var settings = app.GetSettings<CrowdfundSettings>();
-
-
-            var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
-
-            if (!settings.Enabled && !isAdmin)
-            {
-                return NotFound("Crowdfund is not currently active");
-            }
-
-            var info = (ViewCrowdfundViewModel)await _AppService.GetAppInfo(appId);
-            info.HubPath = AppHub.GetHubPath(this.Request);
-            if (!isAdmin &&
-                ((settings.StartDate.HasValue && DateTime.Now < settings.StartDate) ||
-                 (settings.EndDate.HasValue && DateTime.Now > settings.EndDate) ||
-                 (settings.EnforceTargetAmount &&
-                  (info.Info.PendingProgressPercentage.GetValueOrDefault(0) +
-                   info.Info.ProgressPercentage.GetValueOrDefault(0)) >= 100)))
-            {
-                return NotFound("Crowdfund is not currently active");
-            }
-
-            var store = await _AppService.GetStore(app);
-            var title = settings.Title;
-            var price = request.Amount;
-            ViewPointOfSaleViewModel.Item choice = null;
-            if (!string.IsNullOrEmpty(request.ChoiceKey))
-            {
-                var choices = _AppService.Parse(settings.PerksTemplate, settings.TargetCurrency);
-                choice = choices.FirstOrDefault(c => c.Id == request.ChoiceKey);
-                if (choice == null)
-                    return NotFound("Incorrect option provided");
-                title = choice.Title;
-                price = choice.Price.Value;
-                if (request.Amount > price)
-                    price = request.Amount;
-            }
-
-            if (!isAdmin && (settings.EnforceTargetAmount && info.TargetAmount.HasValue && price >
-                             (info.TargetAmount - (info.Info.CurrentAmount + info.Info.CurrentPendingAmount))))
-            {
-                return NotFound("Contribution Amount is more than is currently allowed.");
-            }
-
-            store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
-            try
-            {
-                var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
-                    {
-                        OrderId = AppService.GetCrowdfundOrderId(appId),
-                        Currency = settings.TargetCurrency,
-                        ItemCode = request.ChoiceKey ?? string.Empty,
-                        ItemDesc = title,
-                        BuyerEmail = request.Email,
-                        Price = price,
-                        NotificationURL = settings.NotificationUrl,
-                        NotificationEmail = settings.NotificationEmail,
-                        FullNotifications = true,
-                        ExtendedNotifications = true,
-                        RedirectURL = request.RedirectUrl ?? 
-                                     new Uri(new Uri( new Uri(HttpContext.Request.GetAbsoluteRoot()),  _BtcPayServerOptions.RootPath), $"apps/{appId}/crowdfund").ToString()
-                    }, store, HttpContext.Request.GetAbsoluteRoot(),
-                    new List<string> {AppService.GetAppInternalTag(appId)},
-                    cancellationToken: cancellationToken);
-                if (request.RedirectToCheckout)
-                {
-                    return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice",
-                        new { invoiceId = invoice.Data.Id });
-                }
-                else
-                {
-                    return Ok(invoice.Data.Id);
-                }
-            }
-            catch (BitpayHttpException e)
-            {
-                return BadRequest(e.Message);
-            }
-
-        }
-
-
+        
+        
         private string GetUserId()
         {
             return _UserManager.GetUserId(User);

BTCPayServer/Controllers/ChangellyController.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Models;
 using BTCPayServer.Payments.Changelly;
@@ -49,7 +48,7 @@ namespace BTCPayServer.Controllers
         [HttpGet]
         [Route("calculate")]
         public async Task<IActionResult> CalculateAmount(string storeId, string fromCurrency, string toCurrency,
-            decimal toCurrencyAmount, CancellationToken cancellationToken)
+            decimal toCurrencyAmount)
         {
             try
             {
@@ -58,7 +57,7 @@ namespace BTCPayServer.Controllers
                 if (fromCurrency.Equals("usd", StringComparison.InvariantCultureIgnoreCase)
                     || fromCurrency.Equals("eur", StringComparison.InvariantCultureIgnoreCase))
                 {
-                    return await HandleCalculateFiatAmount(fromCurrency, toCurrency, toCurrencyAmount, cancellationToken);
+                    return await HandleCalculateFiatAmount(fromCurrency, toCurrency, toCurrencyAmount);
                 }
                 
                 var callCounter = 0;
@@ -103,11 +102,11 @@ namespace BTCPayServer.Controllers
         }
 
         private async Task<IActionResult> HandleCalculateFiatAmount(string fromCurrency, string toCurrency,
-            decimal toCurrencyAmount, CancellationToken cancellationToken)
+            decimal toCurrencyAmount)
         {
             var store = HttpContext.GetStoreData();
             var rules = store.GetStoreBlob().GetRateRules(_btcPayNetworkProvider);
-            var rate = await _RateProviderFactory.FetchRate(new CurrencyPair(toCurrency, fromCurrency), rules, cancellationToken);
+            var rate = await _RateProviderFactory.FetchRate(new CurrencyPair(toCurrency, fromCurrency), rules);
             if (rate.BidAsk == null) return BadRequest();
             var flatRate = rate.BidAsk.Center;
             return Ok(flatRate * toCurrencyAmount);

BTCPayServer/Controllers/HomeController.cs

@@ -1,60 +1,29 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using BTCPayServer.Models;
+using NBitcoin.DataEncoders;
 using NBitcoin.Payment;
 using System.Net.Http;
 using Newtonsoft.Json.Linq;
 using NBitcoin;
 using Newtonsoft.Json;
-using BTCPayServer.Services;
-using BTCPayServer.HostedServices;
 
 namespace BTCPayServer.Controllers
 {
     public class HomeController : Controller
     {
-        private readonly CssThemeManager _cachedServerSettings;
-
         public IHttpClientFactory HttpClientFactory { get; }
 
-        public HomeController(IHttpClientFactory httpClientFactory, CssThemeManager cachedServerSettings)
+        public HomeController(IHttpClientFactory httpClientFactory)
         {
             HttpClientFactory = httpClientFactory;
-            _cachedServerSettings = cachedServerSettings;
         }
-
-        public async Task<IActionResult> Index()
+        public IActionResult Index()
         {
-            if (_cachedServerSettings.RootAppType is Services.Apps.AppType.Crowdfund)
-            {
-                var serviceProvider = HttpContext.RequestServices;
-                var controller = (AppsPublicController)serviceProvider.GetService(typeof(AppsPublicController));
-                controller.Url = Url;
-                controller.ControllerContext = ControllerContext;
-                var res = await controller.ViewCrowdfund(_cachedServerSettings.RootAppId, null) as ViewResult;
-                if (res != null)
-                {
-                    res.ViewName = "/Views/AppsPublic/ViewCrowdfund.cshtml";
-                    return res; // return 
-                }
-            }
-            else if (_cachedServerSettings.RootAppType is Services.Apps.AppType.PointOfSale)
-            {
-                var serviceProvider = HttpContext.RequestServices;
-                var controller = (AppsPublicController)serviceProvider.GetService(typeof(AppsPublicController));
-                controller.Url = Url;
-                controller.ControllerContext = ControllerContext;
-                var res = await controller.ViewPointOfSale(_cachedServerSettings.RootAppId) as ViewResult;
-                if (res != null)
-                {
-                    res.ViewName = "/Views/AppsPublic/ViewPointOfSale.cshtml";
-                    return res; // return 
-                }
-
-            }
-
             return View("Home");
         }
 

BTCPayServer/Controllers/InvoiceController.API.cs

@@ -1,13 +1,14 @@
 using System;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Filters;
 using BTCPayServer.Models;
 using BTCPayServer.Security;
 using BTCPayServer.Services.Invoices;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
+using NBitpayClient;
 
 namespace BTCPayServer.Controllers
 {
@@ -17,22 +18,25 @@ namespace BTCPayServer.Controllers
     {
         private InvoiceController _InvoiceController;
         private InvoiceRepository _InvoiceRepository;
+        private BTCPayNetworkProvider _NetworkProvider;
 
         public InvoiceControllerAPI(InvoiceController invoiceController,
-                                    InvoiceRepository invoceRepository)
+                                    InvoiceRepository invoceRepository,
+                                    BTCPayNetworkProvider networkProvider)
         {
-            _InvoiceController = invoiceController;
-            _InvoiceRepository = invoceRepository;
+            this._InvoiceController = invoiceController;
+            this._InvoiceRepository = invoceRepository;
+            this._NetworkProvider = networkProvider;
         }
 
         [HttpPost]
         [Route("invoices")]
         [MediaTypeConstraint("application/json")]
-        public async Task<DataWrapper<InvoiceResponse>> CreateInvoice([FromBody] CreateInvoiceRequest invoice, CancellationToken cancellationToken)
+        public async Task<DataWrapper<InvoiceResponse>> CreateInvoice([FromBody] CreateInvoiceRequest invoice)
         {
             if (invoice == null)
                 throw new BitpayHttpException(400, "Invalid invoice");
-            return await _InvoiceController.CreateInvoiceCore(invoice, HttpContext.GetStoreData(), HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
+            return await _InvoiceController.CreateInvoiceCore(invoice, HttpContext.GetStoreData(), HttpContext.Request.GetAbsoluteRoot());
         }
 
         [HttpGet]
@@ -46,7 +50,8 @@ namespace BTCPayServer.Controllers
             })).FirstOrDefault();
             if (invoice == null)
                 throw new BitpayHttpException(404, "Object not found");
-            return new DataWrapper<InvoiceResponse>(invoice.EntityToDTO());
+            var resp = invoice.EntityToDTO(_NetworkProvider);
+            return new DataWrapper<InvoiceResponse>(resp);
         }
         [HttpGet]
         [Route("invoices")]
@@ -76,7 +81,7 @@ namespace BTCPayServer.Controllers
             };
 
             var entities = (await _InvoiceRepository.GetInvoices(query))
-                            .Select((o) => o.EntityToDTO()).ToArray();
+                            .Select((o) => o.EntityToDTO(_NetworkProvider)).ToArray();
 
             return DataWrapper.Create(entities);
         }

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -21,6 +21,7 @@ using BTCPayServer.Services.Invoices.Export;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore.Internal;
 using NBitcoin;
 using NBitpayClient;
 using NBXplorer;
@@ -45,9 +46,9 @@ namespace BTCPayServer.Controllers
             if (invoice == null)
                 return NotFound();
 
-            var prodInfo = invoice.ProductInformation;
+            var dto = invoice.EntityToDTO(_NetworkProvider);
             var store = await _StoreRepository.FindStore(invoice.StoreId);
-            var model = new InvoiceDetailsModel()
+            InvoiceDetailsModel model = new InvoiceDetailsModel()
             {
                 StoreName = store.StoreName,
                 StoreLink = Url.Action(nameof(StoresController.UpdateStore), "Stores", new { storeId = store.Id }),
@@ -63,97 +64,115 @@ namespace BTCPayServer.Controllers
                 MonitoringDate = invoice.MonitoringExpiration,
                 OrderId = invoice.OrderId,
                 BuyerInformation = invoice.BuyerInformation,
-                Fiat = _CurrencyNameTable.DisplayFormatCurrency(prodInfo.Price, prodInfo.Currency),
-                TaxIncluded = _CurrencyNameTable.DisplayFormatCurrency(prodInfo.TaxIncluded, prodInfo.Currency),
+                Fiat = _CurrencyNameTable.DisplayFormatCurrency(dto.Price, dto.Currency),
+                TaxIncluded = _CurrencyNameTable.DisplayFormatCurrency(invoice.ProductInformation.TaxIncluded, dto.Currency),
                 NotificationEmail = invoice.NotificationEmail,
                 NotificationUrl = invoice.NotificationURL,
                 RedirectUrl = invoice.RedirectURL,
                 ProductInformation = invoice.ProductInformation,
                 StatusException = invoice.ExceptionStatus,
                 Events = invoice.Events,
-                PosData = PosDataParser.ParsePosData(invoice.PosData),
-                StatusMessage = StatusMessage
+                PosData = PosDataParser.ParsePosData(dto.PosData)
             };
 
-            model.Addresses = invoice.HistoricalAddresses.Select(h =>
-                new InvoiceDetailsModel.AddressModel
-                {
-                    Destination = h.GetAddress(),
-                    PaymentMethod =
-                        invoice.PaymentMethodHandlerDictionary[h.GetPaymentMethodId()]
-                            .ToPrettyString(h.GetPaymentMethodId()),
-                    Current = !h.UnAssigned.HasValue
-                }).ToArray();
-
-            var details = InvoicePopulatePayments(invoice);
-            model.CryptoPayments = details.CryptoPayments;
-            model.OnChainPayments = details.OnChainPayments;
-            model.OffChainPayments = details.OffChainPayments;
-
-            return View(model);
-        }
-        private InvoiceDetailsModel InvoicePopulatePayments(InvoiceEntity invoice)
-        {
-            var model = new InvoiceDetailsModel();
-
-            foreach (var data in invoice.GetPaymentMethods())
+            foreach (var data in invoice.GetPaymentMethods(null))
             {
+                var cryptoInfo = dto.CryptoInfo.First(o => o.GetpaymentMethodId() == data.GetId());
                 var accounting = data.Calculate();
                 var paymentMethodId = data.GetId();
                 var cryptoPayment = new InvoiceDetailsModel.CryptoPayment();
-                cryptoPayment.PaymentMethod = invoice.PaymentMethodHandlerDictionary[paymentMethodId]
-                    .ToPrettyString(data.GetId());
+                cryptoPayment.PaymentMethod = ToString(paymentMethodId);
                 cryptoPayment.Due = _CurrencyNameTable.DisplayFormatCurrency(accounting.Due.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
                 cryptoPayment.Paid = _CurrencyNameTable.DisplayFormatCurrency(accounting.CryptoPaid.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
                 cryptoPayment.Overpaid = _CurrencyNameTable.DisplayFormatCurrency(accounting.OverpaidHelper.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
-                var paymentMethodDetails = data.GetPaymentMethodDetails();
-                cryptoPayment.Address = paymentMethodDetails.GetPaymentDestination();
+
+                var onchainMethod = data.GetPaymentMethodDetails() as Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod;
+                if (onchainMethod != null)
+                {
+                    cryptoPayment.Address = onchainMethod.DepositAddress;
+                }
                 cryptoPayment.Rate = ExchangeRate(data);
+                cryptoPayment.PaymentUrl = cryptoInfo.PaymentUrls.BIP21;
                 model.CryptoPayments.Add(cryptoPayment);
             }
 
-            foreach (var payment in invoice.GetPayments())
-            {
-                var paymentNetwork = _NetworkProvider.GetNetwork<BTCPayNetwork>(payment.GetCryptoCode());
-                if (paymentNetwork == null)
+            var onChainPayments = invoice
+                .GetPayments()
+                .Select<PaymentEntity, Task<object>>(async payment =>
                 {
-                    continue;
-                }
-                var paymentData = payment.GetCryptoPaymentData();
-                //TODO: abstract
-                if (paymentData is Payments.Bitcoin.BitcoinLikePaymentData onChainPaymentData)
-                {
-                    var m = new InvoiceDetailsModel.Payment();
-                    m.Crypto = payment.GetPaymentMethodId().CryptoCode;
-                    m.DepositAddress = onChainPaymentData.GetDestination(paymentNetwork);
-
-                    int confirmationCount = onChainPaymentData.ConfirmationCount;
-                    if (confirmationCount >= paymentNetwork.MaxTrackedConfirmation)
+                    var paymentNetwork = _NetworkProvider.GetNetwork(payment.GetCryptoCode());
+                    var paymentData = payment.GetCryptoPaymentData();
+                    if (paymentData is Payments.Bitcoin.BitcoinLikePaymentData onChainPaymentData)
                     {
-                        m.Confirmations = "At least " + (paymentNetwork.MaxTrackedConfirmation);
+                        var m = new InvoiceDetailsModel.Payment();
+                        m.Crypto = payment.GetPaymentMethodId().CryptoCode;
+                        m.DepositAddress = onChainPaymentData.GetDestination(paymentNetwork);
+
+                        int confirmationCount = 0;
+                        if ((onChainPaymentData.ConfirmationCount < paymentNetwork.MaxTrackedConfirmation && payment.Accounted)
+                             && (onChainPaymentData.Legacy || invoice.MonitoringExpiration < DateTimeOffset.UtcNow)) // The confirmation count in the paymentData is not up to date
+                        {
+                            confirmationCount = (await ((ExplorerClientProvider)_ServiceProvider.GetService(typeof(ExplorerClientProvider))).GetExplorerClient(payment.GetCryptoCode())?.GetTransactionAsync(onChainPaymentData.Outpoint.Hash))?.Confirmations ?? 0;
+                            onChainPaymentData.ConfirmationCount = confirmationCount;
+                            payment.SetCryptoPaymentData(onChainPaymentData);
+                            await _InvoiceRepository.UpdatePayments(new List<PaymentEntity> { payment });
+                        }
+                        else
+                        {
+                            confirmationCount = onChainPaymentData.ConfirmationCount;
+                        }
+                        if (confirmationCount >= paymentNetwork.MaxTrackedConfirmation)
+                        {
+                            m.Confirmations = "At least " + (paymentNetwork.MaxTrackedConfirmation);
+                        }
+                        else
+                        {
+                            m.Confirmations = confirmationCount.ToString(CultureInfo.InvariantCulture);
+                        }
+
+                        m.TransactionId = onChainPaymentData.Outpoint.Hash.ToString();
+                        m.ReceivedTime = payment.ReceivedTime;
+                        m.TransactionLink = string.Format(CultureInfo.InvariantCulture, paymentNetwork.BlockExplorerLink, m.TransactionId);
+                        m.Replaced = !payment.Accounted;
+                        return m;
                     }
                     else
                     {
-                        m.Confirmations = confirmationCount.ToString(CultureInfo.InvariantCulture);
+                        var lightningPaymentData = (Payments.Lightning.LightningLikePaymentData)paymentData;
+                        return new InvoiceDetailsModel.OffChainPayment()
+                        {
+                            Crypto = paymentNetwork.CryptoCode,
+                            BOLT11 = lightningPaymentData.BOLT11
+                        };
                     }
+                })
+                .ToArray();
+            await Task.WhenAll(onChainPayments);
+            model.Addresses = invoice.HistoricalAddresses.Select(h => new InvoiceDetailsModel.AddressModel
+            {
+                Destination = h.GetAddress(),
+                PaymentMethod = ToString(h.GetPaymentMethodId()),
+                Current = !h.UnAssigned.HasValue
+            }).ToArray();
+            model.OnChainPayments = onChainPayments.Select(p => p.GetAwaiter().GetResult()).OfType<InvoiceDetailsModel.Payment>().ToList();
+            model.OffChainPayments = onChainPayments.Select(p => p.GetAwaiter().GetResult()).OfType<InvoiceDetailsModel.OffChainPayment>().ToList();
+            model.StatusMessage = StatusMessage;
+            return View(model);
+        }
 
-                    m.TransactionId = onChainPaymentData.Outpoint.Hash.ToString();
-                    m.ReceivedTime = payment.ReceivedTime;
-                    m.TransactionLink = string.Format(CultureInfo.InvariantCulture, paymentNetwork.BlockExplorerLink, m.TransactionId);
-                    m.Replaced = !payment.Accounted;
-                    model.OnChainPayments.Add(m);
-                }
-                else
-                {
-                    var lightningPaymentData = (LightningLikePaymentData)paymentData;
-                    model.OffChainPayments.Add(new InvoiceDetailsModel.OffChainPayment()
-                    {
-                        Crypto = paymentNetwork.CryptoCode,
-                        BOLT11 = lightningPaymentData.BOLT11
-                    });
-                }
+        private string ToString(PaymentMethodId paymentMethodId)
+        {
+            var type = paymentMethodId.PaymentType.ToString();
+            switch (paymentMethodId.PaymentType)
+            {
+                case PaymentTypes.BTCLike:
+                    type = "On-Chain";
+                    break;
+                case PaymentTypes.LightningLike:
+                    type = "Off-Chain";
+                    break;
             }
-            return model;
+            return $"{paymentMethodId.CryptoCode} ({type})";
         }
 
         [HttpGet]
@@ -169,7 +188,7 @@ namespace BTCPayServer.Controllers
             //Keep compatibility with Bitpay
             invoiceId = invoiceId ?? id;
             id = invoiceId;
-            //
+            ////
 
             var model = await GetInvoiceModel(invoiceId, paymentMethodId == null ? null : PaymentMethodId.Parse(paymentMethodId));
             if (model == null)
@@ -194,23 +213,6 @@ namespace BTCPayServer.Controllers
             return View(nameof(Checkout), model);
         }
 
-        [HttpGet]
-        [Route("invoice-noscript")]
-        public async Task<IActionResult> CheckoutNoScript(string invoiceId, string id = null, string paymentMethodId = null)
-        {
-            //Keep compatibility with Bitpay
-            invoiceId = invoiceId ?? id;
-            id = invoiceId;
-            //
-
-            var model = await GetInvoiceModel(invoiceId, paymentMethodId == null ? null : PaymentMethodId.Parse(paymentMethodId));
-            if (model == null)
-                return NotFound();
-
-            return View(model);
-        }
-
-        //TODO: abstract
         private async Task<PaymentModel> GetInvoiceModel(string invoiceId, PaymentMethodId paymentMethodId)
         {
             var invoice = await _InvoiceRepository.GetInvoice(invoiceId);
@@ -223,11 +225,10 @@ namespace BTCPayServer.Controllers
                 paymentMethodId = store.GetDefaultPaymentId(_NetworkProvider);
                 isDefaultPaymentId = true;
             }
-            BTCPayNetworkBase network = _NetworkProvider.GetNetwork<BTCPayNetwork>(paymentMethodId.CryptoCode);
+            var network = _NetworkProvider.GetNetwork(paymentMethodId.CryptoCode);
             if (network == null && isDefaultPaymentId)
             {
-                //TODO: need to look into a better way for this as it does not scale
-                network = _NetworkProvider.GetAll().OfType<BTCPayNetwork>().FirstOrDefault();
+                network = _NetworkProvider.GetAll().FirstOrDefault();
                 paymentMethodId = new PaymentMethodId(network.CryptoCode, PaymentTypes.BTCLike);
             }
             if (invoice == null || network == null)
@@ -236,18 +237,18 @@ namespace BTCPayServer.Controllers
             {
                 if (!isDefaultPaymentId)
                     return null;
-                var paymentMethodTemp = invoice.GetPaymentMethods()
+                var paymentMethodTemp = invoice.GetPaymentMethods(_NetworkProvider)
                                                .Where(c => paymentMethodId.CryptoCode == c.GetId().CryptoCode)
                                                .FirstOrDefault();
                 if (paymentMethodTemp == null)
-                    paymentMethodTemp = invoice.GetPaymentMethods().First();
+                    paymentMethodTemp = invoice.GetPaymentMethods(_NetworkProvider).First();
                 network = paymentMethodTemp.Network;
                 paymentMethodId = paymentMethodTemp.GetId();
             }
 
             var paymentMethod = invoice.GetPaymentMethod(paymentMethodId, _NetworkProvider);
             var paymentMethodDetails = paymentMethod.GetPaymentMethodDetails();
-            var dto = invoice.EntityToDTO();
+            var dto = invoice.EntityToDTO(_NetworkProvider);
             var cryptoInfo = dto.CryptoInfo.First(o => o.GetpaymentMethodId() == paymentMethodId);
             var storeBlob = store.GetStoreBlob();
             var currency = invoice.ProductInformation.Currency;
@@ -257,7 +258,7 @@ namespace BTCPayServer.Controllers
                                            storeBlob.ChangellySettings.IsConfigured())
                 ? storeBlob.ChangellySettings
                 : null;
-
+            
             CoinSwitchSettings coinswitch = (storeBlob.CoinSwitchSettings != null && storeBlob.CoinSwitchSettings.Enabled &&
                                            storeBlob.CoinSwitchSettings.IsConfigured())
                 ? storeBlob.CoinSwitchSettings
@@ -269,19 +270,19 @@ namespace BTCPayServer.Controllers
                    (1m + (changelly.AmountMarkupPercentage / 100m)))
                 : (decimal?)null;
 
-            var paymentMethodHandler = invoice.PaymentMethodHandlerDictionary[paymentMethodId];
             var model = new PaymentModel()
             {
                 CryptoCode = network.CryptoCode,
-                RootPath = this.Request.PathBase.Value.WithTrailingSlash(),
+                PaymentMethodId = paymentMethodId.ToString(),
+                PaymentMethodName = GetDisplayName(paymentMethodId, network),
+                CryptoImage = GetImage(paymentMethodId, network),
+                IsLightning = paymentMethodId.PaymentType == PaymentTypes.LightningLike,
                 OrderId = invoice.OrderId,
                 InvoiceId = invoice.Id,
                 DefaultLang = storeBlob.DefaultLang ?? "en",
                 HtmlTitle = storeBlob.HtmlTitle ?? "BTCPay Invoice",
                 CustomCSSLink = storeBlob.CustomCSS?.AbsoluteUri,
                 CustomLogoLink = storeBlob.CustomLogo?.AbsoluteUri,
-                CryptoImage = Request.GetRelativePathOrAbsolute(paymentMethodHandler.GetCryptoImage(paymentMethodId)),
-                LightningAmountInSatoshi = storeBlob.LightningAmountInSatoshi,
                 BtcAddress = paymentMethodDetails.GetPaymentDestination(),
                 BtcDue = accounting.Due.ToString(),
                 OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
@@ -294,9 +295,14 @@ namespace BTCPayServer.Controllers
                 ItemDesc = invoice.ProductInformation.ItemDesc,
                 Rate = ExchangeRate(paymentMethod),
                 MerchantRefLink = invoice.RedirectURL ?? "/",
-                RedirectAutomatically = invoice.RedirectAutomatically,
                 StoreName = store.StoreName,
+                InvoiceBitcoinUrl = paymentMethodId.PaymentType == PaymentTypes.BTCLike ? cryptoInfo.PaymentUrls.BIP21 :
+                                    paymentMethodId.PaymentType == PaymentTypes.LightningLike ? cryptoInfo.PaymentUrls.BOLT11 :
+                                    throw new NotSupportedException(),
                 PeerInfo = (paymentMethodDetails as LightningLikePaymentMethodDetails)?.NodeInfo,
+                InvoiceBitcoinUrlQR = paymentMethodId.PaymentType == PaymentTypes.BTCLike ? cryptoInfo.PaymentUrls.BIP21 :
+                                    paymentMethodId.PaymentType == PaymentTypes.LightningLike ? cryptoInfo.PaymentUrls.BOLT11.ToUpperInvariant() :
+                                    throw new NotSupportedException(),
                 TxCount = accounting.TxRequired,
                 BtcPaid = accounting.Paid.ToString(),
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -308,44 +314,42 @@ namespace BTCPayServer.Controllers
                 ChangellyMerchantId = changelly?.ChangellyMerchantId,
                 ChangellyAmountDue = changellyAmountDue,
                 CoinSwitchEnabled = coinswitch != null,
-                CoinSwitchAmountMarkupPercentage = coinswitch?.AmountMarkupPercentage ?? 0,
                 CoinSwitchMerchantId = coinswitch?.MerchantId,
                 CoinSwitchMode = coinswitch?.Mode,
                 StoreId = store.Id,
-                AvailableCryptos = invoice.GetPaymentMethods()
+                AvailableCryptos = invoice.GetPaymentMethods(_NetworkProvider)
                                           .Where(i => i.Network != null)
-                                          .Select(kv =>
+                                          .Select(kv => new PaymentModel.AvailableCrypto()
                                           {
-                                              var availableCryptoPaymentMethodId = kv.GetId();
-                                              var availableCryptoHandler =
-                                                  invoice.PaymentMethodHandlerDictionary[availableCryptoPaymentMethodId];
-                                              return new PaymentModel.AvailableCrypto()
-                                              {
-                                                  PaymentMethodId = kv.GetId().ToString(),
-                                                  CryptoCode = kv.GetId().CryptoCode,
-                                                  PaymentMethodName = availableCryptoHandler.GetPaymentMethodName(availableCryptoPaymentMethodId),
-                                                  IsLightning =
-                                                      kv.GetId().PaymentType == PaymentTypes.LightningLike,
-                                                  CryptoImage = Request.GetRelativePathOrAbsolute(availableCryptoHandler.GetCryptoImage(availableCryptoPaymentMethodId)),
-                                                  Link = Url.Action(nameof(Checkout),
-                                                      new
-                                                      {
-                                                          invoiceId = invoiceId,
-                                                          paymentMethodId = kv.GetId().ToString()
-                                                      })
-                                              };
+                                              PaymentMethodId = kv.GetId().ToString(),
+                                              CryptoCode = kv.GetId().CryptoCode,
+                                              PaymentMethodName = GetDisplayName(kv.GetId(), kv.Network),
+                                              IsLightning = kv.GetId().PaymentType == PaymentTypes.LightningLike,
+                                              CryptoImage = GetImage(kv.GetId(), kv.Network),
+                                              Link = Url.Action(nameof(Checkout), new { invoiceId = invoiceId, paymentMethodId = kv.GetId().ToString() })
                                           }).Where(c => c.CryptoImage != "/")
                                           .OrderByDescending(a => a.CryptoCode == "BTC").ThenBy(a => a.PaymentMethodName).ThenBy(a => a.IsLightning ? 1 : 0)
                                           .ToList()
             };
 
-            paymentMethodHandler.PreparePaymentModel(model, dto);
-            model.PaymentMethodId = paymentMethodId.ToString();
             var expiration = TimeSpan.FromSeconds(model.ExpirationSeconds);
             model.TimeLeft = expiration.PrettyPrint();
             return model;
         }
 
+        private string GetDisplayName(PaymentMethodId paymentMethodId, BTCPayNetwork network)
+        {
+            return paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
+                network.DisplayName : network.DisplayName + " (Lightning)";
+        }
+
+        private string GetImage(PaymentMethodId paymentMethodId, BTCPayNetwork network)
+        {
+            var res = paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
+                Url.Content(network.CryptoImagePath) : Url.Content(network.LightningImagePath);
+            return "/" + res;
+        }
+
         private string OrderAmountFromInvoice(string cryptoCode, ProductInformation productInformation)
         {
             // if invoice source currency is the same as currently display currency, no need for "order amount from invoice"
@@ -385,7 +389,7 @@ namespace BTCPayServer.Controllers
             if (!HttpContext.WebSockets.IsWebSocketRequest)
                 return NotFound();
             var invoice = await _InvoiceRepository.GetInvoice(invoiceId);
-            if (invoice == null || invoice.Status == InvoiceStatus.Complete || invoice.Status == InvoiceStatus.Invalid || invoice.Status == InvoiceStatus.Expired)
+            if (invoice == null || invoice.Status == InvoiceStatus.Complete || invoice.Status ==  InvoiceStatus.Invalid || invoice.Status == InvoiceStatus.Expired)
                 return NotFound();
             var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
             CompositeDisposable leases = new CompositeDisposable();
@@ -433,36 +437,34 @@ namespace BTCPayServer.Controllers
                 return BadRequest(ModelState);
             }
             await _InvoiceRepository.UpdateInvoice(invoiceId, data).ConfigureAwait(false);
-            return Ok("{}");
+            return Ok();
         }
 
         [HttpGet]
         [Route("invoices")]
         [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
         [BitpayAPIConstraint(false)]
-        public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 50, int timezoneOffset = 0)
+        public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 50)
         {
             var model = new InvoicesModel
             {
                 SearchTerm = searchTerm,
                 Skip = skip,
                 Count = count,
-                StatusMessage = StatusMessage,
-                TimezoneOffset = timezoneOffset
+                StatusMessage = StatusMessage
             };
-            InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm, timezoneOffset);
+            InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm);
             var counting = _InvoiceRepository.GetInvoicesTotal(invoiceQuery);
             invoiceQuery.Count = count;
             invoiceQuery.Skip = skip;
             var list = await _InvoiceRepository.GetInvoices(invoiceQuery);
-
+            
             foreach (var invoice in list)
             {
                 var state = invoice.GetInvoiceState();
                 model.Invoices.Add(new InvoiceModel()
                 {
-                    Status = invoice.Status,
-                    StatusString = state.ToString(),
+                    Status = state.ToString(),
                     ShowCheckout = invoice.Status == InvoiceStatus.New,
                     Date = invoice.InvoiceTime,
                     InvoiceId = invoice.Id,
@@ -470,29 +472,28 @@ namespace BTCPayServer.Controllers
                     RedirectUrl = invoice.RedirectURL ?? string.Empty,
                     AmountCurrency = _CurrencyNameTable.DisplayFormatCurrency(invoice.ProductInformation.Price, invoice.ProductInformation.Currency),
                     CanMarkInvalid = state.CanMarkInvalid(),
-                    CanMarkComplete = state.CanMarkComplete(),
-                    Details = InvoicePopulatePayments(invoice)
+                    CanMarkComplete = state.CanMarkComplete()
                 });
             }
             model.Total = await counting;
             return View(model);
         }
 
-        private InvoiceQuery GetInvoiceQuery(string searchTerm = null, int timezoneOffset = 0)
+        private InvoiceQuery GetInvoiceQuery(string searchTerm = null)
         {
-            var fs = new SearchString(searchTerm);
+            var filterString = new SearchString(searchTerm);
             var invoiceQuery = new InvoiceQuery()
             {
-                TextSearch = fs.TextSearch,
+                TextSearch = filterString.TextSearch,
                 UserId = GetUserId(),
-                Unusual = fs.GetFilterBool("unusual"),
-                Status = fs.GetFilterArray("status"),
-                ExceptionStatus = fs.GetFilterArray("exceptionstatus"),
-                StoreId = fs.GetFilterArray("storeid"),
-                ItemCode = fs.GetFilterArray("itemcode"),
-                OrderId = fs.GetFilterArray("orderid"),
-                StartDate = fs.GetFilterDate("startdate", timezoneOffset),
-                EndDate = fs.GetFilterDate("enddate", timezoneOffset)
+                Unusual = !filterString.Filters.ContainsKey("unusual") ? null
+                          : !bool.TryParse(filterString.Filters["unusual"].First(), out var r) ? (bool?)null
+                          : r,
+                Status = filterString.Filters.ContainsKey("status") ? filterString.Filters["status"].ToArray() : null,
+                ExceptionStatus = filterString.Filters.ContainsKey("exceptionstatus") ? filterString.Filters["exceptionstatus"].ToArray() : null,
+                StoreId = filterString.Filters.ContainsKey("storeid") ? filterString.Filters["storeid"].ToArray() : null,
+                ItemCode = filterString.Filters.ContainsKey("itemcode") ? filterString.Filters["itemcode"].ToArray() : null,
+                OrderId = filterString.Filters.ContainsKey("orderid") ? filterString.Filters["orderid"].ToArray() : null
             };
             return invoiceQuery;
         }
@@ -500,13 +501,13 @@ namespace BTCPayServer.Controllers
         [HttpGet]
         [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
         [BitpayAPIConstraint(false)]
-        public async Task<IActionResult> Export(string format, string searchTerm = null, int timezoneOffset = 0)
+        public async Task<IActionResult> Export(string format, string searchTerm = null)
         {
             var model = new InvoiceExport(_NetworkProvider, _CurrencyNameTable);
 
-            InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm, timezoneOffset);
-            invoiceQuery.Skip = 0;
+            InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm);
             invoiceQuery.Count = int.MaxValue;
+            invoiceQuery.Skip = 0;
             var invoices = await _InvoiceRepository.GetInvoices(invoiceQuery);
             var res = model.Process(invoices, format);
 
@@ -521,14 +522,6 @@ namespace BTCPayServer.Controllers
         }
 
 
-        private SelectList GetPaymentMethodsSelectList()
-        {
-            return new SelectList(_paymentMethodHandlerDictionary.Distinct().SelectMany(handler =>
-                    handler.GetSupportedPaymentMethods()
-                        .Select(id => new SelectListItem(handler.ToPrettyString(id), id.ToString()))),
-                nameof(SelectListItem.Value),
-                nameof(SelectListItem.Text));
-        }
 
         [HttpGet]
         [Route("invoices/create")]
@@ -542,21 +535,17 @@ namespace BTCPayServer.Controllers
                 StatusMessage = "Error: You need to create at least one store before creating a transaction";
                 return RedirectToAction(nameof(UserStoresController.ListStores), "UserStores");
             }
-
-            return View(new CreateInvoiceModel() { Stores = stores, AvailablePaymentMethods = GetPaymentMethodsSelectList() });
+            return View(new CreateInvoiceModel() { Stores = stores });
         }
 
         [HttpPost]
         [Route("invoices/create")]
         [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
         [BitpayAPIConstraint(false)]
-        public async Task<IActionResult> CreateInvoice(CreateInvoiceModel model, CancellationToken cancellationToken)
+        public async Task<IActionResult> CreateInvoice(CreateInvoiceModel model)
         {
             var stores = await _StoreRepository.GetStoresByUserId(GetUserId());
             model.Stores = new SelectList(stores, nameof(StoreData.Id), nameof(StoreData.StoreName), model.StoreId);
-
-            model.AvailablePaymentMethods = GetPaymentMethodsSelectList();
-
             var store = stores.FirstOrDefault(s => s.Id == model.StoreId);
             if (store == null)
             {
@@ -579,7 +568,6 @@ namespace BTCPayServer.Controllers
                 return View(model);
             }
 
-
             if (StatusMessage != null)
             {
                 return RedirectToAction(nameof(StoresController.UpdateStore), "Stores", new
@@ -602,11 +590,7 @@ namespace BTCPayServer.Controllers
                     ItemDesc = model.ItemDesc,
                     FullNotifications = true,
                     BuyerEmail = model.BuyerEmail,
-                    SupportedTransactionCurrencies = model.SupportedTransactionCurrencies?.ToDictionary(s => s, s => new InvoiceSupportedTransactionCurrency()
-                    {
-                        Enabled = true
-                    })
-                }, store, HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
+                }, store, HttpContext.Request.GetAbsoluteRoot());
 
                 StatusMessage = $"Invoice {result.Data.Id} just created!";
                 return RedirectToAction(nameof(ListInvoices));
@@ -619,45 +603,73 @@ namespace BTCPayServer.Controllers
         }
 
         [HttpPost]
+        [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
+        [BitpayAPIConstraint(false)]
+        public IActionResult SearchInvoice(InvoicesModel invoices)
+        {
+            return RedirectToAction(nameof(ListInvoices), new
+            {
+                searchTerm = invoices.SearchTerm,
+                skip = invoices.Skip,
+                count = invoices.Count,
+            });
+        }
+
+        [HttpGet]
         [Route("invoices/{invoiceId}/changestate/{newState}")]
         [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
         [BitpayAPIConstraint(false)]
-        public async Task<IActionResult> ChangeInvoiceState(string invoiceId, string newState)
+        public IActionResult ChangeInvoiceState(string invoiceId, string newState)
+        {
+            if (newState == "invalid")
+            {
+                return View("Confirm", new ConfirmModel()
+                {
+                    Action = "Make invoice invalid",
+                    Title = "Change invoice state",
+                    Description = $"You will transition the state of this invoice to \"invalid\", do you want to continue?",
+                });
+            }
+            else if (newState == "complete")
+            {
+                return View("Confirm", new ConfirmModel()
+                {
+                    Action = "Make invoice complete",
+                    Title = "Change invoice state",
+                    Description = $"You will transition the state of this invoice to \"complete\", do you want to continue?",
+                    ButtonClass = "btn-primary"
+                });
+            }
+            else
+                return NotFound();
+        }
+
+        [HttpPost]
+        [Route("invoices/{invoiceId}/changestate/{newState}")]
+        [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
+        [BitpayAPIConstraint(false)]
+        public async Task<IActionResult> ChangeInvoiceStateConfirm(string invoiceId, string newState)
         {
             var invoice = (await _InvoiceRepository.GetInvoices(new InvoiceQuery()
             {
                 InvoiceId = invoiceId,
                 UserId = GetUserId()
             })).FirstOrDefault();
-
-            var model = new InvoiceStateChangeModel();
             if (invoice == null)
-            {
-                model.NotFound = true;
-                return NotFound(model);
-            }
-
-
+                return NotFound();
             if (newState == "invalid")
             {
                 await _InvoiceRepository.UpdatePaidInvoiceToInvalid(invoiceId);
                 _EventAggregator.Publish(new InvoiceEvent(invoice, 1008, InvoiceEvent.MarkedInvalid));
-                model.StatusString = new InvoiceState("invalid", "marked").ToString();
+                StatusMessage = "Invoice marked invalid";
             }
-            else if (newState == "complete")
+            else if(newState == "complete")
             {
                 await _InvoiceRepository.UpdatePaidInvoiceToComplete(invoiceId);
                 _EventAggregator.Publish(new InvoiceEvent(invoice, 2008, InvoiceEvent.MarkedCompleted));
-                model.StatusString = new InvoiceState("complete", "marked").ToString();
+                StatusMessage = "Invoice marked complete";
             }
-
-            return Json(model);
-        }
-
-        public class InvoiceStateChangeModel
-        {
-            public bool NotFound { get; set; }
-            public string StatusString { get; set; }
+            return RedirectToAction(nameof(ListInvoices));
         }
 
         [TempData]
@@ -676,18 +688,18 @@ namespace BTCPayServer.Controllers
         {
             public static Dictionary<string, object> ParsePosData(string posData)
             {
-                var result = new Dictionary<string, object>();
+                var result = new Dictionary<string,object>();
                 if (string.IsNullOrEmpty(posData))
                 {
                     return result;
                 }
-
+            
                 try
                 {
-                    var jObject = JObject.Parse(posData);
+                    var jObject =JObject.Parse(posData);
                     foreach (var item in jObject)
                     {
-
+                    
                         switch (item.Value.Type)
                         {
                             case JTokenType.Array:
@@ -704,7 +716,7 @@ namespace BTCPayServer.Controllers
                                 result.Add(item.Key, item.Value.ToString());
                                 break;
                         }
-
+                    
                     }
                 }
                 catch
@@ -714,6 +726,6 @@ namespace BTCPayServer.Controllers
                 return result;
             }
         }
-
+        
     }
 }

BTCPayServer/Controllers/InvoiceController.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Events;
@@ -36,7 +35,7 @@ namespace BTCPayServer.Controllers
         private CurrencyNameTable _CurrencyNameTable;
         EventAggregator _EventAggregator;
         BTCPayNetworkProvider _NetworkProvider;
-        private readonly PaymentMethodHandlerDictionary _paymentMethodHandlerDictionary;
+        private readonly BTCPayWalletProvider _WalletProvider;
         IServiceProvider _ServiceProvider;
         public InvoiceController(
             IServiceProvider serviceProvider,
@@ -46,9 +45,9 @@ namespace BTCPayServer.Controllers
             RateFetcher rateProvider,
             StoreRepository storeRepository,
             EventAggregator eventAggregator,
+            BTCPayWalletProvider walletProvider,
             ContentSecurityPolicies csp,
-            BTCPayNetworkProvider networkProvider,
-            PaymentMethodHandlerDictionary paymentMethodHandlerDictionary)
+            BTCPayNetworkProvider networkProvider)
         {
             _ServiceProvider = serviceProvider;
             _CurrencyNameTable = currencyNameTable ?? throw new ArgumentNullException(nameof(currencyNameTable));
@@ -58,18 +57,22 @@ namespace BTCPayServer.Controllers
             _UserManager = userManager;
             _EventAggregator = eventAggregator;
             _NetworkProvider = networkProvider;
-            _paymentMethodHandlerDictionary = paymentMethodHandlerDictionary;
+            _WalletProvider = walletProvider;
             _CSP = csp;
         }
 
 
-        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(CreateInvoiceRequest invoice, StoreData store, string serverUrl, List<string> additionalTags = null, CancellationToken cancellationToken = default)
+        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(CreateInvoiceRequest invoice, StoreData store, string serverUrl, List<string> additionalTags = null)
         {
             if (!store.HasClaim(Policies.CanCreateInvoice.Key))
                 throw new UnauthorizedAccessException();
             InvoiceLogs logs = new InvoiceLogs();
             logs.Write("Creation of invoice starting");
-            var entity = _InvoiceRepository.CreateNewInvoice();
+            var entity = new InvoiceEntity
+            {
+                Version = InvoiceEntity.Lastest_Version,
+                InvoiceTime = DateTimeOffset.UtcNow
+            };
 
             var getAppsTaggingStore = _InvoiceRepository.GetAppsTaggingStore(store.Id);
             var storeBlob = store.GetStoreBlob();
@@ -80,7 +83,6 @@ namespace BTCPayServer.Controllers
             entity.ServerUrl = serverUrl;
             entity.FullNotifications = invoice.FullNotifications || invoice.ExtendedNotifications;
             entity.ExtendedNotifications = invoice.ExtendedNotifications;
-            
             if (invoice.NotificationURL != null &&
                 Uri.TryCreate(invoice.NotificationURL, UriKind.Absolute, out var notificationUri) &&
                 (notificationUri.Scheme == "http" || notificationUri.Scheme == "https"))
@@ -102,7 +104,7 @@ namespace BTCPayServer.Controllers
             }
 
             var taxIncluded = invoice.TaxIncluded.HasValue ? invoice.TaxIncluded.Value : 0m;
-
+            
             var currencyInfo = _CurrencyNameTable.GetNumberFormatInfo(invoice.Currency, false);
             if (currencyInfo != null)
             {
@@ -122,9 +124,6 @@ namespace BTCPayServer.Controllers
             if (!Uri.IsWellFormedUriString(entity.RedirectURL, UriKind.Absolute))
                 entity.RedirectURL = null;
 
-            entity.RedirectAutomatically =
-                invoice.RedirectAutomatically.GetValueOrDefault(storeBlob.RedirectAutomatically);
-
             entity.Status = InvoiceStatus.New;
             entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);
 
@@ -138,13 +137,13 @@ namespace BTCPayServer.Controllers
                                                             .Where(c => c.Value.Enabled)
                                                             .Select(c => PaymentMethodId.TryParse(c.Key, out var p) ? p : null)
                                                             .ToHashSet();
-                excludeFilter = PaymentFilter.Or(excludeFilter,
+                excludeFilter = PaymentFilter.Or(excludeFilter, 
                                                  PaymentFilter.Where(p => !supportedTransactionCurrencies.Contains(p)));
             }
 
             foreach (var network in store.GetSupportedPaymentMethods(_NetworkProvider)
                                                 .Where(s => !excludeFilter.Match(s.PaymentId))
-                                                .Select(c => _NetworkProvider.GetNetwork<BTCPayNetworkBase>(c.PaymentId.CryptoCode))
+                                                .Select(c => _NetworkProvider.GetNetwork(c.PaymentId.CryptoCode))
                                                 .Where(c => c != null))
             {
                 currencyPairsToFetch.Add(new CurrencyPair(network.CryptoCode, invoice.Currency));
@@ -155,14 +154,15 @@ namespace BTCPayServer.Controllers
             }
 
             var rateRules = storeBlob.GetRateRules(_NetworkProvider);
-            var fetchingByCurrencyPair = _RateProvider.FetchRates(currencyPairsToFetch, rateRules, cancellationToken);
+            var fetchingByCurrencyPair = _RateProvider.FetchRates(currencyPairsToFetch, rateRules);
+
             var fetchingAll = WhenAllFetched(logs, fetchingByCurrencyPair);
             var supportedPaymentMethods = store.GetSupportedPaymentMethods(_NetworkProvider)
                                                .Where(s => !excludeFilter.Match(s.PaymentId))
                                                .Select(c =>
-                                                (Handler: _paymentMethodHandlerDictionary[c.PaymentId],
+                                                (Handler: (IPaymentMethodHandler)_ServiceProvider.GetService(typeof(IPaymentMethodHandler<>).MakeGenericType(c.GetType())),
                                                 SupportedPaymentMethod: c,
-                                                Network: _NetworkProvider.GetNetwork<BTCPayNetworkBase>(c.PaymentId.CryptoCode)))
+                                                Network: _NetworkProvider.GetNetwork(c.PaymentId.CryptoCode)))
                                                 .Where(c => c.Network != null)
                                                 .Select(o =>
                                                     (SupportedPaymentMethod: o.SupportedPaymentMethod,
@@ -199,24 +199,10 @@ namespace BTCPayServer.Controllers
                 entity.InternalTags.Add(AppService.GetAppInternalTag(app.Id));
             }
 
-            using (logs.Measure("Saving invoice"))
-            {
-                entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity);
-            }
-            _ = Task.Run(async () =>
-            {
-                try
-                {
-                    await fetchingAll;
-                }
-                catch (AggregateException ex)
-                {
-                    ex.Handle(e => { logs.Write($"Error while fetching rates {ex}"); return true; });
-                }
-                await _InvoiceRepository.AddInvoiceLogs(entity.Id, logs);
-            });
+            entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, logs, _NetworkProvider);
+            await fetchingAll;
             _EventAggregator.Publish(new Events.InvoiceEvent(entity, 1001, InvoiceEvent.Created));
-            var resp = entity.EntityToDTO();
+            var resp = entity.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }
 
@@ -239,11 +225,10 @@ namespace BTCPayServer.Controllers
             }).ToArray());
         }
 
-        private async Task<PaymentMethod> CreatePaymentMethodAsync(Dictionary<CurrencyPair, Task<RateResult>> fetchingByCurrencyPair, IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetworkBase network, InvoiceEntity entity, StoreData store, InvoiceLogs logs)
+        private async Task<PaymentMethod> CreatePaymentMethodAsync(Dictionary<CurrencyPair, Task<RateResult>> fetchingByCurrencyPair, IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store, InvoiceLogs logs)
         {
             try
             {
-                var logPrefix = $"{handler.ToPrettyString(supportedPaymentMethod.PaymentId)}:";
                 var storeBlob = store.GetStoreBlob();
                 var preparePayment = handler.PreparePayment(supportedPaymentMethod, store, network);
                 var rate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, entity.ProductInformation.Currency)];
@@ -256,23 +241,41 @@ namespace BTCPayServer.Controllers
                 paymentMethod.Network = network;
                 paymentMethod.SetId(supportedPaymentMethod.PaymentId);
                 paymentMethod.Rate = rate.BidAsk.Bid;
-                paymentMethod.PreferOnion = this.Request.IsOnion();
+                var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, store, network, preparePayment);
+                paymentMethod.SetPaymentMethodDetails(paymentDetails);
 
-                using (logs.Measure($"{logPrefix} Payment method details creation"))
+                Func<Money, Money, bool> compare = null;
+                CurrencyValue limitValue = null;
+                string errorMessage = null;
+                if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.LightningLike &&
+                   storeBlob.LightningMaxValue != null)
                 {
-                    var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, store, network, preparePayment);
-                    paymentMethod.SetPaymentMethodDetails(paymentDetails);
+                    compare = (a, b) => a > b;
+                    limitValue = storeBlob.LightningMaxValue;
+                    errorMessage = "The amount of the invoice is too high to be paid with lightning";
+                }
+                else if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.BTCLike &&
+                   storeBlob.OnChainMinValue != null)
+                {
+                    compare = (a, b) => a < b;
+                    limitValue = storeBlob.OnChainMinValue;
+                    errorMessage = "The amount of the invoice is too low to be paid on chain";
                 }
 
-                var errorMessage = await
-                    handler
-                        .IsPaymentMethodAllowedBasedOnInvoiceAmount(storeBlob, fetchingByCurrencyPair,
-                            paymentMethod.Calculate().Due, supportedPaymentMethod.PaymentId);
-                if (errorMessage != null)
+                if (compare != null)
                 {
-                    logs.Write($"{logPrefix} {errorMessage}");
-                    return null;
+                    var limitValueRate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, limitValue.Currency)];
+                    if (limitValueRate.BidAsk != null)
+                    {
+                        var limitValueCrypto = Money.Coins(limitValue.Value / limitValueRate.BidAsk.Bid);
+                        if (compare(paymentMethod.Calculate().Due, limitValueCrypto))
+                        {
+                            logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: {errorMessage}");
+                            return null;
+                        }
+                    }
                 }
+                ///////////////
 
 
 #pragma warning disable CS0618

BTCPayServer/Controllers/Macaroons.cs

@@ -25,7 +25,7 @@ namespace BTCPayServer.Controllers
                 throw new ArgumentNullException(nameof(directoryPath));
             Macaroons macaroons = new Macaroons();
             if (!Directory.Exists(directoryPath))
-                throw new DirectoryNotFoundException("Macaroons directory not found");
+                return macaroons;
             foreach(var file in Directory.GetFiles(directoryPath, "*.macaroon"))
             {
                 try
@@ -49,17 +49,6 @@ namespace BTCPayServer.Controllers
             }
             return macaroons;
         }
-
-        public Macaroons Clone()
-        {
-            return new Macaroons()
-            {
-                AdminMacaroon = AdminMacaroon,
-                InvoiceMacaroon = InvoiceMacaroon,
-                ReadonlyMacaroon = ReadonlyMacaroon
-            };
-        }
-
         public Macaroon ReadonlyMacaroon { get; set; }
 
         public Macaroon InvoiceMacaroon { get; set; }

BTCPayServer/Controllers/ManageController.2FA.cs

@@ -1,205 +0,0 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using BTCPayServer.Models.ManageViewModels;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-
-namespace BTCPayServer.Controllers
-{
-    public partial class ManageController
-    {
-        private const string AuthenicatorUriFormat = "otpauth://totp/{0}:{1}?secret={2}&issuer={0}&digits=6";
-
-        [HttpGet]
-        public async Task<IActionResult> TwoFactorAuthentication()
-        {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
-            }
-
-            var model = new TwoFactorAuthenticationViewModel
-            {
-                HasAuthenticator = await _userManager.GetAuthenticatorKeyAsync(user) != null,
-                Is2faEnabled = user.TwoFactorEnabled,
-                RecoveryCodesLeft = await _userManager.CountRecoveryCodesAsync(user),
-            };
-
-            return View(model);
-        }
-
-        [HttpGet]
-        public async Task<IActionResult> Disable2faWarning()
-        {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
-            }
-
-            if (!user.TwoFactorEnabled)
-            {
-                throw new ApplicationException(
-                    $"Unexpected error occurred disabling 2FA for user with ID '{user.Id}'.");
-            }
-
-            return View(nameof(Disable2fa));
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Disable2fa()
-        {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
-            }
-
-            var disable2faResult = await _userManager.SetTwoFactorEnabledAsync(user, false);
-            if (!disable2faResult.Succeeded)
-            {
-                throw new ApplicationException(
-                    $"Unexpected error occurred disabling 2FA for user with ID '{user.Id}'.");
-            }
-
-            _logger.LogInformation("User with ID {UserId} has disabled 2fa.", user.Id);
-            return RedirectToAction(nameof(TwoFactorAuthentication));
-        }
-
-        [HttpGet]
-        public async Task<IActionResult> EnableAuthenticator()
-        {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
-            }
-
-            var unformattedKey = await _userManager.GetAuthenticatorKeyAsync(user);
-            if (string.IsNullOrEmpty(unformattedKey))
-            {
-                await _userManager.ResetAuthenticatorKeyAsync(user);
-                unformattedKey = await _userManager.GetAuthenticatorKeyAsync(user);
-            }
-
-            var model = new EnableAuthenticatorViewModel
-            {
-                SharedKey = FormatKey(unformattedKey),
-                AuthenticatorUri = GenerateQrCodeUri(user.Email, unformattedKey)
-            };
-
-            return View(model);
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> EnableAuthenticator(EnableAuthenticatorViewModel model)
-        {
-            if (!ModelState.IsValid)
-            {
-                return View(model);
-            }
-
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
-            }
-
-            // Strip spaces and hypens
-            var verificationCode = model.Code.Replace(" ", string.Empty, StringComparison.InvariantCulture)
-                .Replace("-", string.Empty, StringComparison.InvariantCulture);
-
-            var is2faTokenValid = await _userManager.VerifyTwoFactorTokenAsync(
-                user, _userManager.Options.Tokens.AuthenticatorTokenProvider, verificationCode);
-
-            if (!is2faTokenValid)
-            {
-                ModelState.AddModelError(nameof(model.Code), "Verification code is invalid.");
-                return View(model);
-            }
-
-            await _userManager.SetTwoFactorEnabledAsync(user, true);
-            _logger.LogInformation("User with ID {UserId} has enabled 2FA with an authenticator app.", user.Id);
-            return RedirectToAction(nameof(GenerateRecoveryCodes));
-        }
-
-        [HttpGet]
-        public IActionResult ResetAuthenticatorWarning()
-        {
-            return View(nameof(ResetAuthenticator));
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> ResetAuthenticator()
-        {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
-            }
-
-            await _userManager.SetTwoFactorEnabledAsync(user, false);
-            await _userManager.ResetAuthenticatorKeyAsync(user);
-            _logger.LogInformation("User with id '{UserId}' has reset their authentication app key.", user.Id);
-
-            return RedirectToAction(nameof(EnableAuthenticator));
-        }
-
-        [HttpGet]
-        public async Task<IActionResult> GenerateRecoveryCodes()
-        {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
-            }
-
-            if (!user.TwoFactorEnabled)
-            {
-                throw new ApplicationException(
-                    $"Cannot generate recovery codes for user with ID '{user.Id}' as they do not have 2FA enabled.");
-            }
-
-            var recoveryCodes = await _userManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
-            var model = new GenerateRecoveryCodesViewModel {RecoveryCodes = recoveryCodes.ToArray()};
-
-            _logger.LogInformation("User with ID {UserId} has generated new 2FA recovery codes.", user.Id);
-
-            return View(model);
-        }
-
-        private string GenerateQrCodeUri(string email, string unformattedKey)
-        {
-            return string.Format(CultureInfo.InvariantCulture,
-                AuthenicatorUriFormat,
-                _urlEncoder.Encode("BTCPayServer"),
-                _urlEncoder.Encode(email),
-                unformattedKey);
-        }
-
-        private string FormatKey(string unformattedKey)
-        {
-            var result = new StringBuilder();
-            int currentPosition = 0;
-            while (currentPosition + 4 < unformattedKey.Length)
-            {
-                result.Append(unformattedKey.Substring(currentPosition, 4)).Append(" ");
-                currentPosition += 4;
-            }
-
-            if (currentPosition < unformattedKey.Length)
-            {
-                result.Append(unformattedKey.Substring(currentPosition));
-            }
-
-            return result.ToString().ToLowerInvariant();
-        }
-    }
-}

BTCPayServer/Controllers/ManageController.U2F.cs

@@ -1,89 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using BTCPayServer.Models;
-using BTCPayServer.Services.U2F.Models;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BTCPayServer.Controllers
-{
-    public partial class ManageController
-    {
-        [HttpGet]
-        public async Task<IActionResult> U2FAuthentication(string statusMessage = null)
-        {
-            return View(new U2FAuthenticationViewModel()
-            {
-                StatusMessage = statusMessage,
-                Devices = await _u2FService.GetDevices(_userManager.GetUserId(User))
-            });
-        }
-
-        [HttpGet]
-        public async Task<IActionResult> RemoveU2FDevice(string id)
-        {
-            await _u2FService.RemoveDevice(id, _userManager.GetUserId(User));
-            return RedirectToAction("U2FAuthentication", new
-            {
-                StatusMessage = "Device removed"
-            });
-        }
-
-        [HttpGet]
-        public IActionResult AddU2FDevice(string name)
-        {
-            if (!_btcPayServerEnvironment.IsSecure)
-            {
-                return RedirectToAction("U2FAuthentication", new
-                {
-                    StatusMessage = new StatusMessageModel()
-                    {
-                        Severity = StatusMessageModel.StatusSeverity.Error,
-                        Message = "Cannot register U2F device while not on https or tor"
-                    }
-                });
-            }
-
-            var serverRegisterResponse = _u2FService.StartDeviceRegistration(_userManager.GetUserId(User),
-                Request.GetAbsoluteUriNoPathBase().ToString().TrimEnd('/'));
-
-            return View(new AddU2FDeviceViewModel()
-            {
-                AppId = serverRegisterResponse.AppId,
-                Challenge = serverRegisterResponse.Challenge,
-                Version = serverRegisterResponse.Version,
-                Name = name
-            });
-        }
-
-        [HttpPost]
-        public async Task<IActionResult> AddU2FDevice(AddU2FDeviceViewModel viewModel)
-        {
-            var errorMessage = string.Empty;
-            try
-            {
-                if (await _u2FService.CompleteRegistration(_userManager.GetUserId(User), viewModel.DeviceResponse,
-                    string.IsNullOrEmpty(viewModel.Name) ? "Unlabelled U2F Device" : viewModel.Name))
-                {
-                    return RedirectToAction("U2FAuthentication", new
-                        
-                    {
-                        StatusMessage = "Device added!"
-                    });
-                }
-            }
-            catch (Exception e)
-            {
-                errorMessage = e.Message;
-            }
-
-            return RedirectToAction("U2FAuthentication", new
-            {
-                StatusMessage = new StatusMessageModel()
-                {
-                    Severity = StatusMessageModel.StatusSeverity.Error,
-                    Message = string.IsNullOrEmpty(errorMessage) ? "Could not add device." : errorMessage
-                }
-            });
-        }
-    }
-}

BTCPayServer/Controllers/ManageController.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.Encodings.Web;
@@ -8,23 +9,25 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using BTCPayServer.Models;
 using BTCPayServer.Models.ManageViewModels;
 using BTCPayServer.Services;
 using BTCPayServer.Authentication;
 using Microsoft.AspNetCore.Hosting;
+using NBitpayClient;
+using NBitcoin;
 using BTCPayServer.Services.Stores;
 using BTCPayServer.Services.Wallets;
 using BTCPayServer.Services.Mails;
 using System.Globalization;
 using BTCPayServer.Security;
-using BTCPayServer.Services.U2F;
 
 namespace BTCPayServer.Controllers
 {
     [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
     [Route("[controller]/[action]")]
-    public partial class ManageController : Controller
+    public class ManageController : Controller
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
@@ -33,11 +36,10 @@ namespace BTCPayServer.Controllers
         private readonly UrlEncoder _urlEncoder;
         TokenRepository _TokenRepository;
         IHostingEnvironment _Env;
-        private readonly U2FService _u2FService;
-        private readonly BTCPayServerEnvironment _btcPayServerEnvironment;
         StoreRepository _StoreRepository;
 
 
+        private const string AuthenicatorUriFormat = "otpauth://totp/{0}:{1}?secret={2}&issuer={0}&digits=6";
 
         public ManageController(
           UserManager<ApplicationUser> userManager,
@@ -48,9 +50,7 @@ namespace BTCPayServer.Controllers
           TokenRepository tokenRepository,
           BTCPayWalletProvider walletProvider,
           StoreRepository storeRepository,
-          IHostingEnvironment env, 
-          U2FService  u2FService,
-          BTCPayServerEnvironment btcPayServerEnvironment)
+          IHostingEnvironment env)
         {
             _userManager = userManager;
             _signInManager = signInManager;
@@ -59,8 +59,6 @@ namespace BTCPayServer.Controllers
             _urlEncoder = urlEncoder;
             _TokenRepository = tokenRepository;
             _Env = env;
-            _u2FService = u2FService;
-            _btcPayServerEnvironment = btcPayServerEnvironment;
             _StoreRepository = storeRepository;
         }
 
@@ -115,7 +113,6 @@ namespace BTCPayServer.Controllers
                 {
                     throw new ApplicationException($"Unexpected error occurred setting email for user with ID '{user.Id}'.");
                 }
-                await _userManager.SetUserNameAsync(user, model.Username);
             }
 
             var phoneNumber = user.PhoneNumber;
@@ -341,6 +338,163 @@ namespace BTCPayServer.Controllers
             return RedirectToAction(nameof(ExternalLogins));
         }
 
+        [HttpGet]
+        public async Task<IActionResult> TwoFactorAuthentication()
+        {
+            var user = await _userManager.GetUserAsync(User);
+            if (user == null)
+            {
+                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+            }
+
+            var model = new TwoFactorAuthenticationViewModel
+            {
+                HasAuthenticator = await _userManager.GetAuthenticatorKeyAsync(user) != null,
+                Is2faEnabled = user.TwoFactorEnabled,
+                RecoveryCodesLeft = await _userManager.CountRecoveryCodesAsync(user),
+            };
+
+            return View(model);
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> Disable2faWarning()
+        {
+            var user = await _userManager.GetUserAsync(User);
+            if (user == null)
+            {
+                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+            }
+
+            if (!user.TwoFactorEnabled)
+            {
+                throw new ApplicationException($"Unexpected error occurred disabling 2FA for user with ID '{user.Id}'.");
+            }
+
+            return View(nameof(Disable2fa));
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Disable2fa()
+        {
+            var user = await _userManager.GetUserAsync(User);
+            if (user == null)
+            {
+                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+            }
+
+            var disable2faResult = await _userManager.SetTwoFactorEnabledAsync(user, false);
+            if (!disable2faResult.Succeeded)
+            {
+                throw new ApplicationException($"Unexpected error occurred disabling 2FA for user with ID '{user.Id}'.");
+            }
+
+            _logger.LogInformation("User with ID {UserId} has disabled 2fa.", user.Id);
+            return RedirectToAction(nameof(TwoFactorAuthentication));
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> EnableAuthenticator()
+        {
+            var user = await _userManager.GetUserAsync(User);
+            if (user == null)
+            {
+                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+            }
+
+            var unformattedKey = await _userManager.GetAuthenticatorKeyAsync(user);
+            if (string.IsNullOrEmpty(unformattedKey))
+            {
+                await _userManager.ResetAuthenticatorKeyAsync(user);
+                unformattedKey = await _userManager.GetAuthenticatorKeyAsync(user);
+            }
+
+            var model = new EnableAuthenticatorViewModel
+            {
+                SharedKey = FormatKey(unformattedKey),
+                AuthenticatorUri = GenerateQrCodeUri(user.Email, unformattedKey)
+            };
+
+            return View(model);
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> EnableAuthenticator(EnableAuthenticatorViewModel model)
+        {
+            if (!ModelState.IsValid)
+            {
+                return View(model);
+            }
+
+            var user = await _userManager.GetUserAsync(User);
+            if (user == null)
+            {
+                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+            }
+
+            // Strip spaces and hypens
+            var verificationCode = model.Code.Replace(" ", string.Empty, StringComparison.InvariantCulture).Replace("-", string.Empty, StringComparison.InvariantCulture);
+
+            var is2faTokenValid = await _userManager.VerifyTwoFactorTokenAsync(
+                user, _userManager.Options.Tokens.AuthenticatorTokenProvider, verificationCode);
+
+            if (!is2faTokenValid)
+            {
+                ModelState.AddModelError(nameof(model.Code), "Verification code is invalid.");
+                return View(model);
+            }
+
+            await _userManager.SetTwoFactorEnabledAsync(user, true);
+            _logger.LogInformation("User with ID {UserId} has enabled 2FA with an authenticator app.", user.Id);
+            return RedirectToAction(nameof(GenerateRecoveryCodes));
+        }
+
+        [HttpGet]
+        public IActionResult ResetAuthenticatorWarning()
+        {
+            return View(nameof(ResetAuthenticator));
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> ResetAuthenticator()
+        {
+            var user = await _userManager.GetUserAsync(User);
+            if (user == null)
+            {
+                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+            }
+
+            await _userManager.SetTwoFactorEnabledAsync(user, false);
+            await _userManager.ResetAuthenticatorKeyAsync(user);
+            _logger.LogInformation("User with id '{UserId}' has reset their authentication app key.", user.Id);
+
+            return RedirectToAction(nameof(EnableAuthenticator));
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> GenerateRecoveryCodes()
+        {
+            var user = await _userManager.GetUserAsync(User);
+            if (user == null)
+            {
+                throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+            }
+
+            if (!user.TwoFactorEnabled)
+            {
+                throw new ApplicationException($"Cannot generate recovery codes for user with ID '{user.Id}' as they do not have 2FA enabled.");
+            }
+
+            var recoveryCodes = await _userManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
+            var model = new GenerateRecoveryCodesViewModel { RecoveryCodes = recoveryCodes.ToArray() };
+
+            _logger.LogInformation("User with ID {UserId} has generated new 2FA recovery codes.", user.Id);
+
+            return View(model);
+        }
 
         #region Helpers
 
@@ -351,6 +505,33 @@ namespace BTCPayServer.Controllers
                 ModelState.AddModelError(string.Empty, error.Description);
             }
         }
+
+        private string FormatKey(string unformattedKey)
+        {
+            var result = new StringBuilder();
+            int currentPosition = 0;
+            while (currentPosition + 4 < unformattedKey.Length)
+            {
+                result.Append(unformattedKey.Substring(currentPosition, 4)).Append(" ");
+                currentPosition += 4;
+            }
+            if (currentPosition < unformattedKey.Length)
+            {
+                result.Append(unformattedKey.Substring(currentPosition));
+            }
+
+            return result.ToString().ToLowerInvariant();
+        }
+
+        private string GenerateQrCodeUri(string email, string unformattedKey)
+        {
+            return string.Format(CultureInfo.InvariantCulture,
+                AuthenicatorUriFormat,
+                _urlEncoder.Encode("BTCPayServer"),
+                _urlEncoder.Encode(email),
+                unformattedKey);
+        }
+
         #endregion
     }
 }

BTCPayServer/Controllers/PaymentRequestController.cs

@@ -3,10 +3,8 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Security.Claims;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
-using BTCPayServer.Events;
 using BTCPayServer.Filters;
 using BTCPayServer.Models;
 using BTCPayServer.Models.PaymentRequestViewModels;
@@ -25,7 +23,6 @@ using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using NBitpayClient;
 
 namespace BTCPayServer.Controllers
@@ -42,7 +39,6 @@ namespace BTCPayServer.Controllers
         private readonly EventAggregator _EventAggregator;
         private readonly CurrencyNameTable _Currencies;
         private readonly HtmlSanitizer _htmlSanitizer;
-        private readonly InvoiceRepository _InvoiceRepository;
 
         public PaymentRequestController(
             InvoiceController invoiceController,
@@ -52,8 +48,7 @@ namespace BTCPayServer.Controllers
             PaymentRequestService paymentRequestService,
             EventAggregator eventAggregator,
             CurrencyNameTable currencies,
-            HtmlSanitizer htmlSanitizer,
-            InvoiceRepository invoiceRepository)
+            HtmlSanitizer htmlSanitizer)
         {
             _InvoiceController = invoiceController;
             _UserManager = userManager;
@@ -63,7 +58,6 @@ namespace BTCPayServer.Controllers
             _EventAggregator = eventAggregator;
             _Currencies = currencies;
             _htmlSanitizer = htmlSanitizer;
-            _InvoiceRepository = invoiceRepository;
         }
 
         [HttpGet]
@@ -103,12 +97,7 @@ namespace BTCPayServer.Controllers
                 return RedirectToAction("GetPaymentRequests",
                     new
                     {
-                        StatusMessage = new StatusMessageModel()
-                        {
-                            Html =
-                                $"Error: You need to create at least one store. <a href='{Url.Action("CreateStore", "UserStores")}'>Create store</a>",
-                            Severity = StatusMessageModel.StatusSeverity.Error
-                        }
+                        StatusMessage = "Error: You need to create at least one store before creating a payment request"
                     });
             }
 
@@ -154,7 +143,7 @@ namespace BTCPayServer.Controllers
             blob.Email = viewModel.Email;
             blob.Description = _htmlSanitizer.Sanitize(viewModel.Description);
             blob.Amount = viewModel.Amount;
-            blob.ExpiryDate = viewModel.ExpiryDate?.ToUniversalTime();
+            blob.ExpiryDate = viewModel.ExpiryDate;
             blob.Currency = viewModel.Currency;
             blob.EmbeddedCSS = viewModel.EmbeddedCSS;
             blob.CustomCSSLink = viewModel.CustomCSSLink;
@@ -186,7 +175,7 @@ namespace BTCPayServer.Controllers
             return View("Confirm", new ConfirmModel()
             {
                 Title = $"Remove Payment Request",
-                Description = $"Are you sure you want to remove access to the payment request '{blob.Title}' ?",
+                Description = $"Are you sure to remove access to remove payment request '{blob.Title}' ?",
                 Action = "Delete"
             });
         }
@@ -208,7 +197,7 @@ namespace BTCPayServer.Controllers
                     new
                     {
                         StatusMessage =
-                            "Error: Payment request could not be removed. Any request that has generated invoices cannot be removed."
+                            "Payment request could not be removed. Any request that has generated invoices cannot be removed."
                     });
             }
         }
@@ -216,16 +205,14 @@ namespace BTCPayServer.Controllers
         [HttpGet]
         [Route("{id}")]
         [AllowAnonymous]
-        public async Task<IActionResult> ViewPaymentRequest(string id, string statusMessage = null)
+        public async Task<IActionResult> ViewPaymentRequest(string id)
         {
             var result = await _PaymentRequestService.GetPaymentRequest(id, GetUserId());
             if (result == null)
             {
                 return NotFound();
             }
-            result.HubPath = PaymentRequestHub.GetHubPath(this.Request);
-            result.StatusMessage = statusMessage;
-            
+
             return View(result);
         }
 
@@ -233,14 +220,14 @@ namespace BTCPayServer.Controllers
         [Route("{id}/pay")]
         [AllowAnonymous]
         public async Task<IActionResult> PayPaymentRequest(string id, bool redirectToInvoice = true,
-            decimal? amount = null, CancellationToken cancellationToken = default)
+            decimal? amount = null)
         {
-            var result = await _PaymentRequestService.GetPaymentRequest(id, GetUserId());
+            var result = ((await ViewPaymentRequest(id)) as ViewResult)?.Model as ViewPaymentRequestViewModel;
             if (result == null)
             {
                 return NotFound();
             }
-            result.HubPath = PaymentRequestHub.GetHubPath(this.Request);
+
             if (result.AmountDue <= 0)
             {
                 if (redirectToInvoice)
@@ -280,31 +267,36 @@ namespace BTCPayServer.Controllers
             }
 
             if (result.AllowCustomPaymentAmounts && amount != null)
-                amount = Math.Min(result.AmountDue, amount.Value);
-            else
-                amount = result.AmountDue;
+            {
+                var invoiceAmount = result.AmountDue < amount ? result.AmountDue : amount;
+
+                return await CreateInvoiceForPaymentRequest(id, redirectToInvoice, result, invoiceAmount);
+            }
 
 
+            return await CreateInvoiceForPaymentRequest(id, redirectToInvoice, result);
+        }
+
+        private async Task<IActionResult> CreateInvoiceForPaymentRequest(string id,
+            bool redirectToInvoice,
+            ViewPaymentRequestViewModel result,
+            decimal? amount = null)
+        {
             var pr = await _PaymentRequestRepository.FindPaymentRequest(id, null);
             var blob = pr.GetBlob();
             var store = pr.StoreData;
             store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
             try
             {
-                var redirectUrl = Request.GetDisplayUrl().TrimEnd("/pay", StringComparison.InvariantCulture)
-                    .Replace("hub?id=", string.Empty, StringComparison.InvariantCultureIgnoreCase);
                 var newInvoiceId = (await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
-                        {
-                            OrderId = $"{PaymentRequestRepository.GetOrderIdForPaymentRequest(id)}",
-                            Currency = blob.Currency,
-                            Price = amount.Value,
-                            FullNotifications = true,
-                            BuyerEmail = result.Email,
-                            RedirectURL = redirectUrl,
-                        }, store, HttpContext.Request.GetAbsoluteRoot(),
-                        new List<string>() {PaymentRequestRepository.GetInternalTag(id)},
-                        cancellationToken: cancellationToken))
-                    .Data.Id;
+                {
+                    OrderId = $"{PaymentRequestRepository.GetOrderIdForPaymentRequest(id)}",
+                    Currency = blob.Currency,
+                    Price = amount.GetValueOrDefault(result.AmountDue),
+                    FullNotifications = true,
+                    BuyerEmail = result.Email,
+                    RedirectURL = Request.GetDisplayUrl().Replace("/pay", "", StringComparison.InvariantCulture),
+                }, store, HttpContext.Request.GetAbsoluteRoot(), new List<string>() { PaymentRequestRepository.GetInternalTag(id) })).Data.Id;
 
                 if (redirectToInvoice)
                 {
@@ -319,60 +311,9 @@ namespace BTCPayServer.Controllers
             }
         }
 
-        [HttpGet]
-        [Route("{id}/cancel")]
-        public async Task<IActionResult> CancelUnpaidPendingInvoice(string id, bool redirect = true)
-        {
-            var result = await _PaymentRequestService.GetPaymentRequest(id, GetUserId());
-            if (result == null )
-            {
-                return NotFound();
-            }
-
-            var invoice = result.Invoices.SingleOrDefault(requestInvoice =>
-                requestInvoice.Status.Equals(InvoiceState.ToString(InvoiceStatus.New),StringComparison.InvariantCulture) && !requestInvoice.Payments.Any());
-
-            if (invoice == null )
-            {
-                return BadRequest("No unpaid pending invoice to cancel");
-            }
-            
-            await _InvoiceRepository.UpdatePaidInvoiceToInvalid(invoice.Id);
-            _EventAggregator.Publish(new InvoiceEvent(await _InvoiceRepository.GetInvoice(invoice.Id), 1008, InvoiceEvent.MarkedInvalid));
-
-            if (redirect)
-            {
-                return RedirectToAction(nameof(ViewPaymentRequest), new
-                {
-                    Id = id,
-                    StatusMessage = "Payment cancelled"
-                });
-            }
-
-            return Ok("Payment cancelled");
-        }
-        
         private string GetUserId()
         {
             return _UserManager.GetUserId(User);
         }
-
-        [HttpGet]
-        [Route("{id}/clone")]
-        public async Task<IActionResult> ClonePaymentRequest(string id)
-        {
-            var result = await EditPaymentRequest(id);
-            if (result is ViewResult viewResult)
-            {
-                var model = (UpdatePaymentRequestViewModel)viewResult.Model;
-                model.Id = null;
-                model.Title = $"Clone of {model.Title}";
-                
-                return View("EditPaymentRequest", model);
-                
-            }
-
-            return NotFound();
-        }
     }
 }

BTCPayServer/Controllers/PublicController.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Filters;
 using BTCPayServer.Models;
@@ -29,7 +28,7 @@ namespace BTCPayServer.Controllers
         [MediaTypeAcceptConstraintAttribute("text/html")]
         [IgnoreAntiforgeryToken]
         [EnableCors(CorsPolicies.All)]
-        public async Task<IActionResult> PayButtonHandle([FromForm]PayButtonViewModel model, CancellationToken cancellationToken)
+        public async Task<IActionResult> PayButtonHandle([FromForm]PayButtonViewModel model)
         {
             var store = await _StoreRepository.FindStore(model.StoreId);
             if (store == null)
@@ -57,7 +56,7 @@ namespace BTCPayServer.Controllers
                 NotificationURL = model.ServerIpn,
                 RedirectURL = model.BrowserRedirect,
                 FullNotifications = true
-            }, store, HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
+            }, store, HttpContext.Request.GetAbsoluteRoot());
             return Redirect(invoice.Data.Url);
         }
     }

BTCPayServer/Controllers/PublicLightningNodeInfoController.cs

@@ -41,9 +41,9 @@ namespace BTCPayServer.Controllers
             try
             {
                 var paymentMethodDetails = GetExistingLightningSupportedPaymentMethod(cryptoCode, store);
-                var network = _BtcPayNetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
+                var network = _BtcPayNetworkProvider.GetNetwork(cryptoCode);
                 var nodeInfo =
-                    await _LightningLikePaymentHandler.GetNodeInfo(this.Request.IsOnion(), paymentMethodDetails,
+                    await _LightningLikePaymentHandler.GetNodeInfo(paymentMethodDetails,
                         network);
 
                 return View(new ShowLightningNodeInfoViewModel()

BTCPayServer/Controllers/RateController.cs

@@ -13,7 +13,6 @@ using Newtonsoft.Json;
 using Microsoft.AspNetCore.Authorization;
 using BTCPayServer.Authentication;
 using Microsoft.AspNetCore.Cors;
-using System.Threading;
 
 namespace BTCPayServer.Controllers
 {
@@ -46,7 +45,7 @@ namespace BTCPayServer.Controllers
         [Route("rates/{baseCurrency}")]
         [HttpGet]
         [BitpayAPIConstraint]
-        public async Task<IActionResult> GetBaseCurrencyRates(string baseCurrency, string storeId, CancellationToken cancellationToken)
+        public async Task<IActionResult> GetBaseCurrencyRates(string baseCurrency, string storeId)
         {
             storeId = await GetStoreId(storeId);
             var store = this.HttpContext.GetStoreData();
@@ -65,7 +64,7 @@ namespace BTCPayServer.Controllers
 
             var currencypairs = BuildCurrencyPairs(currencyCodes, baseCurrency);
             
-            var result = await GetRates2(currencypairs, store.Id, cancellationToken);
+            var result = await GetRates2(currencypairs, store.Id);
             var rates = (result as JsonResult)?.Value as Rate[];
             if (rates == null)
                 return result;
@@ -76,10 +75,10 @@ namespace BTCPayServer.Controllers
         [Route("rates/{baseCurrency}/{currency}")]
         [HttpGet]
         [BitpayAPIConstraint]
-        public async Task<IActionResult> GetCurrencyPairRate(string baseCurrency, string currency, string storeId, CancellationToken cancellationToken)
+        public async Task<IActionResult> GetCurrencyPairRate(string baseCurrency, string currency, string storeId)
         {
             storeId = await GetStoreId(storeId);
-            var result = await GetRates2($"{baseCurrency}_{currency}", storeId, cancellationToken);
+            var result = await GetRates2($"{baseCurrency}_{currency}", storeId);
             var rates = (result as JsonResult)?.Value as Rate[];
             if (rates == null)
                 return result;
@@ -89,9 +88,10 @@ namespace BTCPayServer.Controllers
         [Route("rates")]
         [HttpGet]
         [BitpayAPIConstraint]
-        public async Task<IActionResult> GetRates(string currencyPairs, string storeId, CancellationToken cancellationToken)
+        public async Task<IActionResult> GetRates(string currencyPairs, string storeId)
         {
-            var result = await GetRates2(currencyPairs, storeId, cancellationToken);
+            storeId = await GetStoreId(storeId);
+            var result = await GetRates2(currencyPairs, storeId);
             var rates = (result as JsonResult)?.Value as Rate[];
             if (rates == null)
                 return result;
@@ -118,7 +118,7 @@ namespace BTCPayServer.Controllers
 
         [Route("api/rates")]
         [HttpGet]
-        public async Task<IActionResult> GetRates2(string currencyPairs, string storeId, CancellationToken cancellationToken)
+        public async Task<IActionResult> GetRates2(string currencyPairs, string storeId)
         {
             storeId = await GetStoreId(storeId);
             if (storeId == null)
@@ -139,10 +139,15 @@ namespace BTCPayServer.Controllers
 
             if (currencyPairs == null)
             {
-                currencyPairs = store.GetStoreBlob().GetDefaultCurrencyPairString();
+                var supportedMethods = store.GetSupportedPaymentMethods(_NetworkProvider);
+                var currencyCodes = supportedMethods.Select(method => method.PaymentId.CryptoCode).Distinct();
+                var defaultPaymentId = store.GetDefaultPaymentId(_NetworkProvider);
+
+                currencyPairs = BuildCurrencyPairs(currencyCodes, defaultPaymentId.CryptoCode);
+
                 if (string.IsNullOrEmpty(currencyPairs))
                 {
-                    var result = Json(new BitpayErrorsModel() { Error = "You need to setup the default currency pairs in 'Store Settings / Rates' or specify 'currencyPairs' query parameter (eg. BTC_USD,LTC_CAD)." });
+                    var result = Json(new BitpayErrorsModel() { Error = "You need to specify currencyPairs (eg. BTC_USD,LTC_CAD)" });
                     result.StatusCode = 400;
                     return result;
                 }
@@ -163,7 +168,7 @@ namespace BTCPayServer.Controllers
                 pairs.Add(pair);
             }
 
-            var fetching = _RateProviderFactory.FetchRates(pairs, rules, cancellationToken);
+            var fetching = _RateProviderFactory.FetchRates(pairs, rules);
             await Task.WhenAll(fetching.Select(f => f.Value).ToArray());
             return Json(pairs
                             .Select(r => (Pair: r, Value: fetching[r].GetAwaiter().GetResult().BidAsk?.Bid))

BTCPayServer/Controllers/ServerController.Storage.cs

@@ -1,291 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Models;
-using BTCPayServer.Models.ServerViewModels;
-using BTCPayServer.Storage.Models;
-using BTCPayServer.Storage.Services.Providers.AmazonS3Storage;
-using BTCPayServer.Storage.Services.Providers.AmazonS3Storage.Configuration;
-using BTCPayServer.Storage.Services.Providers.AzureBlobStorage;
-using BTCPayServer.Storage.Services.Providers.AzureBlobStorage.Configuration;
-using BTCPayServer.Storage.Services.Providers.FileSystemStorage;
-using BTCPayServer.Storage.Services.Providers.FileSystemStorage.Configuration;
-using BTCPayServer.Storage.Services.Providers.GoogleCloudStorage;
-using BTCPayServer.Storage.Services.Providers.GoogleCloudStorage.Configuration;
-using BTCPayServer.Storage.Services.Providers.Models;
-using BTCPayServer.Storage.ViewModels;
-using BTCPayServer.Views;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Controllers
-{
-    public partial class ServerController
-    {
-        [HttpGet("server/files/{fileId?}")]
-        public async Task<IActionResult> Files(string fileId = null, string statusMessage = null)
-        {
-            TempData["StatusMessage"] = statusMessage;
-            var fileUrl = string.IsNullOrEmpty(fileId) ? null : await _FileService.GetFileUrl(Request.GetAbsoluteRootUri(), fileId);
-
-            return View(new ViewFilesViewModel()
-            {
-                Files = await _StoredFileRepository.GetFiles(),
-                SelectedFileId = string.IsNullOrEmpty(fileUrl) ? null : fileId,
-                DirectFileUrl = fileUrl,
-                StorageConfigured = (await _SettingsRepository.GetSettingAsync<StorageSettings>()) != null
-            });
-        }
-
-        [HttpGet("server/files/{fileId}/delete")]
-        public async Task<IActionResult> DeleteFile(string fileId)
-        {
-            try
-            {
-                await _FileService.RemoveFile(fileId, null);
-                return RedirectToAction(nameof(Files), new
-                {
-                    fileId = "",
-                    statusMessage = "File removed"
-                });
-            }
-            catch (Exception e)
-            {
-                return RedirectToAction(nameof(Files), new
-                {
-                    statusMessage = new StatusMessageModel()
-                    {
-                        Severity = StatusMessageModel.StatusSeverity.Error,
-                        Message = e.Message
-                    }
-                });
-            }
-        }
-
-        [HttpGet("server/files/{fileId}/tmp")]
-        public async Task<IActionResult> CreateTemporaryFileUrl(string fileId)
-        {
-            var file = await _StoredFileRepository.GetFile(fileId);
-
-            if (file == null)
-            {
-                return NotFound();
-            }
-
-            return View(new CreateTemporaryFileUrlViewModel());
-        }
-
-        [HttpPost("server/files/{fileId}/tmp")]
-        public async Task<IActionResult> CreateTemporaryFileUrl(string fileId,
-            CreateTemporaryFileUrlViewModel viewModel)
-        {
-            if (viewModel.TimeAmount <= 0)
-            {
-                ModelState.AddModelError(nameof(viewModel.TimeAmount), "Time must be at least 1");
-            }
-            
-            if (!ModelState.IsValid)
-            {
-                return View(viewModel);
-            }
-
-            var file = await _StoredFileRepository.GetFile(fileId);
-
-            if (file == null)
-            {
-                return NotFound();
-            }
-
-            var expiry = DateTimeOffset.UtcNow;
-            switch (viewModel.TimeType)
-            {
-                case CreateTemporaryFileUrlViewModel.TmpFileTimeType.Seconds:
-                    expiry =expiry.AddSeconds(viewModel.TimeAmount);
-                    break;
-                case CreateTemporaryFileUrlViewModel.TmpFileTimeType.Minutes:
-                    expiry = expiry.AddMinutes(viewModel.TimeAmount);
-                    break;
-                case CreateTemporaryFileUrlViewModel.TmpFileTimeType.Hours:
-                    expiry = expiry.AddHours(viewModel.TimeAmount);
-                    break;
-                case CreateTemporaryFileUrlViewModel.TmpFileTimeType.Days:
-                    expiry = expiry.AddDays(viewModel.TimeAmount);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-
-            var url = await _FileService.GetTemporaryFileUrl(Request.GetAbsoluteRootUri(), fileId, expiry, viewModel.IsDownload);
-
-            return RedirectToAction(nameof(Files), new
-            {
-                StatusMessage = new StatusMessageModel()
-                {
-                    Severity = StatusMessageModel.StatusSeverity.Success,
-                    Html =
-                        $"Generated Temporary Url for file {file.FileName} which expires at {expiry.ToBrowserDate()}. <a href='{url}' target='_blank'>{url}</a>"
-                }.ToString(),
-                fileId,
-            });
-
-        }
-
-        public class CreateTemporaryFileUrlViewModel
-        {
-            public enum TmpFileTimeType
-            {
-                Seconds,
-                Minutes,
-                Hours,
-                Days
-            }
-            public int TimeAmount { get; set; }
-            public TmpFileTimeType TimeType { get; set; }
-            public bool IsDownload { get; set; }
-        }
-
-
-        [HttpPost("server/files/upload")]
-        public async Task<IActionResult> CreateFile(IFormFile file)
-        {
-            var newFile = await _FileService.AddFile(file, GetUserId());
-            return RedirectToAction(nameof(Files), new
-            {
-                statusMessage = "File added!",
-                fileId = newFile.Id
-            });
-        }
-
-        private string GetUserId()
-        {
-            return _UserManager.GetUserId(ControllerContext.HttpContext.User);
-        }
-
-        [HttpGet("server/storage")]
-        public async Task<IActionResult> Storage(bool forceChoice = false, string statusMessage = null)
-        {
-            TempData["StatusMessage"] = statusMessage;
-            var savedSettings = await _SettingsRepository.GetSettingAsync<StorageSettings>();
-            if (forceChoice || savedSettings == null)
-            {
-                return View(new ChooseStorageViewModel()
-                {
-                    ShowChangeWarning = savedSettings != null,
-                    Provider = savedSettings?.Provider ?? BTCPayServer.Storage.Models.StorageProvider.FileSystem
-                });
-            }
-
-            return RedirectToAction(nameof(StorageProvider), new
-            {
-                provider = savedSettings.Provider
-            });
-        }
-
-        [HttpPost("server/storage")]
-        public IActionResult Storage(StorageSettings viewModel)
-        {
-            return RedirectToAction("StorageProvider", "Server", new
-            {
-                provider = viewModel.Provider.ToString()
-            });
-        }
-
-        [HttpGet("server/storage/{provider}")]
-        public async Task<IActionResult> StorageProvider(string provider)
-        {
-            if (!Enum.TryParse(typeof(StorageProvider), provider, out var storageProvider))
-            {
-                return RedirectToAction(nameof(Storage), new
-                {
-                    StatusMessage = new StatusMessageModel()
-                    {
-                        Severity = StatusMessageModel.StatusSeverity.Error,
-                        Message = $"{provider} provider is not supported"
-                    }.ToString()
-                });
-            }
-
-            var data = (await _SettingsRepository.GetSettingAsync<StorageSettings>()) ?? new StorageSettings();
-
-            var storageProviderService =
-                _StorageProviderServices.SingleOrDefault(service => service.StorageProvider().Equals(storageProvider));
-
-            switch (storageProviderService)
-            {
-                case null:
-                    return RedirectToAction(nameof(Storage), new
-                    {
-                        StatusMessage = new StatusMessageModel()
-                        {
-                            Severity = StatusMessageModel.StatusSeverity.Error,
-                            Message = $"{storageProvider} is not supported"
-                        }.ToString()
-                    });
-                case AzureBlobStorageFileProviderService fileProviderService:
-                    return View(nameof(EditAzureBlobStorageStorageProvider),
-                        fileProviderService.GetProviderConfiguration(data));
-
-                case AmazonS3FileProviderService fileProviderService:
-                    return View(nameof(EditAmazonS3StorageProvider),
-                        fileProviderService.GetProviderConfiguration(data));
-
-                case GoogleCloudStorageFileProviderService fileProviderService:
-                    return View(nameof(EditGoogleCloudStorageStorageProvider),
-                        fileProviderService.GetProviderConfiguration(data));
-
-                case FileSystemFileProviderService fileProviderService:
-                    return View(nameof(EditFileSystemStorageProvider),
-                        fileProviderService.GetProviderConfiguration(data));
-            }
-
-            return NotFound();
-        }
-
-
-        [HttpPost("server/storage/AzureBlobStorage")]
-        public async Task<IActionResult> EditAzureBlobStorageStorageProvider(AzureBlobStorageConfiguration viewModel)
-        {
-            return await SaveStorageProvider(viewModel, BTCPayServer.Storage.Models.StorageProvider.AzureBlobStorage);
-        }
-
-        [HttpPost("server/storage/AmazonS3")]
-        public async Task<IActionResult> EditAmazonS3StorageProvider(AmazonS3StorageConfiguration viewModel)
-        {
-            return await SaveStorageProvider(viewModel, BTCPayServer.Storage.Models.StorageProvider.AmazonS3);
-        }
-
-        [HttpPost("server/storage/GoogleCloudStorage")]
-        public async Task<IActionResult> EditGoogleCloudStorageStorageProvider(
-            GoogleCloudStorageConfiguration viewModel)
-        {
-            return await SaveStorageProvider(viewModel, BTCPayServer.Storage.Models.StorageProvider.GoogleCloudStorage);
-        }
-
-        [HttpPost("server/storage/FileSystem")]
-        public async Task<IActionResult> EditFileSystemStorageProvider(FileSystemStorageConfiguration viewModel)
-        {
-            return await SaveStorageProvider(viewModel, BTCPayServer.Storage.Models.StorageProvider.FileSystem);
-        }
-
-        private async Task<IActionResult> SaveStorageProvider(IBaseStorageConfiguration viewModel,
-            StorageProvider storageProvider)
-        {
-            if (!ModelState.IsValid)
-            {
-                return View(viewModel);
-            }
-
-            var data = (await _SettingsRepository.GetSettingAsync<StorageSettings>()) ?? new StorageSettings();
-            data.Provider = storageProvider;
-            data.Configuration = JObject.FromObject(viewModel);
-            await _SettingsRepository.UpdateSetting(data);
-            TempData["StatusMessage"] = new StatusMessageModel()
-            {
-                Severity = StatusMessageModel.StatusSeverity.Success,
-                Message = "Storage settings updated successfully"
-            }.ToString();
-            return View(viewModel);
-        }
-    }
-}

BTCPayServer/Controllers/ServerController.cs

@@ -26,18 +26,13 @@ using System.Threading.Tasks;
 using Renci.SshNet;
 using BTCPayServer.Logging;
 using BTCPayServer.Lightning;
+using BTCPayServer.Configuration.External;
 using System.Runtime.CompilerServices;
-using BTCPayServer.Storage.Models;
-using BTCPayServer.Storage.Services;
-using BTCPayServer.Storage.Services.Providers;
-using BTCPayServer.Services.Apps;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using BTCPayServer.Data;
 
 namespace BTCPayServer.Controllers
 {
     [Authorize(Policy = BTCPayServer.Security.Policies.CanModifyServerSettings.Key)]
-    public partial class ServerController : Controller
+    public class ServerController : Controller
     {
         private UserManager<ApplicationUser> _UserManager;
         SettingsRepository _SettingsRepository;
@@ -45,31 +40,18 @@ namespace BTCPayServer.Controllers
         private RateFetcher _RateProviderFactory;
         private StoreRepository _StoreRepository;
         LightningConfigurationProvider _LnConfigProvider;
-        private readonly TorServices _torServices;
         BTCPayServerOptions _Options;
-        ApplicationDbContextFactory _ContextFactory;
-        private readonly StoredFileRepository _StoredFileRepository;
-        private readonly FileService _FileService;
-        private readonly IEnumerable<IStorageProviderService> _StorageProviderServices;
 
         public ServerController(UserManager<ApplicationUser> userManager,
-            StoredFileRepository storedFileRepository,
-            FileService fileService,
-            IEnumerable<IStorageProviderService> storageProviderServices,
-            BTCPayServerOptions options,
+            Configuration.BTCPayServerOptions options,
             RateFetcher rateProviderFactory,
             SettingsRepository settingsRepository,
             NBXplorerDashboard dashBoard,
             IHttpClientFactory httpClientFactory,
             LightningConfigurationProvider lnConfigProvider,
-            TorServices torServices,
-            StoreRepository storeRepository,
-            ApplicationDbContextFactory contextFactory)
+            Services.Stores.StoreRepository storeRepository)
         {
             _Options = options;
-            _StoredFileRepository = storedFileRepository;
-            _FileService = fileService;
-            _StorageProviderServices = storageProviderServices;
             _UserManager = userManager;
             _SettingsRepository = settingsRepository;
             _dashBoard = dashBoard;
@@ -77,8 +59,6 @@ namespace BTCPayServer.Controllers
             _RateProviderFactory = rateProviderFactory;
             _StoreRepository = storeRepository;
             _LnConfigProvider = lnConfigProvider;
-            _torServices = torServices;
-            _ContextFactory = contextFactory;
         }
 
         [Route("server/rates")]
@@ -267,13 +247,6 @@ namespace BTCPayServer.Controllers
                     return error;
                 StatusMessage = $"The server might restart soon if an update is available...";
             }
-            else if (command == "clean")
-            {
-                var error = RunSSH(vm, $"btcpay-clean.sh");
-                if (error != null)
-                    return error;
-                StatusMessage = $"The old docker images will be cleaned soon...";
-            }
             else
             {
                 return NotFound();
@@ -412,17 +385,18 @@ namespace BTCPayServer.Controllers
             if (user == null)
                 return NotFound();
 
+            var admins = await _UserManager.GetUsersInRoleAsync(Roles.ServerAdmin);
+            if (admins.Count == 1)
+            {
+                // return
+                return View("Confirm", new ConfirmModel("Unable to Delete Last Admin",
+                    "This is the last Admin, so it can't be removed"));
+            }
+
+
             var roles = await _UserManager.GetRolesAsync(user);
             if (IsAdmin(roles))
             {
-                var admins = await _UserManager.GetUsersInRoleAsync(Roles.ServerAdmin);
-                if (admins.Count == 1)
-                {
-                    // return
-                    return View("Confirm", new ConfirmModel("Unable to Delete Last Admin",
-                        "This is the last Admin, so it can't be removed"));
-                }
-
                 return View("Confirm", new ConfirmModel("Delete Admin " + user.Email,
                     "Are you sure you want to delete this Admin and delete all accounts, users and data associated with the server account?",
                     "Delete"));
@@ -455,243 +429,228 @@ namespace BTCPayServer.Controllers
         }
         public IHttpClientFactory HttpClientFactory { get; }
 
+        [Route("server/emails")]
+        public async Task<IActionResult> Emails()
+        {
+            var data = (await _SettingsRepository.GetSettingAsync<EmailSettings>()) ?? new EmailSettings();
+            return View(new EmailsViewModel() { Settings = data });
+        }
+
         [Route("server/policies")]
         public async Task<IActionResult> Policies()
         {
             var data = (await _SettingsRepository.GetSettingAsync<PoliciesSettings>()) ?? new PoliciesSettings();
-
-            // load display app dropdown
-            using (var ctx = _ContextFactory.CreateContext())
-            {
-                var userId = _UserManager.GetUserId(base.User);
-                var selectList = ctx.Users.Where(user => user.Id == userId)
-                                .SelectMany(s => s.UserStores)
-                                .Select(s => s.StoreData)
-                                .SelectMany(s => s.Apps)
-                                .Select(a => new SelectListItem($"{a.AppType} - {a.Name}", a.Id)).ToList();
-                selectList.Insert(0, new SelectListItem("(None)", null));
-                ViewBag.AppsList = new SelectList(selectList, "Value", "Text", data.RootAppId);
-            }
-
             return View(data);
         }
         [Route("server/policies")]
         [HttpPost]
         public async Task<IActionResult> Policies(PoliciesSettings settings)
         {
-            if (!String.IsNullOrEmpty(settings.RootAppId))
-            {
-                using (var ctx = _ContextFactory.CreateContext())
-                {
-                    var app = ctx.Apps.SingleOrDefault(a => a.Id == settings.RootAppId);
-                    if (app != null)
-                        settings.RootAppType = Enum.Parse<AppType>(app.AppType);
-                    else
-                        settings.RootAppType = null;
-                }
-            }
-            else
-            {
-                // not preserved on client side, but clearing it just in case
-                settings.RootAppType = null;
-            }
-
             await _SettingsRepository.UpdateSetting(settings);
             TempData["StatusMessage"] = "Policies updated successfully";
-            return RedirectToAction(nameof(Policies));
+            return View(settings);
         }
 
         [Route("server/services")]
-        public async Task<IActionResult> Services()
+        public IActionResult Services()
         {
             var result = new ServicesViewModel();
-            result.ExternalServices = _Options.ExternalServices.ToList();
-            foreach (var externalService in _Options.OtherExternalServices)
+            foreach (var cryptoCode in _Options.ExternalServicesByCryptoCode.Keys)
             {
-                result.OtherExternalServices.Add(new ServicesViewModel.OtherExternalService()
+                int i = 0;
+                foreach (var grpcService in _Options.ExternalServicesByCryptoCode.GetServices<ExternalLnd>(cryptoCode))
+                {
+                    result.LNDServices.Add(new ServicesViewModel.LNDServiceViewModel()
+                    {
+                        Crypto = cryptoCode,
+                        Type = grpcService.Type,
+                        Action = nameof(LndServices),
+                        Index = i++,
+                    });
+                }
+                i = 0;
+                foreach (var sparkService in _Options.ExternalServicesByCryptoCode.GetServices<ExternalSpark>(cryptoCode))
+                {
+                    result.LNDServices.Add(new ServicesViewModel.LNDServiceViewModel()
+                    {
+                        Crypto = cryptoCode,
+                        Type = "Spark server",
+                        Action = nameof(SparkService),
+                        Index = i++,
+                    });
+                }
+                foreach (var rtlService in _Options.ExternalServicesByCryptoCode.GetServices<ExternalRTL>(cryptoCode))
+                {
+                    result.LNDServices.Add(new ServicesViewModel.LNDServiceViewModel()
+                    {
+                        Crypto = cryptoCode,
+                        Type = "Ride the Lightning server (RTL)",
+                        Action = nameof(RTLService),
+                        Index = i++,
+                    });
+                }
+                foreach (var chargeService in _Options.ExternalServicesByCryptoCode.GetServices<ExternalCharge>(cryptoCode))
+                {
+                    result.LNDServices.Add(new ServicesViewModel.LNDServiceViewModel()
+                    {
+                        Crypto = cryptoCode,
+                        Type = "Lightning charge server",
+                        Action = nameof(LightningChargeServices),
+                        Index = i++,
+                    });
+                }
+            }
+            foreach (var externalService in _Options.ExternalServices)
+            {
+                result.ExternalServices.Add(new ServicesViewModel.ExternalService()
                 {
                     Name = externalService.Key,
-                    Link = this.Request.GetAbsoluteUriNoPathBase(externalService.Value).AbsoluteUri
+                    Link = this.Request.GetRelativePathOrAbsolute(externalService.Value)
                 });
             }
             if (_Options.SSHSettings != null)
             {
-                result.OtherExternalServices.Add(new ServicesViewModel.OtherExternalService()
+                result.ExternalServices.Add(new ServicesViewModel.ExternalService()
                 {
                     Name = "SSH",
                     Link = this.Url.Action(nameof(SSHService))
                 });
             }
-            foreach (var torService in _torServices.Services)
-            {
-                if (torService.VirtualPort == 80)
-                {
-                    result.TorHttpServices.Add(new ServicesViewModel.OtherExternalService()
-                    {
-                        Name = torService.Name,
-                        Link = $"http://{torService.OnionHost}"
-                    });
-                }
-                else if (TryParseAsExternalService(torService, out var externalService))
-                {
-                    result.ExternalServices.Add(externalService);
-                }
-                else
-                {
-                    result.TorOtherServices.Add(new ServicesViewModel.OtherExternalService()
-                    {
-                        Name = torService.Name,
-                        Link = $"{torService.OnionHost}:{torService.VirtualPort}"
-                    });
-                }
-            }
-
-            var storageSettings = await _SettingsRepository.GetSettingAsync<StorageSettings>();
-            result.ExternalStorageServices.Add(new ServicesViewModel.OtherExternalService()
-            {
-                Name = storageSettings == null? "Not set": storageSettings.Provider.ToString(),
-                Link = Url.Action("Storage")
-            });
             return View(result);
         }
 
-        private static bool TryParseAsExternalService(TorService torService, out ExternalService externalService)
-        {
-            externalService = null;
-            if (torService.ServiceType == TorServiceType.P2P)
-            {
-                externalService = new ExternalService()
-                {
-                    CryptoCode = torService.Network.CryptoCode,
-                    DisplayName = "Full node P2P",
-                    Type = ExternalServiceTypes.P2P,
-                    ConnectionString = new ExternalConnectionString(new Uri($"bitcoin-p2p://{torService.OnionHost}:{torService.VirtualPort}", UriKind.Absolute)),
-                    ServiceName = torService.Name,
-                };
-            }
-            return externalService != null;
-        }
-
-        private ExternalService GetService(string serviceName, string cryptoCode)
-        {
-            var result = _Options.ExternalServices.GetService(serviceName, cryptoCode);
-            if (result != null)
-                return result;
-            _torServices.Services.FirstOrDefault(s => TryParseAsExternalService(s, out result));
-            return result;
-        }
-
-        [Route("server/services/{serviceName}/{cryptoCode}")]
-        public async Task<IActionResult> Service(string serviceName, string cryptoCode, bool showQR = false, uint? nonce = null)
+        [Route("server/services/lightning-charge/{cryptoCode}/{index}")]
+        public async Task<IActionResult> LightningChargeServices(string cryptoCode, int index, bool showQR = false)
         {
             if (!_dashBoard.IsFullySynched(cryptoCode, out var unusud))
             {
                 StatusMessage = $"Error: {cryptoCode} is not fully synched";
                 return RedirectToAction(nameof(Services));
             }
-            var service = GetService(serviceName, cryptoCode);
-            if (service == null)
+            var lightningCharge = _Options.ExternalServicesByCryptoCode.GetServices<ExternalCharge>(cryptoCode).Select(c => c.ConnectionString).FirstOrDefault();
+            if (lightningCharge == null)
+            {
                 return NotFound();
+            }
 
+            ChargeServiceViewModel vm = new ChargeServiceViewModel();
+            vm.Uri = lightningCharge.ToUri(false).AbsoluteUri;
+            vm.APIToken = lightningCharge.Password;
             try
             {
-                if (service.Type == ExternalServiceTypes.P2P)
+                if (string.IsNullOrEmpty(vm.APIToken) && lightningCharge.CookieFilePath != null)
                 {
-                    return View("P2PService", new LightningWalletServices()
-                    {
-                        ShowQR = showQR,
-                        WalletName = service.ServiceName,
-                        ServiceLink = service.ConnectionString.Server.AbsoluteUri.WithoutEndingSlash()
-                    });
-                }
-                var connectionString = await service.ConnectionString.Expand(this.Request.GetAbsoluteUriNoPathBase(), service.Type);
-                switch (service.Type)
-                {
-                    case ExternalServiceTypes.Charge:
-                        return LightningChargeServices(service, connectionString, showQR);
-                    case ExternalServiceTypes.RTL:
-                    case ExternalServiceTypes.Spark:
-                        if (connectionString.AccessKey == null)
-                        {
-                            StatusMessage = $"Error: The access key of the service is not set";
-                            return RedirectToAction(nameof(Services));
-                        }
-                        LightningWalletServices vm = new LightningWalletServices();
-                        vm.ShowQR = showQR;
-                        vm.WalletName = service.DisplayName;
-                        vm.ServiceLink = $"{connectionString.Server}?access-key={connectionString.AccessKey}";
-                        return View("LightningWalletServices", vm);
-                    case ExternalServiceTypes.LNDGRPC:
-                    case ExternalServiceTypes.LNDRest:
-                        return LndServices(service, connectionString, nonce);
-                    default:
-                        throw new NotSupportedException(service.Type.ToString());
+                    if (lightningCharge.CookieFilePath != "fake")
+                        vm.APIToken = await System.IO.File.ReadAllTextAsync(lightningCharge.CookieFilePath);
+                    else
+                        vm.APIToken = "fake";
                 }
+                var builder = new UriBuilder(lightningCharge.ToUri(false));
+                builder.UserName = "api-token";
+                builder.Password = vm.APIToken;
+                vm.AuthenticatedUri = builder.ToString();
             }
             catch (Exception ex)
             {
                 StatusMessage = $"Error: {ex.Message}";
                 return RedirectToAction(nameof(Services));
             }
+            return View(vm);
         }
 
-        private IActionResult LightningChargeServices(ExternalService service, ExternalConnectionString connectionString, bool showQR = false)
+        [Route("server/services/spark/{cryptoCode}/{index}")]
+        public async Task<IActionResult> SparkService(string cryptoCode, int index, bool showQR = false)
         {
-            ChargeServiceViewModel vm = new ChargeServiceViewModel();
-            vm.Uri = connectionString.Server.AbsoluteUri;
-            vm.APIToken = connectionString.APIToken;
-            var builder = new UriBuilder(connectionString.Server);
-            builder.UserName = "api-token";
-            builder.Password = vm.APIToken;
-            vm.AuthenticatedUri = builder.ToString();
-            return View(nameof(LightningChargeServices), vm);
+            return await LightningWalletServicesCore<ExternalSpark>(cryptoCode, showQR, "Spark Wallet");
         }
-
-        private IActionResult LndServices(ExternalService service, ExternalConnectionString connectionString, uint? nonce)
+        [Route("server/services/rtl/{cryptoCode}/{index}")]
+        public async Task<IActionResult> RTLService(string cryptoCode, int index, bool showQR = false)
         {
-            var model = new LndGrpcServicesViewModel();
-            if (service.Type == ExternalServiceTypes.LNDGRPC)
+            return await LightningWalletServicesCore<ExternalRTL>(cryptoCode, showQR, "Ride the Lightning Wallet");
+        }
+        private async Task<IActionResult> LightningWalletServicesCore<T>(string cryptoCode, bool showQR, string walletName) where T : ExternalService, IAccessKeyService
+        {
+            if (!_dashBoard.IsFullySynched(cryptoCode, out var unusud))
             {
-                model.Host = $"{connectionString.Server.DnsSafeHost}:{connectionString.Server.Port}";
-                model.SSL = connectionString.Server.Scheme == "https";
+                StatusMessage = $"Error: {cryptoCode} is not fully synched";
+                return RedirectToAction(nameof(Services));
+            }
+            var external = _Options.ExternalServicesByCryptoCode.GetServices<T>(cryptoCode).Where(c => c?.ConnectionString?.Server != null).FirstOrDefault();
+            if (external == null)
+            {
+                return NotFound();
+            }
+
+            LightningWalletServices vm = new LightningWalletServices();
+            vm.ShowQR = showQR;
+            vm.WalletName = walletName;
+            try
+            {
+                vm.ServiceLink = $"{external.ConnectionString.Server.AbsoluteUri}?access-key={await external.ExtractAccessKey()}";
+            }
+            catch (Exception ex)
+            {
+                StatusMessage = $"Error: {ex.Message}";
+                return RedirectToAction(nameof(Services));
+            }
+            return View("LightningWalletServices", vm);
+        }
+
+        [Route("server/services/lnd/{cryptoCode}/{index}")]
+        public async Task<IActionResult> LndServices(string cryptoCode, int index, uint? nonce)
+        {
+            if (!_dashBoard.IsFullySynched(cryptoCode, out var unusud))
+            {
+                StatusMessage = $"Error: {cryptoCode} is not fully synched";
+                return RedirectToAction(nameof(Services));
+            }
+            var external = GetExternalLndConnectionString(cryptoCode, index);
+            if (external == null)
+                return NotFound();
+            var model = new LndGrpcServicesViewModel();
+            if (external.ConnectionType == LightningConnectionType.LndGRPC)
+            {
+                model.Host = $"{external.BaseUri.DnsSafeHost}:{external.BaseUri.Port}";
+                model.SSL = external.BaseUri.Scheme == "https";
                 model.ConnectionType = "GRPC";
                 model.GRPCSSLCipherSuites = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256";
             }
-            else if (service.Type == ExternalServiceTypes.LNDRest)
+            else if (external.ConnectionType == LightningConnectionType.LndREST)
             {
-                model.Uri = connectionString.Server.AbsoluteUri;
+                model.Uri = external.BaseUri.AbsoluteUri;
                 model.ConnectionType = "REST";
             }
 
-            if (connectionString.CertificateThumbprint != null)
+            if (external.CertificateThumbprint != null)
             {
-                model.CertificateThumbprint = connectionString.CertificateThumbprint;
+                model.CertificateThumbprint = Encoders.Hex.EncodeData(external.CertificateThumbprint);
             }
-            if (connectionString.Macaroon != null)
+            if (external.Macaroon != null)
             {
-                model.Macaroon = Encoders.Hex.EncodeData(connectionString.Macaroon);
+                model.Macaroon = Encoders.Hex.EncodeData(external.Macaroon);
             }
-            model.AdminMacaroon = connectionString.Macaroons?.AdminMacaroon?.Hex;
-            model.InvoiceMacaroon = connectionString.Macaroons?.InvoiceMacaroon?.Hex;
-            model.ReadonlyMacaroon = connectionString.Macaroons?.ReadonlyMacaroon?.Hex;
+            var macaroons = external.MacaroonDirectoryPath == null ? null : await Macaroons.GetFromDirectoryAsync(external.MacaroonDirectoryPath);
+            model.AdminMacaroon = macaroons?.AdminMacaroon?.Hex;
+            model.InvoiceMacaroon = macaroons?.InvoiceMacaroon?.Hex;
+            model.ReadonlyMacaroon = macaroons?.ReadonlyMacaroon?.Hex;
 
             if (nonce != null)
             {
-                var configKey = GetConfigKey("lnd", service.ServiceName, service.CryptoCode, nonce.Value);
+                var configKey = GetConfigKey("lnd", cryptoCode, index, nonce.Value);
                 var lnConfig = _LnConfigProvider.GetConfig(configKey);
                 if (lnConfig != null)
                 {
-                    model.QRCodeLink = Request.GetAbsoluteUri(Url.Action(nameof(GetLNDConfig), new { configKey = configKey }));
+                    model.QRCodeLink = $"{this.Request.GetAbsoluteRoot().WithTrailingSlash()}lnd-config/{configKey}/lnd.config";
                     model.QRCode = $"config={model.QRCodeLink}";
                 }
             }
 
-            return View(nameof(LndServices), model);
+            return View(model);
         }
 
-        private static uint GetConfigKey(string type, string serviceName, string cryptoCode, uint nonce)
+        private static uint GetConfigKey(string type, string cryptoCode, int index, uint nonce)
         {
-            return (uint)HashCode.Combine(type, serviceName, cryptoCode, nonce);
+            return (uint)HashCode.Combine(type, cryptoCode, index, nonce);
         }
 
         [Route("lnd-config/{configKey}/lnd.config")]
@@ -704,62 +663,68 @@ namespace BTCPayServer.Controllers
             return Json(conf);
         }
 
-        [Route("server/services/{serviceName}/{cryptoCode}")]
+        [Route("server/services/lnd/{cryptoCode}/{index}")]
         [HttpPost]
-        public async Task<IActionResult> ServicePost(string serviceName, string cryptoCode)
+        public async Task<IActionResult> LndServicesPost(string cryptoCode, int index)
         {
-            if (!_dashBoard.IsFullySynched(cryptoCode, out var unusud))
-            {
-                StatusMessage = $"Error: {cryptoCode} is not fully synched";
-                return RedirectToAction(nameof(Services));
-            }
-            var service = GetService(serviceName, cryptoCode);
-            if (service == null)
+            var external = GetExternalLndConnectionString(cryptoCode, index);
+            if (external == null)
                 return NotFound();
-
-            ExternalConnectionString connectionString = null;
-            try
-            {
-                connectionString = await service.ConnectionString.Expand(this.Request.GetAbsoluteUriNoPathBase(), service.Type);
-            }
-            catch (Exception ex)
-            {
-                StatusMessage = $"Error: {ex.Message}";
-                return RedirectToAction(nameof(Services));
-            }
-
             LightningConfigurations confs = new LightningConfigurations();
-            if (service.Type == ExternalServiceTypes.LNDGRPC)
+            var macaroons = external.MacaroonDirectoryPath == null ? null : await Macaroons.GetFromDirectoryAsync(external.MacaroonDirectoryPath);
+            if (external.ConnectionType == LightningConnectionType.LndGRPC)
             {
                 LightningConfiguration grpcConf = new LightningConfiguration();
                 grpcConf.Type = "grpc";
-                grpcConf.Host = connectionString.Server.DnsSafeHost;
-                grpcConf.Port = connectionString.Server.Port;
-                grpcConf.SSL = connectionString.Server.Scheme == "https";
+                grpcConf.Host = external.BaseUri.DnsSafeHost;
+                grpcConf.Port = external.BaseUri.Port;
+                grpcConf.SSL = external.BaseUri.Scheme == "https";
                 confs.Configurations.Add(grpcConf);
             }
-            else if (service.Type == ExternalServiceTypes.LNDRest)
+            else if (external.ConnectionType == LightningConnectionType.LndREST)
             {
                 var restconf = new LNDRestConfiguration();
                 restconf.Type = "lnd-rest";
-                restconf.Uri = connectionString.Server.AbsoluteUri;
+                restconf.Uri = external.BaseUri.AbsoluteUri;
                 confs.Configurations.Add(restconf);
             }
             else
-                throw new NotSupportedException(service.Type.ToString());
+                throw new NotSupportedException(external.ConnectionType.ToString());
             var commonConf = (LNDConfiguration)confs.Configurations[confs.Configurations.Count - 1];
             commonConf.ChainType = _Options.NetworkType.ToString();
             commonConf.CryptoCode = cryptoCode;
-            commonConf.Macaroon = connectionString.Macaroon == null ? null : Encoders.Hex.EncodeData(connectionString.Macaroon);
-            commonConf.CertificateThumbprint = connectionString.CertificateThumbprint == null ? null : connectionString.CertificateThumbprint;
-            commonConf.AdminMacaroon = connectionString.Macaroons?.AdminMacaroon?.Hex;
-            commonConf.ReadonlyMacaroon = connectionString.Macaroons?.ReadonlyMacaroon?.Hex;
-            commonConf.InvoiceMacaroon = connectionString.Macaroons?.InvoiceMacaroon?.Hex;
+            commonConf.Macaroon = external.Macaroon == null ? null : Encoders.Hex.EncodeData(external.Macaroon);
+            commonConf.CertificateThumbprint = external.CertificateThumbprint == null ? null : Encoders.Hex.EncodeData(external.CertificateThumbprint);
+            commonConf.AdminMacaroon = macaroons?.AdminMacaroon?.Hex;
+            commonConf.ReadonlyMacaroon = macaroons?.ReadonlyMacaroon?.Hex;
+            commonConf.InvoiceMacaroon = macaroons?.InvoiceMacaroon?.Hex;
 
             var nonce = RandomUtils.GetUInt32();
-            var configKey = GetConfigKey("lnd", serviceName, cryptoCode, nonce);
+            var configKey = GetConfigKey("lnd", cryptoCode, index, nonce);
             _LnConfigProvider.KeepConfig(configKey, confs);
-            return RedirectToAction(nameof(Service), new { cryptoCode = cryptoCode, serviceName = serviceName, nonce = nonce });
+            return RedirectToAction(nameof(LndServices), new { cryptoCode = cryptoCode, nonce = nonce });
+        }
+
+        private LightningConnectionString GetExternalLndConnectionString(string cryptoCode, int index)
+        {
+            var connectionString = _Options.ExternalServicesByCryptoCode.GetServices<ExternalLnd>(cryptoCode).Skip(index).Select(c => c.ConnectionString).FirstOrDefault();
+            if (connectionString == null)
+                return null;
+            connectionString = connectionString.Clone();
+            if (connectionString.MacaroonFilePath != null)
+            {
+                try
+                {
+                    connectionString.Macaroon = System.IO.File.ReadAllBytes(connectionString.MacaroonFilePath);
+                    connectionString.MacaroonFilePath = null;
+                }
+                catch
+                {
+                    Logs.Configuration.LogWarning($"{cryptoCode}: The macaroon file path of the external LND grpc config was not found ({connectionString.MacaroonFilePath})");
+                    return null;
+                }
+            }
+            return connectionString;
         }
 
         [Route("server/services/ssh")]
@@ -774,11 +739,9 @@ namespace BTCPayServer.Controllers
                     return NotFound();
                 return File(System.IO.File.ReadAllBytes(settings.KeyFile), "application/octet-stream", "id_rsa");
             }
-
-            var server = Extensions.IsLocalNetwork(settings.Server) ? this.Request.Host.Host : settings.Server;
             SSHServiceViewModel vm = new SSHServiceViewModel();
             string port = settings.Port == 22 ? "" : $" -p {settings.Port}";
-            vm.CommandLine = $"ssh {settings.Username}@{server}{port}";
+            vm.CommandLine = $"ssh {settings.Username}@{settings.Server}{port}";
             vm.Password = settings.Password;
             vm.KeyFilePassword = settings.KeyFilePassword;
             vm.HasKeyFile = !string.IsNullOrEmpty(settings.KeyFile);
@@ -800,28 +763,19 @@ namespace BTCPayServer.Controllers
             return View(settings);
         }
 
-
-        [Route("server/emails")]
-        public async Task<IActionResult> Emails()
-        {
-            var data = (await _SettingsRepository.GetSettingAsync<EmailSettings>()) ?? new EmailSettings();
-            return View(new EmailsViewModel() { Settings = data });
-        }
-
         [Route("server/emails")]
         [HttpPost]
         public async Task<IActionResult> Emails(EmailsViewModel model, string command)
         {
-            if (!model.Settings.IsComplete())
-            {
-                model.StatusMessage = "Error: Required fields missing";
-                return View(model);
-            }
-
             if (command == "Test")
             {
                 try
                 {
+                    if (!model.Settings.IsComplete())
+                    {
+                        model.StatusMessage = "Error: Required fields missing";
+                        return View(model);
+                    }
                     var client = model.Settings.CreateSmtpClient();
                     await client.SendMailAsync(model.Settings.From, model.TestEmail, "BTCPay test", "BTCPay test");
                     model.StatusMessage = "Email sent to " + model.TestEmail + ", please, verify you received it";
@@ -875,16 +829,14 @@ namespace BTCPayServer.Controllers
                     .ToList();
                 vm.LogFileOffset = offset;
 
-                if (string.IsNullOrEmpty(file) || !file.EndsWith(fileExtension, StringComparison.Ordinal))
+                if (string.IsNullOrEmpty(file))
                     return View("Logs", vm);
                 vm.Log = "";
-                var fi = vm.LogFiles.FirstOrDefault(o => o.Name == file);
-                if (fi == null)
-                    return NotFound();
+                var path = Path.Combine(di.FullName, file);
                 try
                 {
                     using (var fileStream = new FileStream(
-                        fi.FullName,
+                        path,
                         FileMode.Open,
                         FileAccess.Read,
                         FileShare.ReadWrite))

BTCPayServer/Controllers/StorageController.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using BTCPayServer.Configuration;
-using BTCPayServer.Storage.Services;
-using BTCPayServer.Storage.Services.Providers.FileSystemStorage;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BTCPayServer.Storage
-{
-    [Route("Storage")]
-    public class StorageController : Controller
-    {
-        private readonly FileService _FileService;
-        private string _dir;
-
-        public StorageController(FileService fileService, BTCPayServerOptions serverOptions)
-        {
-            _FileService = fileService;
-            _dir =FileSystemFileProviderService.GetTempStorageDir(serverOptions);
-        }
-
-        [HttpGet("{fileId}")]
-        public async Task<IActionResult> GetFile(string fileId)
-        {
-            var url = await _FileService.GetFileUrl(Request.GetAbsoluteRootUri(), fileId);
-            return new RedirectResult(url);
-        }
-    }
-}

BTCPayServer/Controllers/StoresController.BTCLike.cs

@@ -1,19 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
-using BTCPayServer.Models;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Services;
 using LedgerWallet;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using NBitcoin;
 using NBXplorer.DerivationStrategy;
@@ -39,19 +36,10 @@ namespace BTCPayServer.Controllers
             DerivationSchemeViewModel vm = new DerivationSchemeViewModel();
             vm.CryptoCode = cryptoCode;
             vm.RootKeyPath = network.GetRootKeyPath();
-            vm.Network = network;
             SetExistingValues(store, vm);
             return View(vm);
         }
 
-        class GetXPubs
-        {
-            public BitcoinExtPubKey ExtPubKey { get; set; }
-            public DerivationStrategyBase DerivationScheme { get; set; }
-            public HDFingerprint RootFingerprint { get; set; }
-            public string Source { get; set; }
-        }
-
         [HttpGet]
         [Route("{storeId}/derivations/{cryptoCode}/ledger/ws")]
         public async Task<IActionResult> AddDerivationSchemeLedger(
@@ -64,9 +52,9 @@ namespace BTCPayServer.Controllers
                 return NotFound();
 
             var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
-            var hw = new LedgerHardwareWalletService(webSocket);
+            var hw = new HardwareWalletService(webSocket);
             object result = null;
-            var network = _NetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
+            var network = _NetworkProvider.GetNetwork(cryptoCode);
 
             using (var normalOperationTimeout = new CancellationTokenSource())
             {
@@ -82,18 +70,7 @@ namespace BTCPayServer.Controllers
                         var k = KeyPath.Parse(keyPath);
                         if (k.Indexes.Length == 0)
                             throw new FormatException("Invalid key path");
-
-                        var getxpubResult = new GetXPubs();
-                        getxpubResult.ExtPubKey = await hw.GetExtPubKey(network, k, normalOperationTimeout.Token);
-                        var segwit = network.NBitcoinNetwork.Consensus.SupportSegwit;
-                        var derivation = new DerivationStrategyFactory(network.NBitcoinNetwork).CreateDirectDerivationStrategy(getxpubResult.ExtPubKey, new DerivationStrategyOptions()
-                        {
-                            P2SH = segwit,
-                            Legacy = !segwit
-                        });
-                        getxpubResult.DerivationScheme = derivation;
-                        getxpubResult.RootFingerprint = (await hw.GetExtPubKey(network, new KeyPath(), normalOperationTimeout.Token)).ExtPubKey.PubKey.GetHDFingerPrint();
-                        getxpubResult.Source = hw.Device;
+                        var getxpubResult = await hw.GetExtPubKey(network, k, normalOperationTimeout.Token);
                         result = getxpubResult;
                     }
                 }
@@ -107,7 +84,7 @@ namespace BTCPayServer.Controllers
                     if (result != null)
                     {
                         UTF8Encoding UTF8NOBOM = new UTF8Encoding(false);
-                        var bytes = UTF8NOBOM.GetBytes(JsonConvert.SerializeObject(result, network.NBXplorerNetwork.JsonSerializerSettings));
+                        var bytes = UTF8NOBOM.GetBytes(JsonConvert.SerializeObject(result, MvcJsonOptions.Value.SerializerSettings));
                         await webSocket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, true, new CancellationTokenSource(2000).Token);
                     }
                 }
@@ -120,34 +97,24 @@ namespace BTCPayServer.Controllers
             return new EmptyResult();
         }
 
-        
-        
         private void SetExistingValues(StoreData store, DerivationSchemeViewModel vm)
         {
-            var derivation = GetExistingDerivationStrategy(vm.CryptoCode, store);
-            if (derivation != null)
-            {
-                vm.DerivationScheme = derivation.AccountDerivation.ToString();
-                vm.Config = derivation.ToJson();
-            }
+            vm.DerivationScheme = GetExistingDerivationStrategy(vm.CryptoCode, store)?.DerivationStrategyBase.ToString();
             vm.Enabled = !store.GetStoreBlob().IsExcluded(new PaymentMethodId(vm.CryptoCode, PaymentTypes.BTCLike));
         }
 
-        private DerivationSchemeSettings GetExistingDerivationStrategy(string cryptoCode, StoreData store)
+        private DerivationStrategy GetExistingDerivationStrategy(string cryptoCode, StoreData store)
         {
             var id = new PaymentMethodId(cryptoCode, PaymentTypes.BTCLike);
             var existing = store.GetSupportedPaymentMethods(_NetworkProvider)
-                .OfType<DerivationSchemeSettings>()
+                .OfType<DerivationStrategy>()
                 .FirstOrDefault(d => d.PaymentId == id);
             return existing;
         }
-        
-        
 
         [HttpPost]
         [Route("{storeId}/derivations/{cryptoCode}")]
-        public async Task<IActionResult> AddDerivationScheme(string storeId, DerivationSchemeViewModel vm,
-            string cryptoCode)
+        public async Task<IActionResult> AddDerivationScheme(string storeId, DerivationSchemeViewModel vm, string cryptoCode)
         {
             vm.CryptoCode = cryptoCode;
             var store = HttpContext.GetStoreData();
@@ -159,100 +126,45 @@ namespace BTCPayServer.Controllers
             {
                 return NotFound();
             }
-
-            vm.Network = network;
             vm.RootKeyPath = network.GetRootKeyPath();
-            DerivationSchemeSettings strategy = null;
-            
             var wallet = _WalletProvider.GetWallet(network);
             if (wallet == null)
             {
                 return NotFound();
             }
 
-            if (!string.IsNullOrEmpty(vm.Config))
-            {
-                if (!DerivationSchemeSettings.TryParseFromJson(vm.Config, network, out strategy))
-                {
-                    vm.StatusMessage = new StatusMessageModel()
-                    {
-                        Severity = StatusMessageModel.StatusSeverity.Error,
-                        Message = "Config file was not in the correct format"
-                    }.ToString();
-                    vm.Confirmation = false;
-                    return View(vm);
-                }
-            }
-
-            if (vm.ColdcardPublicFile != null)
-            {
-                if (!DerivationSchemeSettings.TryParseFromColdcard(await ReadAllText(vm.ColdcardPublicFile), network, out strategy))
-                {
-                    vm.StatusMessage = new StatusMessageModel()
-                    {
-                        Severity = StatusMessageModel.StatusSeverity.Error,
-                        Message = "Coldcard public file was not in the correct format"
-                    }.ToString();
-                    vm.Confirmation = false;
-                    return View(vm);
-                }
-            }
-            else
-            {
-                try
-                {
-                    if (!string.IsNullOrEmpty(vm.DerivationScheme))
-                    {
-                        var newStrategy = ParseDerivationStrategy(vm.DerivationScheme, null, network);
-                        if (newStrategy.AccountDerivation != strategy?.AccountDerivation)
-                        {
-                            var accountKey = string.IsNullOrEmpty(vm.AccountKey) ? null : new BitcoinExtPubKey(vm.AccountKey, network.NBitcoinNetwork);
-                            if (accountKey != null)
-                            {
-                                var accountSettings = newStrategy.AccountKeySettings.FirstOrDefault(a => a.AccountKey == accountKey);
-                                if (accountSettings != null)
-                                {
-                                    accountSettings.AccountKeyPath = vm.KeyPath == null ? null : KeyPath.Parse(vm.KeyPath);
-                                    accountSettings.RootFingerprint = string.IsNullOrEmpty(vm.RootFingerprint) ? (HDFingerprint?)null : new HDFingerprint(NBitcoin.DataEncoders.Encoders.Hex.DecodeData(vm.RootFingerprint));
-                                }
-                            }
-                            strategy = newStrategy;
-                            strategy.Source = vm.Source;
-                            vm.DerivationScheme = strategy.AccountDerivation.ToString();
-                        }
-                    }
-                    else
-                    {
-                        strategy = null;
-                    }
-                }
-                catch
-                {
-                    ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid Derivation Scheme");
-                    vm.Confirmation = false;
-                    return View(vm);
-                }
-            }
-
-            var oldConfig = vm.Config;
-            vm.Config = strategy == null ? null : strategy.ToJson();
-
             PaymentMethodId paymentMethodId = new PaymentMethodId(network.CryptoCode, PaymentTypes.BTCLike);
             var exisingStrategy = store.GetSupportedPaymentMethods(_NetworkProvider)
-                .Where(c => c.PaymentId == paymentMethodId)
-                .OfType<DerivationSchemeSettings>()
-                .FirstOrDefault();
+                                       .Where(c => c.PaymentId == paymentMethodId)
+                                       .OfType<DerivationStrategy>()
+                                       .Select(c => c.DerivationStrategyBase.ToString())
+                                       .FirstOrDefault();
+            DerivationStrategy strategy = null;
+            try
+            {
+                if (!string.IsNullOrEmpty(vm.DerivationScheme))
+                {
+                    strategy = ParseDerivationStrategy(vm.DerivationScheme, null, network);
+                    vm.DerivationScheme = strategy.ToString();
+                }
+            }
+            catch
+            {
+                ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid Derivation Scheme");
+                vm.Confirmation = false;
+                return View(vm);
+            }
             var storeBlob = store.GetStoreBlob();
             var wasExcluded = storeBlob.GetExcludedPaymentMethods().Match(paymentMethodId);
             var willBeExcluded = !vm.Enabled;
 
             var showAddress = // Show addresses if:
-                // - If the user is testing the hint address in confirmation screen
-                (vm.Confirmation && !string.IsNullOrWhiteSpace(vm.HintAddress)) ||
-                // - The user is clicking on continue after changing the config
-                (!vm.Confirmation && oldConfig != vm.Config) ||
-                // - The user is clickingon continue without changing config nor enabling/disabling
-                (!vm.Confirmation && oldConfig == vm.Config && willBeExcluded == wasExcluded);
+                              // - If the user is testing the hint address in confirmation screen
+                              (vm.Confirmation && !string.IsNullOrWhiteSpace(vm.HintAddress)) ||
+                              // - The user is setting a new derivation scheme
+                              (!vm.Confirmation && strategy != null && exisingStrategy != strategy.DerivationStrategyBase.ToString()) ||
+                              // - The user is clicking on continue without changing anything   
+                              (!vm.Confirmation && willBeExcluded == wasExcluded);
 
             showAddress = showAddress && strategy != null;
             if (!showAddress)
@@ -260,9 +172,10 @@ namespace BTCPayServer.Controllers
                 try
                 {
                     if (strategy != null)
-                        await wallet.TrackAsync(strategy.AccountDerivation);
+                        await wallet.TrackAsync(strategy.DerivationStrategyBase);
                     store.SetSupportedPaymentMethod(paymentMethodId, strategy);
-                    storeBlob.SetExcluded(paymentMethodId, willBeExcluded);
+                    storeBlob.SetExcluded(paymentMethodId, willBeExcluded);                    
+                    storeBlob.SetWalletKeyPathRoot(paymentMethodId, vm.KeyPath == null ? null : KeyPath.Parse(vm.KeyPath));
                     store.SetStoreBlob(storeBlob);
                 }
                 catch
@@ -272,14 +185,8 @@ namespace BTCPayServer.Controllers
                 }
 
                 await _Repo.UpdateStore(store);
-                if (oldConfig != vm.Config)
-                    StatusMessage = $"Derivation settings for {network.CryptoCode} has been modified.";
-                if (willBeExcluded != wasExcluded)
-                {
-                    var label = willBeExcluded ? "disabled" : "enabled";
-                    StatusMessage = $"On-Chain payments for {network.CryptoCode} has been {label}.";
-                }
-                return RedirectToAction(nameof(UpdateStore), new {storeId = storeId});
+                StatusMessage = $"Derivation scheme for {network.CryptoCode} has been modified.";
+                return RedirectToAction(nameof(UpdateStore), new { storeId = storeId });
             }
             else if (!string.IsNullOrEmpty(vm.HintAddress))
             {
@@ -296,43 +203,27 @@ namespace BTCPayServer.Controllers
 
                 try
                 {
-                    var newStrategy = ParseDerivationStrategy(vm.DerivationScheme, address.ScriptPubKey, network);
-                    if (newStrategy.AccountDerivation != strategy.AccountDerivation)
-                    {
-                        strategy.AccountDerivation = newStrategy.AccountDerivation;
-                        strategy.AccountOriginal = null;
-                    }
+                    strategy = ParseDerivationStrategy(vm.DerivationScheme, address.ScriptPubKey, network);
                 }
                 catch
                 {
                     ModelState.AddModelError(nameof(vm.HintAddress), "Impossible to find a match with this address");
                     return ShowAddresses(vm, strategy);
                 }
-
                 vm.HintAddress = "";
-                vm.StatusMessage =
-                    "Address successfully found, please verify that the rest is correct and click on \"Confirm\"";
+                vm.StatusMessage = "Address successfully found, please verify that the rest is correct and click on \"Confirm\"";
                 ModelState.Remove(nameof(vm.HintAddress));
                 ModelState.Remove(nameof(vm.DerivationScheme));
             }
-
             return ShowAddresses(vm, strategy);
         }
 
-        private async Task<string> ReadAllText(IFormFile file)
+        private IActionResult ShowAddresses(DerivationSchemeViewModel vm, DerivationStrategy strategy)
         {
-            using (var stream = new StreamReader(file.OpenReadStream()))
-            {
-                return await stream.ReadToEndAsync();
-            }
-        }
-
-        private IActionResult ShowAddresses(DerivationSchemeViewModel vm, DerivationSchemeSettings strategy)
-        {
-            vm.DerivationScheme = strategy.AccountDerivation.ToString();
+            vm.DerivationScheme = strategy.DerivationStrategyBase.ToString();
             if (!string.IsNullOrEmpty(vm.DerivationScheme))
             {
-                var line = strategy.AccountDerivation.GetLineFor(DerivationFeature.Deposit);
+                var line = strategy.DerivationStrategyBase.GetLineFor(DerivationFeature.Deposit);
 
                 for (int i = 0; i < 10; i++)
                 {
@@ -341,7 +232,6 @@ namespace BTCPayServer.Controllers
                 }
             }
             vm.Confirmation = true;
-            ModelState.Remove(nameof(vm.Config)); // Remove the cached value
             return View(vm);
         }
     }

BTCPayServer/Controllers/StoresController.Changelly.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net.Http;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Models.StoreViewModels;
@@ -78,7 +77,7 @@ namespace BTCPayServer.Controllers
                 case "test":
                     try
                     {
-                        var client = new Changelly(_httpClientFactory.CreateClient(), changellySettings.ApiKey, changellySettings.ApiSecret,
+                        var client = new Changelly(_httpClientFactory, changellySettings.ApiKey, changellySettings.ApiSecret,
                             changellySettings.ApiUrl);
                         var result = await client.GetCurrenciesFull();
                         vm.StatusMessage = "Test Successful";

BTCPayServer/Controllers/StoresController.CoinSwitch.cs

@@ -28,7 +28,6 @@ namespace BTCPayServer.Controllers
             vm.MerchantId = existing.MerchantId;
             vm.Enabled = existing.Enabled;
             vm.Mode = existing.Mode;
-            vm.AmountMarkupPercentage = existing.AmountMarkupPercentage;
         }
 
         [HttpPost]
@@ -51,8 +50,7 @@ namespace BTCPayServer.Controllers
             {
                 MerchantId =  vm.MerchantId,
                 Enabled = vm.Enabled,
-                Mode = vm.Mode,
-                AmountMarkupPercentage = vm.AmountMarkupPercentage
+                Mode = vm.Mode
             };
             
             switch (command)

BTCPayServer/Controllers/StoresController.LightningLike.cs

@@ -152,10 +152,10 @@ namespace BTCPayServer.Controllers
                     ModelState.AddModelError(nameof(vm.ConnectionString), "Missing url parameter");
                     return View(vm);
                 case "test":
-                    var handler = _ServiceProvider.GetRequiredService<LightningLikePaymentHandler>();
+                    var handler = (LightningLikePaymentHandler)_ServiceProvider.GetRequiredService<IPaymentMethodHandler<Payments.Lightning.LightningSupportedPaymentMethod>>();
                     try
                     {
-                        var info = await handler.GetNodeInfo(this.Request.IsOnion(), paymentMethod, network);
+                        var info = await handler.GetNodeInfo(paymentMethod, network);
                         if (!vm.SkipPortTest)
                         {
                             using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(20)))

BTCPayServer/Controllers/StoresController.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net.Http;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Authentication;
 using BTCPayServer.Configuration;
@@ -17,7 +16,6 @@ using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Rating;
 using BTCPayServer.Security;
 using BTCPayServer.Services;
-using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
 using BTCPayServer.Services.Wallets;
@@ -57,8 +55,7 @@ namespace BTCPayServer.Controllers
             LanguageService langService,
             ChangellyClientProvider changellyClientProvider,
             IOptions<MvcJsonOptions> mvcJsonOptions,
-            IHostingEnvironment env, IHttpClientFactory httpClientFactory,
-            PaymentMethodHandlerDictionary paymentMethodHandlerDictionary)
+            IHostingEnvironment env, IHttpClientFactory httpClientFactory)
         {
             _RateFactory = rateFactory;
             _Repo = repo;
@@ -71,7 +68,6 @@ namespace BTCPayServer.Controllers
             _WalletProvider = walletProvider;
             _Env = env;
             _httpClientFactory = httpClientFactory;
-            _paymentMethodHandlerDictionary = paymentMethodHandlerDictionary;
             _NetworkProvider = networkProvider;
             _ExplorerProvider = explorerProvider;
             _FeeRateProvider = feeRateProvider;
@@ -94,7 +90,6 @@ namespace BTCPayServer.Controllers
         private readonly ChangellyClientProvider _changellyClientProvider;
         IHostingEnvironment _Env;
         private IHttpClientFactory _httpClientFactory;
-        private readonly PaymentMethodHandlerDictionary _paymentMethodHandlerDictionary;
 
         [TempData]
         public string StatusMessage
@@ -193,39 +188,24 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [Route("{storeId}/rates")]
-        public IActionResult Rates(string storeId)
+        public IActionResult Rates()
         {
             var storeBlob = StoreData.GetStoreBlob();
             var vm = new RatesViewModel();
             vm.SetExchangeRates(GetSupportedExchanges(), storeBlob.PreferredExchange ?? CoinAverageRateProvider.CoinAverageName);
             vm.Spread = (double)(storeBlob.Spread * 100m);
-            vm.StoreId = storeId;
             vm.Script = storeBlob.GetRateRules(_NetworkProvider).ToString();
             vm.DefaultScript = storeBlob.GetDefaultRateRules(_NetworkProvider).ToString();
             vm.AvailableExchanges = GetSupportedExchanges();
-            vm.DefaultCurrencyPairs = storeBlob.GetDefaultCurrencyPairString();
             vm.ShowScripting = storeBlob.RateScripting;
             return View(vm);
         }
 
         [HttpPost]
         [Route("{storeId}/rates")]
-        public async Task<IActionResult> Rates(RatesViewModel model, string command = null, string storeId = null, CancellationToken cancellationToken = default)
+        public async Task<IActionResult> Rates(RatesViewModel model, string command = null)
         {
             model.SetExchangeRates(GetSupportedExchanges(), model.PreferredExchange);
-            model.StoreId = storeId ?? model.StoreId;
-            CurrencyPair[] currencyPairs = null;
-            try
-            {
-                currencyPairs = model.DefaultCurrencyPairs?
-                     .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
-                     .Select(p => CurrencyPair.Parse(p))
-                     .ToArray();
-            }
-            catch
-            {
-                ModelState.AddModelError(nameof(model.DefaultCurrencyPairs), "Invalid currency pairs (should be for example: BTC_USD,BTC_CAD,BTC_JPY)");
-            }
             if (!ModelState.IsValid)
             {
                 return View(model);
@@ -239,7 +219,7 @@ namespace BTCPayServer.Controllers
 
             blob.PreferredExchange = model.PreferredExchange;
             blob.Spread = (decimal)model.Spread / 100.0m;
-            blob.DefaultCurrencyPairs = currencyPairs;
+
             if (!model.ShowScripting)
             {
                 if (!GetSupportedExchanges().Select(c => c.Name).Contains(blob.PreferredExchange, StringComparer.OrdinalIgnoreCase))
@@ -287,7 +267,7 @@ namespace BTCPayServer.Controllers
                     pairs.Add(currencyPair);
                 }
 
-                var fetchs = _RateFactory.FetchRates(pairs.ToHashSet(), rules, cancellationToken);
+                var fetchs = _RateFactory.FetchRates(pairs.ToHashSet(), rules);
                 var testResults = new List<RatesViewModel.TestResultViewModel>();
                 foreach (var fetch in fetchs)
                 {
@@ -352,21 +332,19 @@ namespace BTCPayServer.Controllers
             var storeBlob = StoreData.GetStoreBlob();
             var vm = new CheckoutExperienceViewModel();
             SetCryptoCurrencies(vm, StoreData);
+            vm.SetLanguages(_LangService, storeBlob.DefaultLang);
+            vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
+            vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
+            vm.RequiresRefundEmail = storeBlob.RequiresRefundEmail;
             vm.CustomCSS = storeBlob.CustomCSS?.AbsoluteUri;
             vm.CustomLogo = storeBlob.CustomLogo?.AbsoluteUri;
             vm.HtmlTitle = storeBlob.HtmlTitle;
-            vm.SetLanguages(_LangService, storeBlob.DefaultLang);
-            vm.RequiresRefundEmail = storeBlob.RequiresRefundEmail;
-            vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
-            vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
-            vm.LightningAmountInSatoshi = storeBlob.LightningAmountInSatoshi;
-            vm.RedirectAutomatically = storeBlob.RedirectAutomatically;
             return View(vm);
         }
         void SetCryptoCurrencies(CheckoutExperienceViewModel vm, Data.StoreData storeData)
         {
             var choices = storeData.GetEnabledPaymentIds(_NetworkProvider)
-                                      .Select(o => new CheckoutExperienceViewModel.Format() { Name = _paymentMethodHandlerDictionary[o].ToPrettyString(o), Value = o.ToString(), PaymentId = o }).ToArray();
+                                      .Select(o => new CheckoutExperienceViewModel.Format() { Name = GetDisplayName(o), Value = o.ToString(), PaymentId = o }).ToArray();
 
             var defaultPaymentId = storeData.GetDefaultPaymentId(_NetworkProvider);
             var chosen = choices.FirstOrDefault(c => c.PaymentId == defaultPaymentId);
@@ -374,6 +352,13 @@ namespace BTCPayServer.Controllers
             vm.DefaultPaymentMethod = chosen?.Value;
         }
 
+        private string GetDisplayName(PaymentMethodId paymentMethodId)
+        {
+            var display = _NetworkProvider.GetNetwork(paymentMethodId.CryptoCode)?.DisplayName ?? paymentMethodId.CryptoCode;
+            return paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
+                display : $"{display} (Lightning)";
+        }
+
         [HttpPost]
         [Route("{storeId}/checkout")]
         public async Task<IActionResult> CheckoutExperience(CheckoutExperienceViewModel model)
@@ -410,15 +395,13 @@ namespace BTCPayServer.Controllers
             {
                 return View(model);
             }
+            blob.DefaultLang = model.DefaultLang;
+            blob.RequiresRefundEmail = model.RequiresRefundEmail;
+            blob.LightningMaxValue = lightningMaxValue;
+            blob.OnChainMinValue = onchainMinValue;
             blob.CustomLogo = string.IsNullOrWhiteSpace(model.CustomLogo) ? null : new Uri(model.CustomLogo, UriKind.Absolute);
             blob.CustomCSS = string.IsNullOrWhiteSpace(model.CustomCSS) ? null : new Uri(model.CustomCSS, UriKind.Absolute);
             blob.HtmlTitle = string.IsNullOrWhiteSpace(model.HtmlTitle) ? null : model.HtmlTitle;
-            blob.DefaultLang = model.DefaultLang;
-            blob.RequiresRefundEmail = model.RequiresRefundEmail;
-            blob.OnChainMinValue = onchainMinValue;
-            blob.LightningMaxValue = lightningMaxValue;
-            blob.LightningAmountInSatoshi = model.LightningAmountInSatoshi;
-            blob.RedirectAutomatically = model.RedirectAutomatically;
             if (StoreData.SetStoreBlob(blob))
             {
                 needUpdate = true;
@@ -467,40 +450,38 @@ namespace BTCPayServer.Controllers
             var derivationByCryptoCode =
                 store
                 .GetSupportedPaymentMethods(_NetworkProvider)
-                .OfType<DerivationSchemeSettings>()
+                .OfType<DerivationStrategy>()
                 .ToDictionary(c => c.Network.CryptoCode);
+            foreach (var network in _NetworkProvider.GetAll())
+            {
+                var strategy = derivationByCryptoCode.TryGet(network.CryptoCode);
+                vm.DerivationSchemes.Add(new StoreViewModel.DerivationScheme()
+                {
+                    Crypto = network.CryptoCode,
+                    Value = strategy?.DerivationStrategyBase?.ToString() ?? string.Empty,
+                    WalletId = new WalletId(store.Id, network.CryptoCode),
+                    Enabled = !excludeFilters.Match(new Payments.PaymentMethodId(network.CryptoCode, Payments.PaymentTypes.BTCLike))
+                });
+            }
 
             var lightningByCryptoCode = store
-                .GetSupportedPaymentMethods(_NetworkProvider)
-                .OfType<LightningSupportedPaymentMethod>()
-                .ToDictionary(c => c.CryptoCode);
+                                        .GetSupportedPaymentMethods(_NetworkProvider)
+                                        .OfType<Payments.Lightning.LightningSupportedPaymentMethod>()
+                                        .ToDictionary(c => c.CryptoCode);
 
-            foreach (var paymentMethodId in _paymentMethodHandlerDictionary.Distinct().SelectMany(handler => handler.GetSupportedPaymentMethods()))
+            foreach (var network in _NetworkProvider.GetAll())
             {
-                 switch (paymentMethodId.PaymentType)
+                var lightning = lightningByCryptoCode.TryGet(network.CryptoCode);
+                var paymentId = new Payments.PaymentMethodId(network.CryptoCode, Payments.PaymentTypes.LightningLike);
+                vm.LightningNodes.Add(new StoreViewModel.LightningNode()
                 {
-                    case PaymentTypes.BTCLike:
-                        var strategy = derivationByCryptoCode.TryGet(paymentMethodId.CryptoCode);
-                        vm.DerivationSchemes.Add(new StoreViewModel.DerivationScheme()
-                        {
-                            Crypto = paymentMethodId.CryptoCode,
-                            Value = strategy?.ToPrettyString() ?? string.Empty,
-                            WalletId = new WalletId(store.Id, paymentMethodId.CryptoCode),
-                            Enabled = !excludeFilters.Match(paymentMethodId)
-                        });
-                        break;
-                    case PaymentTypes.LightningLike:
-                        var lightning = lightningByCryptoCode.TryGet(paymentMethodId.CryptoCode);
-                        vm.LightningNodes.Add(new StoreViewModel.LightningNode()
-                        {
-                            CryptoCode = paymentMethodId.CryptoCode,
-                            Address = lightning?.GetLightningUrl()?.BaseUri.AbsoluteUri ?? string.Empty,
-                            Enabled = !excludeFilters.Match(paymentMethodId)
-                        });
-                        break;
-                }   
+                    CryptoCode = network.CryptoCode,
+                    Address = lightning?.GetLightningUrl()?.BaseUri.AbsoluteUri ?? string.Empty,
+                    Enabled = !excludeFilters.Match(paymentId)
+                });
             }
 
+
             var changellyEnabled = storeBlob.ChangellySettings != null && storeBlob.ChangellySettings.Enabled;
             vm.ThirdPartyPaymentMethods.Add(new StoreViewModel.ThirdPartyPaymentMethod()
             {
@@ -508,7 +489,7 @@ namespace BTCPayServer.Controllers
                 Action = nameof(UpdateChangellySettings),
                 Provider = "Changelly"
             });
-
+            
             var coinSwitchEnabled = storeBlob.CoinSwitchSettings != null && storeBlob.CoinSwitchSettings.Enabled;
             vm.ThirdPartyPaymentMethods.Add(new StoreViewModel.ThirdPartyPaymentMethod()
             {
@@ -595,11 +576,11 @@ namespace BTCPayServer.Controllers
                     .ToArray();
         }
 
-        private DerivationSchemeSettings ParseDerivationStrategy(string derivationScheme, Script hint, BTCPayNetwork network)
+        private DerivationStrategy ParseDerivationStrategy(string derivationScheme, Script hint, BTCPayNetwork network)
         {
-            var parser = new DerivationSchemeParser(network);
+            var parser = new DerivationSchemeParser(network.NBitcoinNetwork);
             parser.HintScriptPubKey = hint;
-            return new DerivationSchemeSettings(parser.Parse(derivationScheme), network);
+            return new DerivationStrategy(parser.Parse(derivationScheme), network);
         }
 
         [HttpGet]
@@ -612,6 +593,7 @@ namespace BTCPayServer.Controllers
             model.StoreNotConfigured = StoreNotConfigured;
             model.Tokens = tokens.Select(t => new TokenViewModel()
             {
+                Facade = t.Facade,
                 Label = t.Label,
                 SIN = t.SIN,
                 Id = t.Value
@@ -696,6 +678,7 @@ namespace BTCPayServer.Controllers
 
             var tokenRequest = new TokenRequest()
             {
+                Facade = model.Facade,
                 Label = model.Label,
                 Id = model.PublicKey == null ? null : NBitpayClient.Extensions.BitIdExtensions.GetBitIDSIN(new PubKey(model.PublicKey))
             };
@@ -707,6 +690,7 @@ namespace BTCPayServer.Controllers
                 await _TokenRepository.UpdatePairingCode(new PairingCodeEntity()
                 {
                     Id = tokenRequest.PairingCode,
+                    Facade = model.Facade,
                     Label = model.Label,
                 });
                 await _TokenRepository.PairWithStoreAsync(tokenRequest.PairingCode, storeId);
@@ -746,6 +730,7 @@ namespace BTCPayServer.Controllers
                 }
             }
             var model = new CreateTokenViewModel();
+            model.Facade = "merchant";
             ViewBag.HidePublicKey = storeId == null;
             ViewBag.ShowStores = storeId == null;
             ViewBag.ShowMenu = storeId != null;
@@ -797,6 +782,7 @@ namespace BTCPayServer.Controllers
                 return View(new PairingModel()
                 {
                     Id = pairing.Id,
+                    Facade = pairing.Facade,
                     Label = pairing.Label,
                     SIN = pairing.SIN ?? "Server-Initiated Pairing",
                     SelectedStore = selectedStore ?? stores.FirstOrDefault()?.Id,
@@ -887,11 +873,7 @@ namespace BTCPayServer.Controllers
                 ButtonSize = 2,
                 UrlRoot = appUrl,
                 PayButtonImageUrl = appUrl + "img/paybutton/pay.png",
-                StoreId = store.Id,
-                ButtonType = 0,
-                Min = 1,
-                Max = 20,
-                Step = 1
+                StoreId = store.Id
             };
             return View(model);
         }

BTCPayServer/Controllers/WalletsController.PSBT.cs

@@ -1,354 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.ModelBinders;
-using BTCPayServer.Models.WalletViewModels;
-using Microsoft.AspNetCore.Mvc;
-using NBitcoin;
-using NBXplorer.Models;
-
-namespace BTCPayServer.Controllers
-{
-    public partial class WalletsController
-    {
-
-        [NonAction]
-        public async Task<CreatePSBTResponse> CreatePSBT(BTCPayNetwork network, DerivationSchemeSettings derivationSettings, WalletSendModel sendModel, CancellationToken cancellationToken)
-        {
-            var nbx = ExplorerClientProvider.GetExplorerClient(network);
-            CreatePSBTRequest psbtRequest = new CreatePSBTRequest();
-
-            foreach (var transactionOutput in sendModel.Outputs)
-            {
-                var psbtDestination = new CreatePSBTDestination();
-                psbtRequest.Destinations.Add(psbtDestination);
-                psbtDestination.Destination = BitcoinAddress.Create(transactionOutput.DestinationAddress, network.NBitcoinNetwork);
-                psbtDestination.Amount = Money.Coins(transactionOutput.Amount.Value);
-                psbtDestination.SubstractFees = transactionOutput.SubtractFeesFromOutput;
-            }
-           
-            if (network.SupportRBF)
-            {
-                psbtRequest.RBF = !sendModel.DisableRBF;
-            }
-           
-            psbtRequest.FeePreference = new FeePreference();
-            psbtRequest.FeePreference.ExplicitFeeRate = new FeeRate(Money.Satoshis(sendModel.FeeSatoshiPerByte), 1);
-            if (sendModel.NoChange)
-            {
-                psbtRequest.ExplicitChangeAddress = psbtRequest.Destinations.First().Destination;
-            }
-           
-            var psbt = (await nbx.CreatePSBTAsync(derivationSettings.AccountDerivation, psbtRequest, cancellationToken));
-            if (psbt == null)
-                throw new NotSupportedException("You need to update your version of NBXplorer");
-            return psbt;
-        }
-
-        [HttpGet]
-        [Route("{walletId}/psbt")]
-        public async Task<IActionResult> WalletPSBT([ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, WalletPSBTViewModel vm)
-        {
-            var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            if (await vm.GetPSBT(network.NBitcoinNetwork) is PSBT psbt)
-            {
-                vm.Decoded = psbt.ToString();
-                vm.PSBT = psbt.ToBase64();
-            }
-            return View(vm ?? new WalletPSBTViewModel());
-        }
-        [HttpPost]
-        [Route("{walletId}/psbt")]
-        public async Task<IActionResult> WalletPSBT(
-            [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId,
-            WalletPSBTViewModel vm, string command = null)
-        {
-            var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            var psbt = await vm.GetPSBT(network.NBitcoinNetwork);
-            if (psbt == null)
-            {
-                ModelState.AddModelError(nameof(vm.PSBT), "Invalid PSBT");
-                return View(vm);
-            }
-            switch (command)
-            {
-                case null:
-                    vm.Decoded = psbt.ToString();
-                    ModelState.Remove(nameof(vm.PSBT));
-                    ModelState.Remove(nameof(vm.FileName));
-                    ModelState.Remove(nameof(vm.UploadedPSBTFile));
-                    vm.PSBT = psbt.ToBase64();
-                    vm.FileName = vm.UploadedPSBTFile?.FileName;
-                    return View(vm);
-                case "ledger":
-                    return ViewWalletSendLedger(psbt);
-                case "update":
-                    var derivationSchemeSettings = await GetDerivationSchemeSettings(walletId);
-                    psbt = await UpdatePSBT(derivationSchemeSettings, psbt, network);
-                    if (psbt == null)
-                    {
-                        ModelState.AddModelError(nameof(vm.PSBT), "You need to update your version of NBXplorer");
-                        return View(vm);
-                    }
-                    StatusMessage = "PSBT updated!";
-                    return RedirectToAction(nameof(WalletPSBT), new { walletId = walletId, psbt = psbt.ToBase64(), FileName = vm.FileName });
-                case "seed":
-                    return SignWithSeed(walletId, psbt.ToBase64());
-                case "broadcast":
-                {
-                    return await WalletPSBTReady(walletId, psbt.ToBase64());
-                }
-                case "combine":
-                    ModelState.Remove(nameof(vm.PSBT));
-                    return View(nameof(WalletPSBTCombine), new WalletPSBTCombineViewModel() { OtherPSBT = psbt.ToBase64() });
-                case "save-psbt":
-                    return FilePSBT(psbt, vm.FileName);
-                default:
-                    return View(vm);
-            }
-        }
-
-        private async Task<PSBT> UpdatePSBT(DerivationSchemeSettings derivationSchemeSettings, PSBT psbt, BTCPayNetwork network)
-        {
-            var result = await ExplorerClientProvider.GetExplorerClient(network).UpdatePSBTAsync(new UpdatePSBTRequest()
-            {
-                PSBT = psbt,
-                DerivationScheme = derivationSchemeSettings.AccountDerivation,
-            });
-            if (result == null)
-                return null;
-            derivationSchemeSettings.RebaseKeyPaths(result.PSBT);
-            return result.PSBT;
-        }
-
-        [HttpGet]
-        [Route("{walletId}/psbt/ready")]
-        public async Task<IActionResult> WalletPSBTReady(
-            [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, string psbt = null, 
-            string signingKey = null,
-            string signingKeyPath = null)
-        {
-            var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            var vm = new WalletPSBTReadyViewModel() { PSBT = psbt };
-            vm.SigningKey = signingKey;
-            vm.SigningKeyPath = signingKeyPath;
-
-            var derivationSchemeSettings = await GetDerivationSchemeSettings(walletId);
-            if (derivationSchemeSettings == null)
-                return NotFound();
-            await FetchTransactionDetails(derivationSchemeSettings, vm, network);
-            return View(nameof(WalletPSBTReady), vm);
-        }
-
-        private async Task FetchTransactionDetails(DerivationSchemeSettings derivationSchemeSettings, WalletPSBTReadyViewModel vm, BTCPayNetwork network)
-        {
-            var psbtObject = PSBT.Parse(vm.PSBT, network.NBitcoinNetwork);
-            psbtObject = await UpdatePSBT(derivationSchemeSettings, psbtObject, network) ?? psbtObject;
-            IHDKey signingKey = null;
-            RootedKeyPath signingKeyPath = null;
-            try
-            {
-                signingKey = new BitcoinExtPubKey(vm.SigningKey, network.NBitcoinNetwork);
-            }
-            catch { }
-            try
-            {
-                signingKey = signingKey ?? new BitcoinExtKey(vm.SigningKey, network.NBitcoinNetwork);
-            }
-            catch { }
-
-            try
-            {
-                signingKeyPath = RootedKeyPath.Parse(vm.SigningKeyPath);
-            }
-            catch { }
-
-            if (signingKey == null || signingKeyPath == null)
-            {
-                var signingKeySettings = derivationSchemeSettings.GetSigningAccountKeySettings();
-                if (signingKey == null)
-                {
-                    signingKey = signingKeySettings.AccountKey;
-                    vm.SigningKey = signingKey.ToString();
-                }
-                if (vm.SigningKeyPath == null)
-                {
-                    signingKeyPath = signingKeySettings.GetRootedKeyPath();
-                    vm.SigningKeyPath = signingKeyPath?.ToString();
-                }
-            }
-
-            if (psbtObject.IsAllFinalized())
-            {
-                vm.CanCalculateBalance = false;
-            }
-            else
-            {
-                var balanceChange = psbtObject.GetBalance(derivationSchemeSettings.AccountDerivation, signingKey, signingKeyPath);
-                vm.BalanceChange = ValueToString(balanceChange, network);
-                vm.CanCalculateBalance = true;
-                vm.Positive = balanceChange >= Money.Zero;
-            }
-
-            foreach (var input in psbtObject.Inputs)
-            {
-                var inputVm = new WalletPSBTReadyViewModel.InputViewModel();
-                vm.Inputs.Add(inputVm);
-                var mine = input.HDKeysFor(derivationSchemeSettings.AccountDerivation, signingKey, signingKeyPath).Any();
-                var balanceChange2 = input.GetTxOut()?.Value ?? Money.Zero;
-                if (mine)
-                    balanceChange2 = -balanceChange2;
-                inputVm.BalanceChange = ValueToString(balanceChange2, network);
-                inputVm.Positive = balanceChange2 >= Money.Zero;
-                inputVm.Index = (int)input.Index;
-            }
-
-            foreach (var output in psbtObject.Outputs)
-            {
-                var dest = new WalletPSBTReadyViewModel.DestinationViewModel();
-                vm.Destinations.Add(dest);
-                var mine = output.HDKeysFor(derivationSchemeSettings.AccountDerivation, signingKey, signingKeyPath).Any();
-                var balanceChange2 = output.Value;
-                if (!mine)
-                    balanceChange2 = -balanceChange2;
-                dest.Balance = ValueToString(balanceChange2, network);
-                dest.Positive = balanceChange2 >= Money.Zero;
-                dest.Destination = output.ScriptPubKey.GetDestinationAddress(network.NBitcoinNetwork)?.ToString() ?? output.ScriptPubKey.ToString();
-            }
-
-            if (psbtObject.TryGetFee(out var fee))
-            {
-                vm.Destinations.Add(new WalletPSBTReadyViewModel.DestinationViewModel()
-                {
-                    Positive = false,
-                    Balance = ValueToString(- fee, network),
-                    Destination = "Mining fees"
-                });
-            }
-            if (psbtObject.TryGetEstimatedFeeRate(out var feeRate))
-            {
-                vm.FeeRate = feeRate.ToString();
-            }
-
-            var sanityErrors = psbtObject.CheckSanity();
-            if (sanityErrors.Count != 0)
-            {
-                vm.SetErrors(sanityErrors);
-            }
-            else if (!psbtObject.IsAllFinalized() && !psbtObject.TryFinalize(out var errors))
-            {
-                vm.SetErrors(errors);
-            }
-        }
-
-        [HttpPost]
-        [Route("{walletId}/psbt/ready")]
-        public async Task<IActionResult> WalletPSBTReady(
-            [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, WalletPSBTReadyViewModel vm, string command = null)
-        {
-            PSBT psbt = null;
-            var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            try
-            {
-                psbt = PSBT.Parse(vm.PSBT, network.NBitcoinNetwork);
-                var derivationSchemeSettings = await GetDerivationSchemeSettings(walletId);
-                if (derivationSchemeSettings == null)
-                    return NotFound();
-                await FetchTransactionDetails(derivationSchemeSettings, vm, network);
-            }
-            catch
-            {
-                vm.GlobalError = "Invalid PSBT";
-                return View(vm);
-            }
-            if (command == "broadcast")
-            {
-                if (!psbt.IsAllFinalized() && !psbt.TryFinalize(out var errors))
-                {
-                    vm.SetErrors(errors);
-                    return View(vm);
-                }
-                var transaction = psbt.ExtractTransaction();
-                try
-                {
-                    var broadcastResult = await ExplorerClientProvider.GetExplorerClient(network).BroadcastAsync(transaction);
-                    if (!broadcastResult.Success)
-                    {
-                        vm.GlobalError = $"RPC Error while broadcasting: {broadcastResult.RPCCode} {broadcastResult.RPCCodeMessage} {broadcastResult.RPCMessage}";
-                        return View(vm);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    vm.GlobalError = "Error while broadcasting: " + ex.Message;
-                    return View(vm);
-                }
-                return await RedirectToWalletTransaction(walletId, transaction);
-            }
-            else if (command == "analyze-psbt")
-            {
-                return RedirectToAction(nameof(WalletPSBT), new { walletId = walletId, psbt = psbt.ToBase64() });
-            }
-            else
-            {
-                vm.GlobalError = "Unknown command";
-                return View(vm);
-            }
-        }
-
-        private IActionResult ViewPSBT<T>(PSBT psbt, IEnumerable<T> errors = null)
-        {
-            return ViewPSBT(psbt, null, errors?.Select(e => e.ToString()).ToList());
-        }
-        private IActionResult ViewPSBT(PSBT psbt, IEnumerable<string> errors = null)
-        {
-            return ViewPSBT(psbt, null, errors);
-        }
-        private IActionResult ViewPSBT(PSBT psbt, string fileName, IEnumerable<string> errors = null)
-        {
-            ModelState.Remove(nameof(WalletPSBTViewModel.PSBT));
-            ModelState.Remove(nameof(WalletPSBTViewModel.FileName));
-            return View(nameof(WalletPSBT), new WalletPSBTViewModel()
-            {
-                Decoded = psbt.ToString(),
-                FileName = fileName ?? string.Empty,
-                PSBT = psbt.ToBase64(),
-                Errors = errors?.ToList()
-            });
-        }
-
-        private IActionResult FilePSBT(PSBT psbt, string fileName)
-        {
-            return File(psbt.ToBytes(), "application/octet-stream", fileName);
-        }
-
-        [HttpPost]
-        [Route("{walletId}/psbt/combine")]
-        public async Task<IActionResult> WalletPSBTCombine([ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, WalletPSBTCombineViewModel vm)
-        {
-            var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            var psbt = await vm.GetPSBT(network.NBitcoinNetwork);
-            if (psbt == null)
-            {
-                ModelState.AddModelError(nameof(vm.PSBT), "Invalid PSBT");
-                return View(vm);
-            }
-            var sourcePSBT = vm.GetSourcePSBT(network.NBitcoinNetwork);
-            if (sourcePSBT == null)
-            {
-                ModelState.AddModelError(nameof(vm.OtherPSBT), "Invalid PSBT");
-                return View(vm);
-            }
-            sourcePSBT = sourcePSBT.Combine(psbt);
-            StatusMessage = "PSBT Successfully combined!";
-            return ViewPSBT(sourcePSBT);
-        }
-    }
-}

BTCPayServer/Controllers/WalletsController.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.Linq;
 using System.Net.WebSockets;
@@ -22,10 +21,8 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.Extensions.Options;
 using NBitcoin;
-using NBitcoin.DataEncoders;
 using NBXplorer.DerivationStrategy;
 using NBXplorer.Models;
 using Newtonsoft.Json;
@@ -83,9 +80,9 @@ namespace BTCPayServer.Controllers
 
             var onChainWallets = stores
                                 .SelectMany(s => s.GetSupportedPaymentMethods(NetworkProvider)
-                                              .OfType<DerivationSchemeSettings>()
+                                              .OfType<DerivationStrategy>()
                                               .Select(d => ((Wallet: _walletProvider.GetWallet(d.Network),
-                                                            DerivationStrategy: d.AccountDerivation,
+                                                            DerivationStrategy: d.DerivationStrategyBase,
                                                             Network: d.Network)))
                                               .Where(_ => _.Wallet != null)
                                               .Select(_ => (Wallet: _.Wallet,
@@ -120,12 +117,13 @@ namespace BTCPayServer.Controllers
             [ModelBinder(typeof(WalletIdModelBinder))]
             WalletId walletId)
         {
-            DerivationSchemeSettings paymentMethod = await GetDerivationSchemeSettings(walletId);
+            var store = await Repository.FindStore(walletId.StoreId, GetUserId());
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
             if (paymentMethod == null)
                 return NotFound();
 
             var wallet = _walletProvider.GetWallet(paymentMethod.Network);
-            var transactions = await wallet.FetchTransactions(paymentMethod.AccountDerivation);
+            var transactions = await wallet.FetchTransactions(paymentMethod.DerivationStrategyBase);
 
             var model = new ListTransactionsViewModel();
             foreach (var tx in transactions.UnconfirmedTransactions.Transactions.Concat(transactions.ConfirmedTransactions.Transactions))
@@ -148,49 +146,42 @@ namespace BTCPayServer.Controllers
         [Route("{walletId}/send")]
         public async Task<IActionResult> WalletSend(
             [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, string defaultDestination = null, string defaultAmount = null)
+            WalletId walletId, string defaultDestination = null, string defaultAmount = null, bool advancedMode = false)
         {
             if (walletId?.StoreId == null)
                 return NotFound();
             var store = await Repository.FindStore(walletId.StoreId, GetUserId());
-            DerivationSchemeSettings paymentMethod = GetDerivationSchemeSettings(walletId, store);
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
             if (paymentMethod == null)
                 return NotFound();
-            var network = this.NetworkProvider.GetNetwork<BTCPayNetwork>(walletId?.CryptoCode);
+            var network = this.NetworkProvider.GetNetwork(walletId?.CryptoCode);
             if (network == null)
                 return NotFound();
             var storeData = store.GetStoreBlob();
             var rateRules = store.GetStoreBlob().GetRateRules(NetworkProvider);
             rateRules.Spread = 0.0m;
             var currencyPair = new Rating.CurrencyPair(paymentMethod.PaymentId.CryptoCode, GetCurrencyCode(storeData.DefaultLang) ?? "USD");
-            double.TryParse(defaultAmount, out var amount);
-           var model = new WalletSendModel()
+            WalletSendModel model = new WalletSendModel()
             {
-                Outputs = new List<WalletSendModel.TransactionOutput>()
-                {
-                    new WalletSendModel.TransactionOutput()
-                    {
-                        Amount = Convert.ToDecimal(amount),
-                        DestinationAddress = defaultDestination
-                    }
-                },
+                Destination = defaultDestination,
                 CryptoCode = walletId.CryptoCode
             };
-            
+            if (double.TryParse(defaultAmount, out var amount))
+                model.Amount = (decimal)amount;
 
             var feeProvider = _feeRateProvider.CreateFeeProvider(network);
             var recommendedFees = feeProvider.GetFeeRateAsync();
-            var balance = _walletProvider.GetWallet(network).GetBalance(paymentMethod.AccountDerivation);
+            var balance = _walletProvider.GetWallet(network).GetBalance(paymentMethod.DerivationStrategyBase);
             model.CurrentBalance = (await balance).ToDecimal(MoneyUnit.BTC);
             model.RecommendedSatoshiPerByte = (int)(await recommendedFees).GetFee(1).Satoshi;
             model.FeeSatoshiPerByte = model.RecommendedSatoshiPerByte;
-            model.SupportRBF = network.SupportRBF;
+
             using (CancellationTokenSource cts = new CancellationTokenSource())
             {
                 try
                 {
                     cts.CancelAfter(TimeSpan.FromSeconds(5));
-                    var result = await RateFetcher.FetchRate(currencyPair, rateRules, cts.Token).WithCancellation(cts.Token);
+                    var result = await RateFetcher.FetchRate(currencyPair, rateRules).WithCancellation(cts.Token);
                     if (result.BidAsk != null)
                     {
                         model.Rate = result.BidAsk.Center;
@@ -204,6 +195,7 @@ namespace BTCPayServer.Controllers
                 }
                 catch (Exception ex) { model.RateError = ex.Message; }
             }
+            model.AdvancedMode = advancedMode;
             return View(model);
         }
 
@@ -211,211 +203,64 @@ namespace BTCPayServer.Controllers
         [Route("{walletId}/send")]
         public async Task<IActionResult> WalletSend(
             [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, WalletSendModel vm, string command = "", CancellationToken cancellation = default)
+            WalletId walletId, WalletSendModel vm, string command = null)
         {
             if (walletId?.StoreId == null)
                 return NotFound();
             var store = await Repository.FindStore(walletId.StoreId, GetUserId());
             if (store == null)
                 return NotFound();
-            var network = this.NetworkProvider.GetNetwork<BTCPayNetwork>(walletId?.CryptoCode);
+            var network = this.NetworkProvider.GetNetwork(walletId?.CryptoCode);
             if (network == null)
                 return NotFound();
-            vm.SupportRBF = network.SupportRBF;
-            decimal transactionAmountSum  = 0;
-            
-            if (command == "add-output")
+
+            if (command == "noob" || command == "expert")
             {
                 ModelState.Clear();
-                vm.Outputs.Add(new WalletSendModel.TransactionOutput());
-                return View(vm);
-            }
-            if (command.StartsWith("remove-output", StringComparison.InvariantCultureIgnoreCase))
-            {
-                ModelState.Clear();
-                var index = int.Parse(command.Substring(command.IndexOf(":",StringComparison.InvariantCultureIgnoreCase) + 1),  CultureInfo.InvariantCulture);
-                vm.Outputs.RemoveAt(index);
-                return View(vm);
-            }
-            
-
-            if (!vm.Outputs.Any())
-            {
-                ModelState.AddModelError(string.Empty,
-                    "Please add at least one transaction output");
+                vm.AdvancedMode = command == "expert";
                 return View(vm);
             }
 
-            var subtractFeesOutputsCount = new List<int>();
-            var substractFees = vm.Outputs.Any(o => o.SubtractFeesFromOutput);
-            for (var i = 0; i < vm.Outputs.Count; i++)
+            var destination = ParseDestination(vm.Destination, network.NBitcoinNetwork);
+            if (destination == null)
+                ModelState.AddModelError(nameof(vm.Destination), "Invalid address");
+
+            if (vm.Amount.HasValue)
             {
-                var transactionOutput = vm.Outputs[i];
-                if (transactionOutput.SubtractFeesFromOutput)
-                {
-                    subtractFeesOutputsCount.Add(i);
-                }
-                var destination = ParseDestination(transactionOutput.DestinationAddress, network.NBitcoinNetwork);
-                if (destination == null)
-                    ModelState.AddModelError(nameof(transactionOutput.DestinationAddress), "Invalid address");
-
-                if (transactionOutput.Amount.HasValue)
-                {
-                    transactionAmountSum += transactionOutput.Amount.Value;
-
-                    if (vm.CurrentBalance == transactionOutput.Amount.Value &&
-                        !transactionOutput.SubtractFeesFromOutput)
-                        vm.AddModelError(model => model.Outputs[i].SubtractFeesFromOutput,
-                            "You are sending your entire balance to the same destination, you should subtract the fees",
-                            ModelState);
-                }
+                if (vm.CurrentBalance == vm.Amount.Value && !vm.SubstractFees)
+                    ModelState.AddModelError(nameof(vm.Amount), "You are sending all your balance to the same destination, you should substract the fees");
+                if (vm.CurrentBalance < vm.Amount.Value)
+                    ModelState.AddModelError(nameof(vm.Amount), "You are sending more than what you own");
             }
-
-            if (subtractFeesOutputsCount.Count > 1)
-            {
-                foreach (var subtractFeesOutput in subtractFeesOutputsCount)
-                {
-                    vm.AddModelError(model => model.Outputs[subtractFeesOutput].SubtractFeesFromOutput,
-                        "You can only subtract fees from one output", ModelState);
-                }
-            }else if (vm.CurrentBalance == transactionAmountSum && !substractFees)
-            {
-                ModelState.AddModelError(string.Empty,
-                    "You are sending your entire balance, you should subtract the fees from an output");
-            }
-
-            if (vm.CurrentBalance < transactionAmountSum)
-            {
-                for (var i = 0; i < vm.Outputs.Count; i++)
-                {
-                    vm.AddModelError(model => model.Outputs[i].Amount,
-                        "You are sending more than what you own", ModelState);
-                }
-            }
-
             if (!ModelState.IsValid)
                 return View(vm);
 
-            DerivationSchemeSettings derivationScheme = await GetDerivationSchemeSettings(walletId);
-
-            CreatePSBTResponse psbt = null;
-            try
+            return RedirectToAction(nameof(WalletSendLedger), new WalletSendLedgerModel()
             {
-                psbt = await CreatePSBT(network, derivationScheme, vm, cancellation);
-            }
-            catch (NBXplorerException ex)
-            {
-                ModelState.AddModelError(string.Empty, ex.Error.Message);
-                return View(vm);
-            }
-            catch (NotSupportedException)
-            {
-                ModelState.AddModelError(string.Empty, "You need to update your version of NBXplorer");
-                return View(vm);
-            }
-            derivationScheme.RebaseKeyPaths(psbt.PSBT);
-            
-            switch (command)
-            {
-                case "ledger":
-                    return ViewWalletSendLedger(psbt.PSBT, psbt.ChangeAddress);
-                case "seed":
-                    return SignWithSeed(walletId, psbt.PSBT.ToBase64());
-                case "analyze-psbt":
-                    var name =
-                        $"Send-{string.Join('_', vm.Outputs.Select(output => $"{output.Amount}->{output.DestinationAddress}{(output.SubtractFeesFromOutput ? "-Fees" : string.Empty)}"))}.psbt";
-                    return RedirectToAction(nameof(WalletPSBT), new { walletId = walletId, psbt = psbt.PSBT.ToBase64(), FileName = name });
-                default:
-                    return View(vm);
-            }
-            
-        }
-
-        private ViewResult ViewWalletSendLedger(PSBT psbt, BitcoinAddress hintChange = null)
-        {
-            return View("WalletSendLedger", new WalletSendLedgerModel()
-            {
-                PSBT = psbt.ToBase64(),
-                HintChange = hintChange?.ToString(),
-                WebsocketPath = this.Url.Action(nameof(LedgerConnection)),
-                SuccessPath = this.Url.Action(nameof(WalletPSBTReady))
-            });
-        }
-      
-        [HttpGet("{walletId}/psbt/seed")]
-        public IActionResult SignWithSeed([ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId,string psbt)
-        {
-            return View(nameof(SignWithSeed), new SignWithSeedViewModel()
-            {
-                PSBT = psbt
+                Destination = vm.Destination,
+                Amount = vm.Amount.Value,
+                SubstractFees = vm.SubstractFees,
+                FeeSatoshiPerByte = vm.FeeSatoshiPerByte,
+                NoChange = vm.NoChange
             });
         }
 
-        [HttpPost("{walletId}/psbt/seed")]
-        public async Task<IActionResult> SignWithSeed([ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, SignWithSeedViewModel viewModel)
+        [HttpGet]
+        [Route("{walletId}/send/ledger")]
+        public async Task<IActionResult> WalletSendLedger(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId, WalletSendLedgerModel vm)
         {
-            if (!ModelState.IsValid)
-            {
-                return View(viewModel);
-            }
-            var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
+            if (walletId?.StoreId == null)
+                return NotFound();
+            var store = await Repository.FindStore(walletId.StoreId, GetUserId());
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
+            if (paymentMethod == null)
+                return NotFound();
+            var network = this.NetworkProvider.GetNetwork(walletId?.CryptoCode);
             if (network == null)
-                throw new FormatException("Invalid value for crypto code");
-
-            ExtKey extKey = viewModel.GetExtKey(network.NBitcoinNetwork);
-
-            if (extKey == null)
-            {
-                ModelState.AddModelError(nameof(viewModel.SeedOrKey),
-                    "Seed or Key was not in a valid format. It is either the 12/24 words or starts with xprv");
-            }
-
-            var psbt = PSBT.Parse(viewModel.PSBT, network.NBitcoinNetwork);
-
-            if (!psbt.IsReadyToSign())
-            {
-                ModelState.AddModelError(nameof(viewModel.PSBT), "PSBT is not ready to be signed");
-            }
-
-            if (!ModelState.IsValid)
-            {
-                return View(viewModel);
-            }
-
-            ExtKey signingKey = null;
-            var settings = (await GetDerivationSchemeSettings(walletId));
-            var signingKeySettings = settings.GetSigningAccountKeySettings();
-            if (signingKeySettings.RootFingerprint is null)
-                signingKeySettings.RootFingerprint = extKey.GetPublicKey().GetHDFingerPrint();
-
-            RootedKeyPath rootedKeyPath = signingKeySettings.GetRootedKeyPath();
-            // The user gave the root key, let's try to rebase the PSBT, and derive the account private key
-            if (rootedKeyPath?.MasterFingerprint == extKey.GetPublicKey().GetHDFingerPrint())
-            {
-                psbt.RebaseKeyPaths(signingKeySettings.AccountKey, rootedKeyPath);
-                signingKey = extKey.Derive(rootedKeyPath.KeyPath);
-            }
-            // The user maybe gave the account key, let's try to sign with it
-            else
-            {
-                signingKey = extKey;
-            }
-            var balanceChange = psbt.GetBalance(settings.AccountDerivation, signingKey, rootedKeyPath);
-            if (balanceChange == Money.Zero)
-            {
-                ModelState.AddModelError(nameof(viewModel.SeedOrKey), "This seed does not seem to be able to sign this transaction. Either this is the wrong key, or Wallet Settings have not the correct account path in the wallet settings.");
-                return View(viewModel);
-            }
-            psbt.SignAll(settings.AccountDerivation, signingKey, rootedKeyPath);
-            ModelState.Remove(nameof(viewModel.PSBT));
-            return await WalletPSBTReady(walletId, psbt.ToBase64(), signingKey.GetWif(network.NBitcoinNetwork).ToString(), rootedKeyPath.ToString());
-        }
-
-        private string ValueToString(Money v, BTCPayNetworkBase network)
-        {
-            return v.ToString() + " " + network.CryptoCode;
+                return NotFound();
+            return View(vm);
         }
 
         private IDestination[] ParseDestination(string destination, Network network)
@@ -431,19 +276,6 @@ namespace BTCPayServer.Controllers
             }
         }
 
-        private async Task<IActionResult> RedirectToWalletTransaction(WalletId walletId, Transaction transaction)
-        {
-            var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            if (transaction != null)
-            {
-                var wallet = _walletProvider.GetWallet(network);
-                var derivationSettings = await GetDerivationSchemeSettings(walletId);
-                wallet.InvalidateCache(derivationSettings.AccountDerivation);
-                StatusMessage = $"Transaction broadcasted successfully ({transaction.GetHash().ToString()})";
-            }
-            return RedirectToAction(nameof(WalletTransactions));
-        }
-
         [HttpGet]
         [Route("{walletId}/rescan")]
         public async Task<IActionResult> WalletRescan(
@@ -452,16 +284,20 @@ namespace BTCPayServer.Controllers
         {
             if (walletId?.StoreId == null)
                 return NotFound();
-            DerivationSchemeSettings paymentMethod = await GetDerivationSchemeSettings(walletId);
+            var store = await Repository.FindStore(walletId.StoreId, GetUserId());
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
             if (paymentMethod == null)
                 return NotFound();
 
             var vm = new RescanWalletModel();
             vm.IsFullySync = _dashboard.IsFullySynched(walletId.CryptoCode, out var unused);
+            // We need to ensure it is segwit, 
+            // because hardware wallet support need the parent transactions to sign, which NBXplorer don't have. (Nor does a pruned node)
+            vm.IsSegwit = paymentMethod.DerivationStrategyBase.IsSegwit();
             vm.IsServerAdmin = User.Claims.Any(c => c.Type == Policies.CanModifyServerSettings.Key && c.Value == "true");
             vm.IsSupportedByCurrency = _dashboard.Get(walletId.CryptoCode)?.Status?.BitcoinStatus?.Capabilities?.CanScanTxoutSet == true;
             var explorer = ExplorerClientProvider.GetExplorerClient(walletId.CryptoCode);
-            var scanProgress = await explorer.GetScanUTXOSetInformationAsync(paymentMethod.AccountDerivation);
+            var scanProgress = await explorer.GetScanUTXOSetInformationAsync(paymentMethod.DerivationStrategyBase);
             if (scanProgress != null)
             {
                 vm.PreviousError = scanProgress.Error;
@@ -495,13 +331,14 @@ namespace BTCPayServer.Controllers
         {
             if (walletId?.StoreId == null)
                 return NotFound();
-            DerivationSchemeSettings paymentMethod = await GetDerivationSchemeSettings(walletId);
+            var store = await Repository.FindStore(walletId.StoreId, GetUserId());
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
             if (paymentMethod == null)
                 return NotFound();
             var explorer = ExplorerClientProvider.GetExplorerClient(walletId.CryptoCode);
             try
             {
-                await explorer.ScanUTXOSetAsync(paymentMethod.AccountDerivation, vm.BatchSize, vm.GapLimit, vm.StartingIndex);
+                await explorer.ScanUTXOSetAsync(paymentMethod.DerivationStrategyBase, vm.BatchSize, vm.GapLimit, vm.StartingIndex);
             }
             catch (NBXplorerException ex) when (ex.Error.Code == "scanutxoset-in-progress")
             {
@@ -523,24 +360,18 @@ namespace BTCPayServer.Controllers
             return null;
         }
 
-        private DerivationSchemeSettings GetDerivationSchemeSettings(WalletId walletId, StoreData store)
+        private DerivationStrategy GetPaymentMethod(WalletId walletId, StoreData store)
         {
             if (store == null || !store.HasClaim(Policies.CanModifyStoreSettings.Key))
                 return null;
 
             var paymentMethod = store
                             .GetSupportedPaymentMethods(NetworkProvider)
-                            .OfType<DerivationSchemeSettings>()
+                            .OfType<DerivationStrategy>()
                             .FirstOrDefault(p => p.PaymentId.PaymentType == Payments.PaymentTypes.BTCLike && p.PaymentId.CryptoCode == walletId.CryptoCode);
             return paymentMethod;
         }
 
-        private async Task<DerivationSchemeSettings> GetDerivationSchemeSettings(WalletId walletId)
-        {
-            var store = (await Repository.FindStore(walletId.StoreId, GetUserId()));
-            return GetDerivationSchemeSettings(walletId, store);
-        }
-
         private static async Task<string> GetBalanceString(BTCPayWallet wallet, DerivationStrategyBase derivationStrategy)
         {
             using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(10)))
@@ -561,6 +392,17 @@ namespace BTCPayServer.Controllers
             return _userManager.GetUserId(User);
         }
 
+        [HttpGet]
+        [Route("{walletId}/send/ledger/success")]
+        public IActionResult WalletSendLedgerSuccess(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId,
+            string txid)
+        {
+            StatusMessage = $"Transaction broadcasted ({txid})";
+            return RedirectToAction(nameof(this.WalletTransactions), new { walletId = walletId.ToString() });
+        }
+
         [HttpGet]
         [Route("{walletId}/send/ledger/ws")]
         public async Task<IActionResult> LedgerConnection(
@@ -571,18 +413,16 @@ namespace BTCPayServer.Controllers
             // getxpub
             int account = 0,
             // sendtoaddress
-            string psbt = null,
-            string hintChange = null
+            bool noChange = false,
+            string destination = null, string amount = null, string feeRate = null, string substractFees = null
             )
         {
             if (!HttpContext.WebSockets.IsWebSocketRequest)
                 return NotFound();
 
-            var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            if (network == null)
-                throw new FormatException("Invalid value for crypto code");
+            var cryptoCode = walletId.CryptoCode;
             var storeData = (await Repository.FindStore(walletId.StoreId, GetUserId()));
-            var derivationSettings = GetDerivationSchemeSettings(walletId, storeData);
+            var derivationScheme = GetPaymentMethod(walletId, storeData).DerivationStrategyBase;
 
             var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
 
@@ -590,11 +430,63 @@ namespace BTCPayServer.Controllers
             using (var signTimeout = new CancellationTokenSource())
             {
                 normalOperationTimeout.CancelAfter(TimeSpan.FromMinutes(30));
-                var hw = new LedgerHardwareWalletService(webSocket);
-                var model = new WalletSendLedgerModel();
+                var hw = new HardwareWalletService(webSocket);
                 object result = null;
                 try
                 {
+                    BTCPayNetwork network = null;
+                    if (cryptoCode != null)
+                    {
+                        network = NetworkProvider.GetNetwork(cryptoCode);
+                        if (network == null)
+                            throw new FormatException("Invalid value for crypto code");
+                    }
+
+                    BitcoinAddress destinationAddress = null;
+                    if (destination != null)
+                    {
+                        try
+                        {
+                            destinationAddress = BitcoinAddress.Create(destination.Trim(), network.NBitcoinNetwork);
+                        }
+                        catch { }
+                        if (destinationAddress == null)
+                            throw new FormatException("Invalid value for destination");
+                    }
+
+                    FeeRate feeRateValue = null;
+                    if (feeRate != null)
+                    {
+                        try
+                        {
+                            feeRateValue = new FeeRate(Money.Satoshis(int.Parse(feeRate, CultureInfo.InvariantCulture)), 1);
+                        }
+                        catch { }
+                        if (feeRateValue == null || feeRateValue.FeePerK <= Money.Zero)
+                            throw new FormatException("Invalid value for fee rate");
+                    }
+
+                    Money amountBTC = null;
+                    if (amount != null)
+                    {
+                        try
+                        {
+                            amountBTC = Money.Parse(amount);
+                        }
+                        catch { }
+                        if (amountBTC == null || amountBTC <= Money.Zero)
+                            throw new FormatException("Invalid value for amount");
+                    }
+
+                    bool subsctractFeesValue = false;
+                    if (substractFees != null)
+                    {
+                        try
+                        {
+                            subsctractFeesValue = bool.Parse(substractFees);
+                        }
+                        catch { throw new FormatException("Invalid value for subtract fees"); }
+                    }
                     if (command == "test")
                     {
                         result = await hw.Test(normalOperationTimeout.Token);
@@ -603,60 +495,127 @@ namespace BTCPayServer.Controllers
                     {
                         if (!_dashboard.IsFullySynched(network.CryptoCode, out var summary))
                             throw new Exception($"{network.CryptoCode}: not started or fully synched");
+                        var strategy = GetDirectDerivationStrategy(derivationScheme);
+                        var wallet = _walletProvider.GetWallet(network);
+                        var change = wallet.GetChangeAddressAsync(derivationScheme);
+                        var keypaths = new Dictionary<Script, KeyPath>();
+                        List<Coin> availableCoins = new List<Coin>();
+                        foreach (var c in await wallet.GetUnspentCoins(derivationScheme))
+                        {
+                            keypaths.TryAdd(c.Coin.ScriptPubKey, c.KeyPath);
+                            availableCoins.Add(c.Coin);
+                        }
 
-                        var accountKey = derivationSettings.GetSigningAccountKeySettings();
-                        // Some deployment does not have the AccountKeyPath set, let's fix this...
-                        if (accountKey.AccountKeyPath == null)
+                        var changeAddress = await change;
+
+                        var storeBlob = storeData.GetStoreBlob();
+                        var paymentId = new Payments.PaymentMethodId(cryptoCode, Payments.PaymentTypes.BTCLike);
+                        var foundKeyPath = storeBlob.GetWalletKeyPathRoot(paymentId);
+                        // Some deployment have the wallet root key path saved in the store blob
+                        // If it does, we only have to make 1 call to the hw to check if it can sign the given strategy,
+                        if (foundKeyPath == null || !await hw.CanSign(network, strategy, foundKeyPath, normalOperationTimeout.Token))
                         {
                             // If the saved wallet key path is not present or incorrect, let's scan the wallet to see if it can sign strategy
-                            var foundKeyPath = await hw.FindKeyPathFromDerivation(network,
-                                                                               derivationSettings.AccountDerivation,
-                                                                               normalOperationTimeout.Token);
-                            accountKey.AccountKeyPath = foundKeyPath ?? throw new HardwareWalletException($"This store is not configured to use this ledger");
-                            storeData.SetSupportedPaymentMethod(derivationSettings);
+                            foundKeyPath = await hw.FindKeyPath(network, strategy, normalOperationTimeout.Token);
+                            if (foundKeyPath == null)
+                                throw new HardwareWalletException($"This store is not configured to use this ledger");
+                            storeBlob.SetWalletKeyPathRoot(paymentId, foundKeyPath);
+                            storeData.SetStoreBlob(storeBlob);
                             await Repository.UpdateStore(storeData);
                         }
-                        // If it has already the AccountKeyPath, we did not looked up for it, so we need to check if we are on the right ledger
+retry:
+                        var send = new[] { (
+                        destination: destinationAddress as IDestination,
+                        amount: amountBTC,
+                        substractFees: subsctractFeesValue) };
+
+                        foreach (var element in send)
+                        {
+                            if (element.destination == null)
+                                throw new ArgumentNullException(nameof(element.destination));
+                            if (element.amount == null)
+                                throw new ArgumentNullException(nameof(element.amount));
+                            if (element.amount <= Money.Zero)
+                                throw new ArgumentOutOfRangeException(nameof(element.amount), "The amount should be above zero");
+                        }
+
+                        TransactionBuilder builder = network.NBitcoinNetwork.CreateTransactionBuilder();
+                        builder.StandardTransactionPolicy.MinRelayTxFee = summary.Status.BitcoinStatus.MinRelayTxFee;
+                        builder.AddCoins(availableCoins);
+
+                        foreach (var element in send)
+                        {
+                            builder.Send(element.destination, element.amount);
+                            if (element.substractFees)
+                                builder.SubtractFees();
+                        }
+
+                        builder.SetChange(changeAddress.Item1);
+
+                        if (network.MinFee == null)
+                        {
+                            builder.SendEstimatedFees(feeRateValue);
+                        }
                         else
                         {
-                            // Checking if ledger is right with the RootFingerprint is faster as it does not need to make a query to the parent xpub, 
-                            // but some deployment does not have it, so let's use AccountKeyPath instead
-                            if (accountKey.RootFingerprint == null)
-                            {
-
-                                var actualPubKey = await hw.GetExtPubKey(network, accountKey.AccountKeyPath, normalOperationTimeout.Token);
-                                if (!derivationSettings.AccountDerivation.GetExtPubKeys().Any(p => p.GetPublicKey() == actualPubKey.GetPublicKey()))
-                                    throw new HardwareWalletException($"This store is not configured to use this ledger");
-                            }
-                            // We have the root fingerprint, we can check the root from it
+                            var estimatedFee = builder.EstimateFees(feeRateValue);
+                            if (network.MinFee > estimatedFee)
+                                builder.SendFees(network.MinFee);
                             else
+                                builder.SendEstimatedFees(feeRateValue);
+                        }
+                        var unsigned = builder.BuildTransaction(false);
+
+                        var hasChange = unsigned.Outputs.Any(o => o.ScriptPubKey == changeAddress.Item1.ScriptPubKey);
+                        if (noChange && hasChange)
+                        {
+                            availableCoins = builder.FindSpentCoins(unsigned).Cast<Coin>().ToList();
+                            amountBTC = builder.FindSpentCoins(unsigned).Select(c => c.TxOut.Value).Sum();
+                            subsctractFeesValue = true;
+                            goto retry;
+                        }
+
+                        var usedCoins = builder.FindSpentCoins(unsigned);
+
+                        Dictionary<uint256, Transaction> parentTransactions = new Dictionary<uint256, Transaction>();
+
+                        if (!strategy.Segwit)
+                        {
+                            var parentHashes = usedCoins.Select(c => c.Outpoint.Hash).ToHashSet();
+                            var explorer = ExplorerClientProvider.GetExplorerClient(network);
+                            var getTransactionAsyncs = parentHashes.Select(h => (Op: explorer.GetTransactionAsync(h), Hash: h)).ToList();
+                            foreach (var getTransactionAsync in getTransactionAsyncs)
                             {
-                                var actualPubKey = await hw.GetPubKey(network, new KeyPath(), normalOperationTimeout.Token);
-                                if (actualPubKey.GetHDFingerPrint() != accountKey.RootFingerprint.Value)
-                                    throw new HardwareWalletException($"This store is not configured to use this ledger");
+                                var tx = (await getTransactionAsync.Op);
+                                if (tx == null)
+                                    throw new Exception($"Parent transaction {getTransactionAsync.Hash} not found");
+                                parentTransactions.Add(tx.Transaction.GetHash(), tx.Transaction);
                             }
                         }
 
-                        // Some deployment does not have the RootFingerprint set, let's fix this...
-                        if (accountKey.RootFingerprint == null)
-                        {
-                            accountKey.RootFingerprint = (await hw.GetPubKey(network, new KeyPath(), normalOperationTimeout.Token)).GetHDFingerPrint();
-                            storeData.SetSupportedPaymentMethod(derivationSettings);
-                            await Repository.UpdateStore(storeData);
-                        }
-
-                        var psbtResponse = new CreatePSBTResponse()
-                        {
-                            PSBT = PSBT.Parse(psbt, network.NBitcoinNetwork),
-                            ChangeAddress = string.IsNullOrEmpty(hintChange) ? null : BitcoinAddress.Create(hintChange, network.NBitcoinNetwork)
-                        };
-
-
-                        derivationSettings.RebaseKeyPaths(psbtResponse.PSBT);
 
                         signTimeout.CancelAfter(TimeSpan.FromMinutes(5));
-                        psbtResponse.PSBT = await hw.SignTransactionAsync(psbtResponse.PSBT, accountKey.GetRootedKeyPath(), accountKey.AccountKey, psbtResponse.ChangeAddress?.ScriptPubKey, signTimeout.Token);
-                        result = new SendToAddressResult() { PSBT = psbtResponse.PSBT.ToBase64() };
+                        var transaction = await hw.SignTransactionAsync(usedCoins.Select(c => new SignatureRequest
+                        {
+                            InputTransaction = parentTransactions.TryGet(c.Outpoint.Hash),
+                            InputCoin = c,
+                            KeyPath = foundKeyPath.Derive(keypaths[c.TxOut.ScriptPubKey]),
+                            PubKey = strategy.Root.Derive(keypaths[c.TxOut.ScriptPubKey]).PubKey
+                        }).ToArray(), unsigned, hasChange ? foundKeyPath.Derive(changeAddress.Item2) : null, signTimeout.Token);
+                        try
+                        {
+                            var broadcastResult = await wallet.BroadcastTransactionsAsync(new List<Transaction>() { transaction });
+                            if (!broadcastResult[0].Success)
+                            {
+                                throw new Exception($"RPC Error while broadcasting: {broadcastResult[0].RPCCode} {broadcastResult[0].RPCCodeMessage} {broadcastResult[0].RPCMessage}");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new Exception("Error while broadcasting: " + ex.Message);
+                        }
+                        wallet.InvalidateCache(derivationScheme);
+                        result = new SendToAddressResult() { TransactionId = transaction.GetHash().ToString() };
                     }
                 }
                 catch (OperationCanceledException)
@@ -682,57 +641,14 @@ namespace BTCPayServer.Controllers
             return new EmptyResult();
         }
 
-        [Route("{walletId}/settings")]
-        public async Task<IActionResult> WalletSettings(
-             [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId)
+        private DirectDerivationStrategy GetDirectDerivationStrategy(DerivationStrategyBase strategy)
         {
-            var derivationSchemeSettings = await GetDerivationSchemeSettings(walletId);
-            if (derivationSchemeSettings == null)
-                return NotFound();
-            var store = (await Repository.FindStore(walletId.StoreId, GetUserId()));
-            var vm = new WalletSettingsViewModel()
-            {
-                Label = derivationSchemeSettings.Label,
-                DerivationScheme = derivationSchemeSettings.AccountDerivation.ToString(),
-                DerivationSchemeInput = derivationSchemeSettings.AccountOriginal,
-                SelectedSigningKey = derivationSchemeSettings.SigningKey.ToString()
-            };
-            vm.AccountKeys = derivationSchemeSettings.AccountKeySettings
-                            .Select(e => new WalletSettingsAccountKeyViewModel()
-                            {
-                                AccountKey = e.AccountKey.ToString(),
-                                MasterFingerprint = e.RootFingerprint is HDFingerprint fp ? fp.ToString() : null,
-                                AccountKeyPath = e.AccountKeyPath == null ? "" : $"m/{e.AccountKeyPath}"
-                            }).ToList();
-            return View(vm);
-        }
-
-        [Route("{walletId}/settings")]
-        [HttpPost]
-        public async Task<IActionResult> WalletSettings(
-             [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, WalletSettingsViewModel vm)
-        {
-            if (!ModelState.IsValid)
-                return View(vm);
-            var derivationScheme = await GetDerivationSchemeSettings(walletId);
-            if (derivationScheme == null)
-                return NotFound();
-            derivationScheme.Label = vm.Label;
-            derivationScheme.SigningKey = string.IsNullOrEmpty(vm.SelectedSigningKey) ? null : new BitcoinExtPubKey(vm.SelectedSigningKey, derivationScheme.Network.NBitcoinNetwork);
-            for (int i = 0; i < derivationScheme.AccountKeySettings.Length; i++)
-            {
-                derivationScheme.AccountKeySettings[i].AccountKeyPath = string.IsNullOrWhiteSpace(vm.AccountKeys[i].AccountKeyPath) ? null
-                                                          : new KeyPath(vm.AccountKeys[i].AccountKeyPath);
-                derivationScheme.AccountKeySettings[i].RootFingerprint = string.IsNullOrWhiteSpace(vm.AccountKeys[i].MasterFingerprint) ? (HDFingerprint?)null
-                                                          : new HDFingerprint(Encoders.Hex.DecodeData(vm.AccountKeys[i].MasterFingerprint));
-            }
-            var store = (await Repository.FindStore(walletId.StoreId, GetUserId()));
-            store.SetSupportedPaymentMethod(derivationScheme);
-            await Repository.UpdateStore(store);
-            StatusMessage = "Wallet settings updated";
-            return RedirectToAction(nameof(WalletSettings));
+            if (strategy == null)
+                throw new Exception("The derivation scheme is not provided");
+            var directStrategy = strategy as DirectDerivationStrategy;
+            if (directStrategy == null)
+                directStrategy = (strategy as P2SHDerivationStrategy).Inner as DirectDerivationStrategy;
+            return directStrategy;
         }
     }
 
@@ -743,7 +659,6 @@ namespace BTCPayServer.Controllers
 
     public class SendToAddressResult
     {
-        [JsonProperty("psbt")]
-        public string PSBT { get; set; }
+        public string TransactionId { get; set; }
     }
 }

BTCPayServer/CustomThreadPool.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BTCPayServer
 {
-    public class CustomThreadPool : IDisposable
+    class CustomThreadPool : IDisposable
     {
         CancellationTokenSource _Cancel = new CancellationTokenSource();
         TaskCompletionSource<bool> _Exited;

BTCPayServer/Data/ApplicationDbContext.cs

@@ -1,13 +1,13 @@
-using System.Linq;
-using BTCPayServer.Authentication.OpenId.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using BTCPayServer.Models;
 using BTCPayServer.Services.PaymentRequests;
-using BTCPayServer.Services.U2F.Models;
-using BTCPayServer.Storage.Models;
+using Microsoft.EntityFrameworkCore.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using OpenIddict.EntityFrameworkCore.Models;
 
 namespace BTCPayServer.Data
 {
@@ -93,18 +93,10 @@ namespace BTCPayServer.Data
         }
 
         public DbSet<APIKeyData> ApiKeys
-        {
-            get; set;
-        } 
-        
-        public DbSet<StoredFile> Files
         {
             get; set;
         }
-       
 
-        public DbSet<U2FDevice> U2FDevices { get; set; }   
-        
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             var isConfigured = optionsBuilder.Options.Extensions.OfType<RelationalOptionsExtension>().Any();
@@ -227,10 +219,6 @@ namespace BTCPayServer.Data
 
             builder.Entity<PaymentRequestData>()
                 .HasIndex(o => o.Status);
-
-            builder.UseOpenIddict<BTCPayOpenIdClient, BTCPayOpenIdAuthorization, OpenIddictScope<string>, BTCPayOpenIdToken, string>();
-
         }
     }
-
 }

BTCPayServer/Data/PairedSINData.cs

@@ -12,6 +12,11 @@ namespace BTCPayServer.Data
             get; set;
         }
 
+        public string Facade
+        {
+            get; set;
+        }
+
         public string StoreDataId
         {
             get; set;

BTCPayServer/Data/PairingCodeData.cs

@@ -11,7 +11,7 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-        [Obsolete("Unused")]
+
         public string Facade
         {
             get; set;

BTCPayServer/Data/StoreData.cs

@@ -28,9 +28,6 @@ namespace BTCPayServer.Data
 {
     public class StoreData
     {
-        [NotMapped]
-        [JsonIgnore]
-        public PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary { get; set; }
         public string Id
         {
             get;
@@ -76,7 +73,7 @@ namespace BTCPayServer.Data
                 if (networks.BTC != null)
                 {
                     btcReturned = true;
-                    yield return DerivationSchemeSettings.Parse(DerivationStrategy, networks.BTC);
+                    yield return BTCPayServer.DerivationStrategy.Parse(DerivationStrategy, networks.BTC);
                 }
             }
 
@@ -87,27 +84,20 @@ namespace BTCPayServer.Data
                 foreach (var strat in strategies.Properties())
                 {
                     var paymentMethodId = PaymentMethodId.Parse(strat.Name);
-                    var network = networks.GetNetwork<BTCPayNetwork>(paymentMethodId.CryptoCode);
+                    var network = networks.GetNetwork(paymentMethodId.CryptoCode);
                     if (network != null)
                     {
                         if (network == networks.BTC && paymentMethodId.PaymentType == PaymentTypes.BTCLike && btcReturned)
                             continue;
                         if (strat.Value.Type == JTokenType.Null)
                             continue;
-                        yield return
-                            PaymentMethodHandlerDictionary[paymentMethodId]
-                                .DeserializeSupportedPaymentMethod(paymentMethodId, strat.Value);
+                        yield return PaymentMethodExtensions.Deserialize(paymentMethodId, strat.Value, network);
                     }
                 }
             }
 #pragma warning restore CS0618
         }
 
-        public void SetSupportedPaymentMethod(ISupportedPaymentMethod supportedPaymentMethod)
-        {
-            SetSupportedPaymentMethod(null, supportedPaymentMethod);
-        }
-
         /// <summary>
         /// Set or remove a new supported payment method for the store
         /// </summary>
@@ -115,16 +105,8 @@ namespace BTCPayServer.Data
         /// <param name="supportedPaymentMethod">The payment method, or null to remove</param>
         public void SetSupportedPaymentMethod(PaymentMethodId paymentMethodId, ISupportedPaymentMethod supportedPaymentMethod)
         {
-            if (supportedPaymentMethod != null && paymentMethodId != null && paymentMethodId != supportedPaymentMethod.PaymentId)
-            {
-                throw new InvalidOperationException("Incoherent arguments, this should never happen");
-            }
-            if (supportedPaymentMethod == null && paymentMethodId == null)
-                throw new ArgumentException($"{nameof(supportedPaymentMethod)} or {nameof(paymentMethodId)} should be specified");
-            if (supportedPaymentMethod != null && paymentMethodId == null)
-            {
-                paymentMethodId = supportedPaymentMethod.PaymentId;
-            }
+            if (supportedPaymentMethod != null && paymentMethodId != supportedPaymentMethod.PaymentId)
+                throw new InvalidOperationException("Argument mismatch");
 
 #pragma warning disable CS0618
             JObject strategies = string.IsNullOrEmpty(DerivationStrategies) ? new JObject() : JObject.Parse(DerivationStrategies);
@@ -152,7 +134,7 @@ namespace BTCPayServer.Data
                 }
             }
 
-            if (!existing && supportedPaymentMethod == null && supportedPaymentMethod.PaymentId.IsBTCOnChain)
+            if (!existing && supportedPaymentMethod == null && paymentMethodId.IsBTCOnChain)
             {
                 DerivationStrategy = null;
             }
@@ -287,7 +269,7 @@ namespace BTCPayServer.Data
 
         public double Multiplier { get; set; }
 
-        public decimal Apply(BTCPayNetworkBase network, decimal rate)
+        public decimal Apply(BTCPayNetwork network, decimal rate)
         {
             return rate * (decimal)Multiplier;
         }
@@ -325,25 +307,6 @@ namespace BTCPayServer.Data
 
         public bool RequiresRefundEmail { get; set; }
 
-        CurrencyPair[] _DefaultCurrencyPairs;
-        [JsonProperty("defaultCurrencyPairs", ItemConverterType = typeof(CurrencyPairJsonConverter))]
-        public CurrencyPair[] DefaultCurrencyPairs
-        {
-            get
-            {
-                return _DefaultCurrencyPairs ?? Array.Empty<CurrencyPair>();
-            }
-            set
-            {
-                _DefaultCurrencyPairs = value;
-            }
-        }
-
-        public string GetDefaultCurrencyPairString()
-        {
-            return string.Join(',', DefaultCurrencyPairs.Select(c => c.ToString()));
-        }
-
         public string DefaultLang { get; set; }
         [DefaultValue(60)]
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
@@ -367,11 +330,10 @@ namespace BTCPayServer.Data
         public List<RateRule_Obsolete> RateRules { get; set; } = new List<RateRule_Obsolete>();
         public string PreferredExchange { get; set; }
 
-        [JsonConverter(typeof(CurrencyValueJsonConverter))]
-        public CurrencyValue OnChainMinValue { get; set; }
         [JsonConverter(typeof(CurrencyValueJsonConverter))]
         public CurrencyValue LightningMaxValue { get; set; }
-        public bool LightningAmountInSatoshi { get; set; }
+        [JsonConverter(typeof(CurrencyValueJsonConverter))]
+        public CurrencyValue OnChainMinValue { get; set; }
 
         [JsonConverter(typeof(UriJsonConverter))]
         public Uri CustomLogo { get; set; }
@@ -448,12 +410,25 @@ namespace BTCPayServer.Data
 
         [Obsolete("Use GetExcludedPaymentMethods instead")]
         public string[] ExcludedPaymentMethods { get; set; }
-
-        [Obsolete("Use DerivationSchemeSettings instead")]
-        public Dictionary<string, string> WalletKeyPathRoots { get; set; }
+#pragma warning disable CS0618 // Type or member is obsolete
+        public void SetWalletKeyPathRoot(PaymentMethodId paymentMethodId, KeyPath keyPath)
+        {
+            if (keyPath == null)
+                WalletKeyPathRoots.Remove(paymentMethodId.ToString());
+            else
+                WalletKeyPathRoots.AddOrReplace(paymentMethodId.ToString().ToLowerInvariant(), keyPath.ToString());
+        }
+        public KeyPath GetWalletKeyPathRoot(PaymentMethodId paymentMethodId)
+        {
+            if (WalletKeyPathRoots.TryGetValue(paymentMethodId.ToString().ToLowerInvariant(), out var k))
+                return KeyPath.Parse(k);
+            return null;
+        }
+#pragma warning restore CS0618 // Type or member is obsolete
+        [Obsolete("Use SetWalletKeyPathRoot/GetWalletKeyPathRoot instead")]
+        public Dictionary<string, string> WalletKeyPathRoots { get; set; } = new Dictionary<string, string>();
 
         public EmailSettings EmailSettings { get; set; }
-        public bool RedirectAutomatically { get; set; }
 
         public IPaymentFilter GetExcludedPaymentMethods()
         {

BTCPayServer/DerivationSchemeParser.cs

@@ -12,51 +12,14 @@ namespace BTCPayServer
 {
     public class DerivationSchemeParser
     {
-        public BTCPayNetwork BtcPayNetwork { get; }
-
-        public Network Network => BtcPayNetwork.NBitcoinNetwork;
-
+        public Network Network { get; set; }
         public Script HintScriptPubKey { get; set; }
 
-        Dictionary<uint, string[]> ElectrumMapping = new Dictionary<uint, string[]>();
-        
-        public DerivationSchemeParser(BTCPayNetwork expectedNetwork)
+        public DerivationSchemeParser(Network expectedNetwork)
         {
-            if (expectedNetwork == null)
-                throw new ArgumentNullException(nameof(expectedNetwork));
-            BtcPayNetwork = expectedNetwork;
+            Network = expectedNetwork;
         }
 
-
-        public DerivationStrategyBase ParseElectrum(string str)
-        {
-            
-            if (str == null)
-                throw new ArgumentNullException(nameof(str));
-            str = str.Trim();
-            var data = Network.GetBase58CheckEncoder().DecodeData(str);
-            if (data.Length < 4)
-                throw new FormatException();
-            var prefix = Utils.ToUInt32(data, false);
-
-            var standardPrefix = Utils.ToBytes(0x0488b21eU, false);
-            for (int ii = 0; ii < 4; ii++)
-                data[ii] = standardPrefix[ii];
-            var extPubKey = new BitcoinExtPubKey(Network.GetBase58CheckEncoder().EncodeData(data), Network.Main).ToNetwork(Network);
-            if (!BtcPayNetwork.ElectrumMapping.TryGetValue(prefix, out var type))
-            {
-                throw new FormatException();
-            }
-            if (type == DerivationType.Segwit)
-                return new DirectDerivationStrategy(extPubKey) { Segwit = true };
-            if (type == DerivationType.Legacy)
-                return new DirectDerivationStrategy(extPubKey) { Segwit = false };
-            if (type == DerivationType.SegwitP2SH)
-                return new DerivationStrategyFactory(Network).Parse(extPubKey.ToString() + "-[p2sh]");
-            throw new FormatException();
-        }
-
-
         public DerivationStrategyBase Parse(string str)
         {
             if (str == null)
@@ -78,7 +41,7 @@ namespace BTCPayServer
                 }
             }
 
-            if (!Network.Consensus.SupportSegwit)
+            if(!Network.Consensus.SupportSegwit)
                 hintedLabels.Add("legacy");
 
             try
@@ -90,6 +53,15 @@ namespace BTCPayServer
             {
             }
 
+            Dictionary<uint, string[]> electrumMapping = new Dictionary<uint, string[]>();
+            //Source https://github.com/spesmilo/electrum/blob/9edffd17542de5773e7284a8c8a2673c766bb3c3/lib/bitcoin.py
+            var standard = 0x0488b21eU;
+            electrumMapping.Add(standard, new[] { "legacy" });
+            var p2wpkh_p2sh = 0x049d7cb2U;
+            electrumMapping.Add(p2wpkh_p2sh, new string[] { "p2sh" });
+            var p2wpkh = 0x4b24746U;
+            electrumMapping.Add(p2wpkh, Array.Empty<string>());
+
             var parts = str.Split('-');
             bool hasLabel = false;
             for (int i = 0; i < parts.Length; i++)
@@ -112,22 +84,17 @@ namespace BTCPayServer
                     if (data.Length < 4)
                         continue;
                     var prefix = Utils.ToUInt32(data, false);
-
-                    var standardPrefix = Utils.ToBytes(0x0488b21eU, false);
+                    var standardPrefix = Utils.ToBytes(Network.NetworkType == NetworkType.Mainnet ? 0x0488b21eU : 0x043587cf, false);
                     for (int ii = 0; ii < 4; ii++)
                         data[ii] = standardPrefix[ii];
-                    var derivationScheme = new BitcoinExtPubKey(Network.GetBase58CheckEncoder().EncodeData(data), Network.Main).ToNetwork(Network).ToString();
 
-                    if (BtcPayNetwork.ElectrumMapping.TryGetValue(prefix, out var type))
+                    var derivationScheme = new BitcoinExtPubKey(Network.GetBase58CheckEncoder().EncodeData(data), Network).ToString();
+                    electrumMapping.TryGetValue(prefix, out string[] labels);
+                    if (labels != null)
                     {
-                        switch (type)
+                        foreach (var label in labels)
                         {
-                            case DerivationType.Legacy:
-                                hintedLabels.Add("legacy");
-                                break;
-                            case DerivationType.SegwitP2SH:
-                                hintedLabels.Add("p2sh");
-                                break;
+                            hintedLabels.Add(label.ToLowerInvariant());
                         }
                     }
                     parts[i] = derivationScheme;
@@ -169,7 +136,7 @@ namespace BTCPayServer
             resultNoLabels = string.Join('-', resultNoLabels.Split('-').Where(p => !IsLabel(p)));
             foreach (var labels in ItemCombinations(hintLabels.ToList()))
             {
-                var hinted = facto.Parse(resultNoLabels + '-' + string.Join('-', labels.Select(l => $"[{l}]").ToArray()));
+                var hinted = facto.Parse(resultNoLabels + '-' + string.Join('-', labels.Select(l=>$"[{l}]").ToArray()));
                 if (HintScriptPubKey == hinted.Derive(firstKeyPath).ScriptPubKey)
                     return hinted;
             }
@@ -182,20 +149,20 @@ namespace BTCPayServer
         }
 
         /// <summary>
-        /// Method to create lists containing possible combinations of an input list of items. This is
-        /// basically copied from code by user "jaolho" on this thread:
-        /// http://stackoverflow.com/questions/7802822/all-possible-combinations-of-a-list-of-values
-        /// </summary>
-        /// <typeparam name="T">type of the items on the input list</typeparam>
-        /// <param name="inputList">list of items</param>
-        /// <param name="minimumItems">minimum number of items wanted in the generated combinations,
-        ///                            if zero the empty combination is included,
-        ///                            default is one</param>
-        /// <param name="maximumItems">maximum number of items wanted in the generated combinations,
-        ///                            default is no maximum limit</param>
-        /// <returns>list of lists for possible combinations of the input items</returns>
-        public static List<List<T>> ItemCombinations<T>(List<T> inputList, int minimumItems = 1,
-                                                int maximumItems = int.MaxValue)
+		/// Method to create lists containing possible combinations of an input list of items. This is 
+		/// basically copied from code by user "jaolho" on this thread:
+		/// http://stackoverflow.com/questions/7802822/all-possible-combinations-of-a-list-of-values
+		/// </summary>
+		/// <typeparam name="T">type of the items on the input list</typeparam>
+		/// <param name="inputList">list of items</param>
+		/// <param name="minimumItems">minimum number of items wanted in the generated combinations, 
+		///                            if zero the empty combination is included,
+		///                            default is one</param>
+		/// <param name="maximumItems">maximum number of items wanted in the generated combinations,
+		///                            default is no maximum limit</param>
+		/// <returns>list of lists for possible combinations of the input items</returns>
+		public static List<List<T>> ItemCombinations<T>(List<T> inputList, int minimumItems = 1,
+                                                        int maximumItems = int.MaxValue)
         {
             int nonEmptyCombinations = (int)Math.Pow(2, inputList.Count) - 1;
             List<List<T>> listOfLists = new List<List<T>>(nonEmptyCombinations + 1);

BTCPayServer/DerivationSchemeSettings.cs

@@ -1,274 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Payments;
-using NBitcoin;
-using NBXplorer.DerivationStrategy;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer
-{
-    public class DerivationSchemeSettings : ISupportedPaymentMethod
-    {
-        public static DerivationSchemeSettings Parse(string derivationStrategy, BTCPayNetwork network)
-        {
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
-            if (derivationStrategy == null)
-                throw new ArgumentNullException(nameof(derivationStrategy));
-            var result = new NBXplorer.DerivationStrategy.DerivationStrategyFactory(network.NBitcoinNetwork).Parse(derivationStrategy);
-            return new DerivationSchemeSettings(result, network) { AccountOriginal = derivationStrategy.Trim() };
-        }
-
-        public static bool TryParseFromJson(string config, BTCPayNetwork network, out DerivationSchemeSettings strategy)
-        {
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
-            if (config == null)
-                throw new ArgumentNullException(nameof(config));
-            strategy = null;
-            try
-            {
-                strategy = network.NBXplorerNetwork.Serializer.ToObject<DerivationSchemeSettings>(config);
-                strategy.Network = network;
-            }
-            catch { }
-            return strategy != null;
-        }
-
-        public static bool TryParseFromColdcard(string coldcardExport, BTCPayNetwork network, out DerivationSchemeSettings settings)
-        {
-            settings = null;
-            if (coldcardExport == null)
-                throw new ArgumentNullException(nameof(coldcardExport));
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
-            var result = new DerivationSchemeSettings();
-            result.Source = "Coldcard";
-            var derivationSchemeParser = new DerivationSchemeParser(network);
-            JObject jobj = null;
-            try
-            {
-                jobj = JObject.Parse(coldcardExport);
-                jobj = (JObject)jobj["keystore"];
-            }
-            catch
-            {
-                return false;
-            }
-
-            if (jobj.ContainsKey("xpub"))
-            {
-                try
-                {
-                    result.AccountOriginal = jobj["xpub"].Value<string>().Trim();
-                    result.AccountDerivation = derivationSchemeParser.ParseElectrum(result.AccountOriginal);
-                    result.AccountKeySettings = new AccountKeySettings[1];
-                    result.AccountKeySettings[0] = new AccountKeySettings();
-                    result.AccountKeySettings[0].AccountKey = result.AccountDerivation.GetExtPubKeys().Single().GetWif(network.NBitcoinNetwork);
-                    if (result.AccountDerivation is DirectDerivationStrategy direct && !direct.Segwit)
-                        result.AccountOriginal = null; // Saving this would be confusing for user, as xpub of electrum is legacy derivation, but for btcpay, it is segwit derivation
-                }
-                catch
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                return false;
-            }
-
-            if (jobj.ContainsKey("label"))
-            {
-                try
-                {
-                    result.Label = jobj["label"].Value<string>();
-                }
-                catch { return false; }
-            }
-
-            if (jobj.ContainsKey("ckcc_xfp"))
-            {
-                try
-                {
-                    result.AccountKeySettings[0].RootFingerprint = new HDFingerprint(jobj["ckcc_xfp"].Value<uint>());
-                }
-                catch { return false; }
-            }
-
-            if (jobj.ContainsKey("derivation"))
-            {
-                try
-                {
-                    result.AccountKeySettings[0].AccountKeyPath = new KeyPath(jobj["derivation"].Value<string>());
-                }
-                catch { return false; }
-            }
-            settings = result;
-            settings.Network = network;
-            return true;
-        }
-
-        public DerivationSchemeSettings()
-        {
-
-        }
-
-        public DerivationSchemeSettings(DerivationStrategyBase derivationStrategy, BTCPayNetwork network)
-        {
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
-            if (derivationStrategy == null)
-                throw new ArgumentNullException(nameof(derivationStrategy));
-            AccountDerivation = derivationStrategy;
-            Network = network;
-            AccountKeySettings = derivationStrategy.GetExtPubKeys().Select(c => new AccountKeySettings()
-            {
-                AccountKey = c.GetWif(network.NBitcoinNetwork)
-            }).ToArray();
-        }
-
-
-        BitcoinExtPubKey _SigningKey;
-        public BitcoinExtPubKey SigningKey
-        {
-            get
-            {
-                return _SigningKey ?? AccountKeySettings?.Select(k => k.AccountKey).FirstOrDefault();
-            }
-            set
-            {
-                _SigningKey = value;
-            }
-        }
-
-        [JsonIgnore]
-        public BTCPayNetwork Network { get; set; }
-        public string Source { get; set; }
-
-        [Obsolete("Use GetAccountKeySettings().AccountKeyPath instead")]
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public KeyPath AccountKeyPath { get; set; }
-
-        public DerivationStrategyBase AccountDerivation { get; set; }
-        public string AccountOriginal { get; set; }
-
-        [Obsolete("Use GetAccountKeySettings().RootFingerprint instead")]
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public HDFingerprint? RootFingerprint { get; set; }
-
-        [Obsolete("Use GetAccountKeySettings().AccountKey instead")]
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public BitcoinExtPubKey ExplicitAccountKey { get; set; }
-
-        [JsonIgnore]
-        [Obsolete("Use GetAccountKeySettings().AccountKey instead")]
-        public BitcoinExtPubKey AccountKey
-        {
-            get
-            {
-                return ExplicitAccountKey ?? new BitcoinExtPubKey(AccountDerivation.GetExtPubKeys().First(), Network.NBitcoinNetwork);
-            }
-        }
-
-        public AccountKeySettings GetSigningAccountKeySettings()
-        {
-            return AccountKeySettings.Single(a => a.AccountKey == SigningKey);
-        }
-
-        AccountKeySettings[] _AccountKeySettings;
-        public AccountKeySettings[] AccountKeySettings
-        {
-            get
-            {
-                // Legacy
-                if (_AccountKeySettings == null)
-                {
-                    if (this.Network == null)
-                        return null;
-                    _AccountKeySettings = AccountDerivation.GetExtPubKeys().Select(e => new AccountKeySettings()
-                    {
-                        AccountKey = e.GetWif(this.Network.NBitcoinNetwork),
-                    }).ToArray();
-#pragma warning disable CS0618 // Type or member is obsolete
-                    _AccountKeySettings[0].AccountKeyPath = AccountKeyPath;
-                    _AccountKeySettings[0].RootFingerprint = RootFingerprint;
-                    ExplicitAccountKey = null;
-                    AccountKeyPath = null;
-                    RootFingerprint = null;
-#pragma warning restore CS0618 // Type or member is obsolete
-                }
-                return _AccountKeySettings;
-            }
-            set
-            {
-                _AccountKeySettings = value;
-            }
-        }
-
-        public IEnumerable<NBXplorer.Models.PSBTRebaseKeyRules> GetPSBTRebaseKeyRules()
-        {
-            foreach (var accountKey in AccountKeySettings)
-            {
-                if (accountKey.AccountKeyPath != null && accountKey.RootFingerprint is HDFingerprint fp)
-                {
-                    yield return new NBXplorer.Models.PSBTRebaseKeyRules()
-                    {
-                        AccountKey = accountKey.AccountKey,
-                        AccountKeyPath = accountKey.AccountKeyPath,
-                        MasterFingerprint = fp
-                    };
-                }
-            }
-        }
-
-        public string Label { get; set; }
-
-        [JsonIgnore]
-        public PaymentMethodId PaymentId => new PaymentMethodId(Network.CryptoCode, PaymentTypes.BTCLike);
-
-        public override string ToString()
-        {
-            return AccountDerivation.ToString();
-        }
-        public string ToPrettyString()
-        {
-            return !string.IsNullOrEmpty(Label) ? Label :
-                   !String.IsNullOrEmpty(AccountOriginal) ? AccountOriginal :
-                   ToString();
-        }
-
-        public string ToJson()
-        {
-            return Network.NBXplorerNetwork.Serializer.ToString(this);
-        }
-
-        public void RebaseKeyPaths(PSBT psbt)
-        {
-            foreach (var rebase in GetPSBTRebaseKeyRules())
-            {
-                psbt.RebaseKeyPaths(rebase.AccountKey, rebase.GetRootedKeyPath());
-            }
-        }
-    }
-    public class AccountKeySettings
-    {
-        public HDFingerprint? RootFingerprint { get; set; }
-        public KeyPath AccountKeyPath { get; set; }
-
-        public RootedKeyPath GetRootedKeyPath()
-        {
-            if (RootFingerprint is HDFingerprint fp && AccountKeyPath != null)
-                return new RootedKeyPath(fp, AccountKeyPath);
-            return null;
-        }
-        public BitcoinExtPubKey AccountKey { get; set; }
-        public bool IsFullySetup()
-        {
-            return AccountKeyPath != null && RootFingerprint is HDFingerprint;
-        }
-    }
-}

BTCPayServer/DerivationStrategy.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Payments;
+using BTCPayServer.Services.Invoices;
+using NBitcoin;
+using NBXplorer.DerivationStrategy;
+
+namespace BTCPayServer
+{
+    public class DerivationStrategy : ISupportedPaymentMethod
+    {
+        private DerivationStrategyBase _DerivationStrategy;
+        private BTCPayNetwork _Network;
+
+        public DerivationStrategy(DerivationStrategyBase result, BTCPayNetwork network)
+        {
+            this._DerivationStrategy = result;
+            this._Network = network;
+        }
+        
+        public static DerivationStrategy Parse(string derivationStrategy, BTCPayNetwork network)
+        {
+            if (network == null)
+                throw new ArgumentNullException(nameof(network));
+            if (derivationStrategy == null)
+                throw new ArgumentNullException(nameof(derivationStrategy));
+            var result = new NBXplorer.DerivationStrategy.DerivationStrategyFactory(network.NBitcoinNetwork).Parse(derivationStrategy);
+            return new DerivationStrategy(result, network);
+        }
+
+        public BTCPayNetwork Network { get { return this._Network; } }
+
+        public DerivationStrategyBase DerivationStrategyBase => this._DerivationStrategy;
+
+        public PaymentMethodId PaymentId => new PaymentMethodId(Network.CryptoCode, PaymentTypes.BTCLike);
+
+        public override string ToString()
+        {
+            return _DerivationStrategy.ToString();
+        }
+    }
+}