Make sure arm build have /sbin/ip

This reverts commit 561644f75b3b83cae3b1cc8db0ceb7ee657dbe82.

.github/ISSUE_TEMPLATE/bug_report.md

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

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

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -35,6 +35,7 @@ using System.Text;
 using System.Threading;
 using Xunit;
 using BTCPayServer.Services;
+using System.Net.Http;
 
 namespace BTCPayServer.Tests
 {
@@ -120,7 +121,8 @@ 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()
@@ -129,6 +131,7 @@ namespace BTCPayServer.Tests
                     {
                         s.AddLogging(l =>
                         {
+                            l.AddFilter("System.Net.Http.HttpClient", LogLevel.Critical);
                             l.SetMinimumLevel(LogLevel.Information)
                             .AddFilter("Microsoft", LogLevel.Error)
                             .AddFilter("Hangfire", LogLevel.Error)
@@ -208,6 +211,8 @@ namespace BTCPayServer.Tests
             }
         }
 
+        public HttpClient HttpClient { get; set; }
+
         public string HostName
         {
             get;

BTCPayServer.Tests/Dockerfile

@@ -1,12 +1,9 @@
-FROM microsoft/dotnet:2.1.500-sdk-alpine3.7 AS builder
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1.505-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 BTCPayServer/BTCPayServer.csproj BTCPayServer/BTCPayServer.csproj
 COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj

BTCPayServer.Tests/ServerTester.cs

@@ -23,6 +23,7 @@ using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Lightning.CLightning;
 using BTCPayServer.Lightning;
 using BTCPayServer.Services;
+using BTCPayServer.Tests.Logging;
 
 namespace BTCPayServer.Tests
 {
@@ -85,9 +86,11 @@ namespace BTCPayServer.Tests
         /// Connect a customer LN node to the merchant LN node
         /// </summary>
         /// <returns></returns>
-        public Task EnsureChannelsSetup()
+        public async Task EnsureChannelsSetup()
         {
-            return BTCPayServer.Lightning.Tests.ConnectChannels.ConnectAll(ExplorerNode, GetLightningSenderClients(), GetLightningDestClients());
+            Logs.Tester.LogInformation("Connecting channels");
+            await BTCPayServer.Lightning.Tests.ConnectChannels.ConnectAll(ExplorerNode, GetLightningSenderClients(), GetLightningDestClients()).ConfigureAwait(false);
+            Logs.Tester.LogInformation("Channels connected");
         }
 
         private IEnumerable<ILightningClient> GetLightningSenderClients()

BTCPayServer.Tests/UnitTest1.cs

@@ -55,6 +55,7 @@ using BTCPayServer.Events;
 using BTCPayServer.Configuration;
 using System.Security;
 using System.Runtime.CompilerServices;
+using System.Net;
 
 namespace BTCPayServer.Tests
 {
@@ -146,6 +147,45 @@ namespace BTCPayServer.Tests
 #pragma warning restore CS0618
         }
 
+        [Fact]
+        [Trait("Fast", "Fast")]
+        public void CanParseTorrc()
+        {
+            var nl = "\n";
+            var input = "# For the hidden service BTCPayServer" + nl +
+                        "HiddenServiceDir /var/lib/tor/hidden_services/BTCPayServer" + nl +
+                        "# Redirecting to nginx" + nl +
+                        "HiddenServicePort 80 172.19.0.10:81";
+            nl = Environment.NewLine;
+            var expected = "HiddenServiceDir /var/lib/tor/hidden_services/BTCPayServer" + nl +
+                           "HiddenServicePort 80 172.19.0.10:81" + nl;
+            Assert.True(Torrc.TryParse(input, out var torrc));
+            Assert.Equal(expected, torrc.ToString());
+            nl = "\r\n";
+            input = "# For the hidden service BTCPayServer" + nl +
+                        "HiddenServiceDir /var/lib/tor/hidden_services/BTCPayServer" + nl +
+                        "# Redirecting to nginx" + nl +
+                        "HiddenServicePort 80 172.19.0.10:81";
+
+            Assert.True(Torrc.TryParse(input, out torrc));
+            Assert.Equal(expected, torrc.ToString());
+
+            input = "# For the hidden service BTCPayServer" + nl +
+                        "HiddenServiceDir /var/lib/tor/hidden_services/BTCPayServer" + nl +
+                        "# Redirecting to nginx" + nl +
+                        "HiddenServicePort 80 172.19.0.10:80" + nl +
+                        "HiddenServiceDir /var/lib/tor/hidden_services/Woocommerce" + nl +
+                        "# Redirecting to nginx" + nl +
+                        "HiddenServicePort 80 172.19.0.11:80";
+            nl = Environment.NewLine;
+            expected = "HiddenServiceDir /var/lib/tor/hidden_services/BTCPayServer" + nl +
+                           "HiddenServicePort 80 172.19.0.10:80" + nl +
+                           "HiddenServiceDir /var/lib/tor/hidden_services/Woocommerce" + nl +
+                           "HiddenServicePort 80 172.19.0.11:80" + nl;
+            Assert.True(Torrc.TryParse(input, out torrc));
+            Assert.Equal(expected, torrc.ToString());
+        }
+
         [Fact]
         [Trait("Fast", "Fast")]
         public void CanCalculateCryptoDue()
@@ -399,21 +439,21 @@ namespace BTCPayServer.Tests
             }
         }
 
-        [Fact]
+        [Fact(Timeout = 60 * 2 * 1000)]
         [Trait("Integration", "Integration")]
         public async Task CanSendLightningPaymentCLightning()
         {
             await ProcessLightningPayment(LightningConnectionType.CLightning);
         }
 
-        [Fact]
+        [Fact(Timeout = 60 * 2 * 1000)]
         [Trait("Integration", "Integration")]
         public async Task CanSendLightningPaymentCharge()
         {
             await ProcessLightningPayment(LightningConnectionType.Charge);
         }
 
-        [Fact(Timeout = 60 * 1000)]
+        [Fact(Timeout = 60 * 2 * 1000)]
         [Trait("Integration", "Integration")]
         public async Task CanSendLightningPaymentLnd()
         {
@@ -453,7 +493,9 @@ namespace BTCPayServer.Tests
                 ItemDesc = "Some description"
             });
             await Task.Delay(TimeSpan.FromMilliseconds(1000)); // Give time to listen the new invoices
+            Logs.Tester.LogInformation($"Trying to send Lightning payment to {invoice.Id}");
             await tester.SendLightningPaymentAsync(invoice);
+            Logs.Tester.LogInformation($"Lightning payment to {invoice.Id} is sent");
             await TestUtils.EventuallyAsync(async () =>
             {
                 var localInvoice = await user.BitPay.GetInvoiceAsync(invoice.Id);
@@ -727,6 +769,18 @@ namespace BTCPayServer.Tests
 
                 var GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, acc.StoreId, default)
                     .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
+                // We don't have any default currencies, so this should be failing
+                Assert.Null(GetRatesResult?.Data);
+
+                var store = acc.GetController<StoresController>();
+                var ratesVM = (RatesViewModel)(Assert.IsType<ViewResult>(store.Rates(acc.StoreId)).Model);
+                ratesVM.DefaultCurrencyPairs = "BTC_USD,LTC_USD";
+                store.Rates(ratesVM).Wait();
+                store = acc.GetController<StoresController>();
+                rateController = acc.GetController<RateController>();
+                GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, acc.StoreId, default)
+                    .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
+                // Now we should have a result
                 Assert.NotNull(GetRatesResult);
                 Assert.NotNull(GetRatesResult.Data);
                 Assert.Equal(2, GetRatesResult.Data.Length);
@@ -869,7 +923,7 @@ namespace BTCPayServer.Tests
             using (var tester = ServerTester.Create())
             {
                 tester.Start();
-                foreach(var req in new[] 
+                foreach (var req in new[]
                 {
                     "invoices/",
                     "invoices",
@@ -1006,7 +1060,7 @@ namespace BTCPayServer.Tests
         private static decimal CreateInvoice(ServerTester tester, TestAccount user, string exchange, string currency = "USD")
         {
             var storeController = user.GetController<StoresController>();
-            var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model;
+            var vm = (RatesViewModel)((ViewResult)storeController.Rates(user.StoreId)).Model;
             vm.PreferredExchange = exchange;
             storeController.Rates(vm).Wait();
             var invoice2 = user.BitPay.CreateInvoice(new Invoice()
@@ -1021,6 +1075,49 @@ namespace BTCPayServer.Tests
             return invoice2.CryptoInfo[0].Rate;
         }
 
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public async Task CanUseAnyoneCanCreateInvoice()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                user.RegisterDerivationScheme("BTC");
+
+                Logs.Tester.LogInformation("StoreId without anyone can create invoice = 401");
+                var response = await tester.PayTester.HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Post, $"invoices?storeId={user.StoreId}")
+                {
+                    Content = new StringContent("{\"Price\": 5000, \"currency\": \"USD\"}", Encoding.UTF8, "application/json"),
+                });
+                Assert.Equal(401, (int)response.StatusCode);
+
+                Logs.Tester.LogInformation("No store without  anyone can create invoice = 404 because the bitpay API can't know the storeid");
+                response = await tester.PayTester.HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Post, $"invoices")
+                {
+                    Content = new StringContent("{\"Price\": 5000, \"currency\": \"USD\"}", Encoding.UTF8, "application/json"),
+                });
+                Assert.Equal(404, (int)response.StatusCode);
+
+                user.ModifyStore(s => s.AnyoneCanCreateInvoice = true);
+
+                Logs.Tester.LogInformation("Bad store with anyone can create invoice = 401");
+                response = await tester.PayTester.HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Post, $"invoices?storeId=badid")
+                {
+                    Content = new StringContent("{\"Price\": 5000, \"currency\": \"USD\"}", Encoding.UTF8, "application/json"),
+                });
+                Assert.Equal(401, (int)response.StatusCode);
+
+                Logs.Tester.LogInformation("Good store with anyone can create invoice = 200");
+                response = await tester.PayTester.HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Post, $"invoices?storeId={user.StoreId}")
+                {
+                    Content = new StringContent("{\"Price\": 5000, \"currency\": \"USD\"}", Encoding.UTF8, "application/json"),
+                });
+                Assert.Equal(200, (int)response.StatusCode);
+            }
+        }
+
         [Fact]
         [Trait("Integration", "Integration")]
         public void CanTweakRate()
@@ -1044,7 +1141,7 @@ namespace BTCPayServer.Tests
                 Assert.Equal(Money.Coins(1.0m), invoice1.BtcPrice);
 
                 var storeController = user.GetController<StoresController>();
-                var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model;
+                var vm = (RatesViewModel)((ViewResult)storeController.Rates(user.StoreId)).Model;
                 Assert.Equal(0.0, vm.Spread);
                 vm.Spread = 40;
                 storeController.Rates(vm).Wait();
@@ -1143,7 +1240,7 @@ namespace BTCPayServer.Tests
                 user.RegisterDerivationScheme("BTC");
 
                 var store = user.GetController<StoresController>();
-                var rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
+                var rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(user.StoreId)).Model);
                 Assert.False(rateVm.ShowScripting);
                 Assert.Equal("coinaverage", rateVm.PreferredExchange);
                 Assert.Equal(0.0, rateVm.Spread);
@@ -1151,7 +1248,7 @@ namespace BTCPayServer.Tests
 
                 rateVm.PreferredExchange = "bitflyer";
                 Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
-                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
+                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(user.StoreId)).Model);
                 Assert.Equal("bitflyer", rateVm.PreferredExchange);
 
                 rateVm.ScriptTest = "BTC_JPY,BTC_CAD";
@@ -1168,7 +1265,8 @@ namespace BTCPayServer.Tests
                 Assert.IsType<RedirectToActionResult>(store.ShowRateRulesPost(true).Result);
                 Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
                 store = user.GetController<StoresController>();
-                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
+                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(user.StoreId)).Model);
+                Assert.Equal(rateVm.StoreId, user.StoreId);
                 Assert.Equal(rateVm.DefaultScript, rateVm.Script);
                 Assert.True(rateVm.ShowScripting);
                 rateVm.ScriptTest = "BTC_JPY";
@@ -1185,7 +1283,7 @@ namespace BTCPayServer.Tests
                 Assert.True(rateVm.TestRateRules.All(t => !t.Error));
                 Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
                 store = user.GetController<StoresController>();
-                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
+                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(user.StoreId)).Model);
                 Assert.Equal(50, rateVm.Spread);
                 Assert.True(rateVm.ShowScripting);
                 Assert.Contains("DOGE_X", rateVm.Script, StringComparison.OrdinalIgnoreCase);
@@ -2251,15 +2349,22 @@ donation:
                 Assert.NotNull(exchangeRates);
                 Assert.NotEmpty(exchangeRates);
                 Assert.NotEmpty(exchangeRates.ByExchange[result.ExpectedName]);
-
-                // This check if the currency pair is using right currency pair
-                Assert.Contains(exchangeRates.ByExchange[result.ExpectedName],
+                if (result.ExpectedName == "bitbank")
+                {
+                    Assert.Contains(exchangeRates.ByExchange[result.ExpectedName],
+                        e => e.CurrencyPair == new CurrencyPair("BTC", "JPY") && e.BidAsk.Bid > 100m); // 1BTC will always be more than 100JPY
+                }
+                else
+                {
+                    // This check if the currency pair is using right currency pair
+                    Assert.Contains(exchangeRates.ByExchange[result.ExpectedName],
                         e => (e.CurrencyPair == new CurrencyPair("BTC", "USD") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "EUR") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "USDT") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "CAD"))
                                && e.BidAsk.Bid > 1.0m // 1BTC will always be more than 1USD
                                );
+                }
             }
             // Kraken emit one request only after first GetRates
             factory.Providers["kraken"].GetRatesAsync(default).GetAwaiter().GetResult();
@@ -2352,7 +2457,7 @@ donation:
             Assert.True(ExternalConnectionString.TryParse("server=https://tow/test", out connStr, out error));
             expanded = await connStr.Expand(new Uri("https://toto.com"), ExternalServiceTypes.Charge);
             Assert.Equal(new Uri("https://tow/test"), expanded.Server);
-            
+
             // Error if directory not exists
             Assert.True(ExternalConnectionString.TryParse($"server={unusedUri};macaroondirectorypath=pouet", out connStr, out error));
             await Assert.ThrowsAsync<DirectoryNotFoundException>(() => connStr.Expand(unusedUri, ExternalServiceTypes.LNDGRPC));

BTCPayServer.Tests/docker-compose.yml

@@ -69,7 +69,7 @@ services:
 
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.0.0.15
+    image: nicolasdorier/nbxplorer:2.0.0.26
     restart: unless-stopped
     ports:
       - "32838:32838"

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.79</Version>
+		<Version>1.0.3.91</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -30,25 +30,27 @@
     <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.10" />
-    <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.15" />
+    <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="DigitalRuby.ExchangeSharp" Version="0.5.3" />
-    <PackageReference Include="HtmlSanitizer" Version="4.0.199" />
+    <PackageReference Include="HtmlSanitizer" Version="4.0.207" />
     <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="NBitcoin" Version="4.1.1.84" />
+    <PackageReference Include="NBitcoin" Version="4.1.1.96" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.32" />	  
     <PackageReference Include="DBreeze" Version="1.92.0" />
-    <PackageReference Include="NBXplorer.Client" Version="2.0.0.4" />
+    <PackageReference Include="NBXplorer.Client" Version="2.0.0.6" />
     <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" />
@@ -67,7 +69,7 @@
   </ItemGroup>
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
 		<PackageReference Include="YamlDotNet" Version="5.2.1" />
 	</ItemGroup>
 

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -48,11 +48,7 @@ namespace BTCPayServer.Configuration
             get;
             private set;
         }
-        public List<IPEndPoint> Listen
-        {
-            get;
-            set;
-        }
+        public EndPoint SocksEndpoint { get; set; }
 
         public List<NBXplorerConnectionSetting> NBXplorerConnectionSettings
         {
@@ -149,6 +145,16 @@ namespace BTCPayServer.Configuration
             PostgresConnectionString = conf.GetOrDefault<string>("postgres", null);
             MySQLConnectionString = conf.GetOrDefault<string>("mysql", null);
             BundleJsCss = conf.GetOrDefault<bool>("bundlejscss", true);
+            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))
@@ -273,5 +279,6 @@ namespace BTCPayServer.Configuration
             get;
             set;
         }
+        public string TorrcFile { get; set; }
     }
 }

BTCPayServer/Configuration/ConfigurationExtensions.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Primitives;
+using NBitcoin;
 
 namespace BTCPayServer.Configuration
 {

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -32,7 +32,6 @@ namespace BTCPayServer.Configuration
             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,6 +40,8 @@ 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);

BTCPayServer/Controllers/AccessTokenController.cs

@@ -35,6 +35,8 @@ 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))
             {

BTCPayServer/Controllers/AppsController.Crowdfund.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
@@ -56,7 +57,9 @@ namespace BTCPayServer.Controllers
                 AppId = appId,
                 SearchTerm = app.TagAllInvoices ? $"storeid:{app.StoreDataId}" : $"orderid:{AppService.GetCrowdfundOrderId(appId)}",
                 DisplayPerksRanking = settings.DisplayPerksRanking,
-                SortPerksByPopularity = settings.SortPerksByPopularity
+                SortPerksByPopularity = settings.SortPerksByPopularity,
+                Sounds                = string.Join(Environment.NewLine, settings.Sounds),
+                AnimationColors                = string.Join(Environment.NewLine, settings.AnimationColors)
             };
             return View(vm);
         }
@@ -90,6 +93,24 @@ 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)
             {
@@ -124,7 +145,9 @@ namespace BTCPayServer.Controllers
                 ResetEveryAmount = vm.ResetEveryAmount,
                 ResetEvery = Enum.Parse<CrowdfundResetEvery>(vm.ResetEvery),
                 DisplayPerksRanking = vm.DisplayPerksRanking,
-                SortPerksByPopularity = vm.SortPerksByPopularity
+                SortPerksByPopularity = vm.SortPerksByPopularity,
+                Sounds = parsedSounds,
+                AnimationColors = parsedAnimationColors
             };
 
             app.TagAllInvoices = vm.UseAllStoreInvoices;

BTCPayServer/Controllers/AppsPublicController.cs

@@ -109,11 +109,13 @@ namespace BTCPayServer.Controllers
 
                 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));
+            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(await _AppService.GetAppInfo(appId));
+            return View(appInfo);
         }
 
         [HttpPost]
@@ -137,7 +139,7 @@ namespace BTCPayServer.Controllers
             }
 
             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) ||

BTCPayServer/Controllers/HomeController.cs

@@ -1,11 +1,8 @@
 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;

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -273,6 +273,7 @@ namespace BTCPayServer.Controllers
             var model = new PaymentModel()
             {
                 CryptoCode = network.CryptoCode,
+                RootPath = this.Request.PathBase.Value.WithTrailingSlash(),
                 PaymentMethodId = paymentMethodId.ToString(),
                 PaymentMethodName = GetDisplayName(paymentMethodId, network),
                 CryptoImage = GetImage(paymentMethodId, network),
@@ -283,6 +284,7 @@ namespace BTCPayServer.Controllers
                 HtmlTitle = storeBlob.HtmlTitle ?? "BTCPay Invoice",
                 CustomCSSLink = storeBlob.CustomCSS?.AbsoluteUri,
                 CustomLogoLink = storeBlob.CustomLogo?.AbsoluteUri,
+                LightningAmountInSatoshi = storeBlob.LightningAmountInSatoshi,
                 BtcAddress = paymentMethodDetails.GetPaymentDestination(),
                 BtcDue = accounting.Due.ToString(),
                 OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
@@ -345,9 +347,8 @@ namespace BTCPayServer.Controllers
 
         private string GetImage(PaymentMethodId paymentMethodId, BTCPayNetwork network)
         {
-            var res = paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
-                Url.Content(network.CryptoImagePath) : Url.Content(network.LightningImagePath);
-            return "/" + res;
+            return paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
+                this.Request.GetRelativePathOrAbsolute(network.CryptoImagePath) : this.Request.GetRelativePathOrAbsolute(network.LightningImagePath);
         }
 
         private string OrderAmountFromInvoice(string cryptoCode, ProductInformation productInformation)

BTCPayServer/Controllers/InvoiceController.cs

@@ -242,6 +242,7 @@ 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);
 

BTCPayServer/Controllers/ManageController.cs

@@ -113,6 +113,7 @@ 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;

BTCPayServer/Controllers/PaymentRequestController.cs

@@ -24,6 +24,7 @@ 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
@@ -98,7 +99,12 @@ namespace BTCPayServer.Controllers
                 return RedirectToAction("GetPaymentRequests",
                     new
                     {
-                        StatusMessage = "Error: You need to create at least one store before creating a payment request"
+                        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
+                        }
                     });
             }
 
@@ -176,7 +182,7 @@ namespace BTCPayServer.Controllers
             return View("Confirm", new ConfirmModel()
             {
                 Title = $"Remove Payment Request",
-                Description = $"Are you sure to remove access to remove payment request '{blob.Title}' ?",
+                Description = $"Are you sure you want to remove access to the payment request '{blob.Title}' ?",
                 Action = "Delete"
             });
         }
@@ -198,7 +204,7 @@ namespace BTCPayServer.Controllers
                     new
                     {
                         StatusMessage =
-                            "Payment request could not be removed. Any request that has generated invoices cannot be removed."
+                            "Error: Payment request could not be removed. Any request that has generated invoices cannot be removed."
                     });
             }
         }
@@ -213,7 +219,7 @@ namespace BTCPayServer.Controllers
             {
                 return NotFound();
             }
-
+            result.HubPath = PaymentRequestHub.GetHubPath(this.Request);
             return View(result);
         }
 
@@ -223,12 +229,12 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> PayPaymentRequest(string id, bool redirectToInvoice = true,
             decimal? amount = null, CancellationToken cancellationToken = default)
         {
-            var result = ((await ViewPaymentRequest(id)) as ViewResult)?.Model as ViewPaymentRequestViewModel;
+            var result = await _PaymentRequestService.GetPaymentRequest(id, GetUserId());
             if (result == null)
             {
                 return NotFound();
             }
-
+            result.HubPath = PaymentRequestHub.GetHubPath(this.Request);
             if (result.AmountDue <= 0)
             {
                 if (redirectToInvoice)
@@ -282,18 +288,21 @@ namespace BTCPayServer.Controllers
                 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.Value,
+                            FullNotifications = true,
+                            BuyerEmail = result.Email,
+                            RedirectURL = redirectUrl,
+                        }, store, HttpContext.Request.GetAbsoluteRoot(),
+                        new List<string>() {PaymentRequestRepository.GetInternalTag(id)},
+                        cancellationToken: cancellationToken))
+                    .Data.Id;
 
                 if (redirectToInvoice)
                 {
-                    return RedirectToAction("Checkout", "Invoice", new { Id = newInvoiceId });
+                    return RedirectToAction("Checkout", "Invoice", new {Id = newInvoiceId});
                 }
 
                 return Ok(newInvoiceId);
@@ -309,5 +318,23 @@ namespace BTCPayServer.Controllers
         {
             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/PublicLightningNodeInfoController.cs

@@ -43,7 +43,7 @@ namespace BTCPayServer.Controllers
                 var paymentMethodDetails = GetExistingLightningSupportedPaymentMethod(cryptoCode, store);
                 var network = _BtcPayNetworkProvider.GetNetwork(cryptoCode);
                 var nodeInfo =
-                    await _LightningLikePaymentHandler.GetNodeInfo(paymentMethodDetails,
+                    await _LightningLikePaymentHandler.GetNodeInfo(this.Request.IsOnion(), paymentMethodDetails,
                         network);
 
                 return View(new ShowLightningNodeInfoViewModel()

BTCPayServer/Controllers/RateController.cs

@@ -91,7 +91,6 @@ namespace BTCPayServer.Controllers
         [BitpayAPIConstraint]
         public async Task<IActionResult> GetRates(string currencyPairs, string storeId, CancellationToken cancellationToken)
         {
-            storeId = await GetStoreId(storeId);
             var result = await GetRates2(currencyPairs, storeId, cancellationToken);
             var rates = (result as JsonResult)?.Value as Rate[];
             if (rates == null)
@@ -140,15 +139,10 @@ namespace BTCPayServer.Controllers
 
             if (currencyPairs == null)
             {
-                var supportedMethods = store.GetSupportedPaymentMethods(_NetworkProvider);
-                var currencyCodes = supportedMethods.Select(method => method.PaymentId.CryptoCode).Distinct();
-                var defaultPaymentId = store.GetDefaultPaymentId(_NetworkProvider);
-
-                currencyPairs = BuildCurrencyPairs(currencyCodes, defaultPaymentId.CryptoCode);
-
+                currencyPairs = store.GetStoreBlob().GetDefaultCurrencyPairString();
                 if (string.IsNullOrEmpty(currencyPairs))
                 {
-                    var result = Json(new BitpayErrorsModel() { Error = "You need to specify currencyPairs (eg. BTC_USD,LTC_CAD)" });
+                    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)." });
                     result.StatusCode = 400;
                     return result;
                 }

BTCPayServer/Controllers/ServerController.cs

@@ -39,6 +39,7 @@ namespace BTCPayServer.Controllers
         private RateFetcher _RateProviderFactory;
         private StoreRepository _StoreRepository;
         LightningConfigurationProvider _LnConfigProvider;
+        private readonly TorServices _torServices;
         BTCPayServerOptions _Options;
 
         public ServerController(UserManager<ApplicationUser> userManager,
@@ -48,6 +49,7 @@ namespace BTCPayServer.Controllers
             NBXplorerDashboard dashBoard,
             IHttpClientFactory httpClientFactory,
             LightningConfigurationProvider lnConfigProvider,
+            TorServices torServices,
             Services.Stores.StoreRepository storeRepository)
         {
             _Options = options;
@@ -58,6 +60,7 @@ namespace BTCPayServer.Controllers
             _RateProviderFactory = rateProviderFactory;
             _StoreRepository = storeRepository;
             _LnConfigProvider = lnConfigProvider;
+            _torServices = torServices;
         }
 
         [Route("server/rates")]
@@ -463,6 +466,25 @@ namespace BTCPayServer.Controllers
                     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
+                {
+                    result.TorOtherServices.Add(new ServicesViewModel.OtherExternalService()
+                    {
+                        Name = torService.Name,
+                        Link = $"{torService.OnionHost}:{torService.VirtualPort}"
+                    });
+                }
+            }
             return View(result);
         }
 
@@ -557,7 +579,7 @@ namespace BTCPayServer.Controllers
                 var lnConfig = _LnConfigProvider.GetConfig(configKey);
                 if (lnConfig != null)
                 {
-                    model.QRCodeLink = Url.Action(nameof(GetLNDConfig), new { configKey = configKey });
+                    model.QRCodeLink = Request.GetAbsoluteUri(Url.Action(nameof(GetLNDConfig), new { configKey = configKey }));
                     model.QRCode = $"config={model.QRCodeLink}";
                 }
             }
@@ -664,6 +686,7 @@ namespace BTCPayServer.Controllers
         private static bool IsLocalNetwork(string server)
         {
             return server.EndsWith(".internal", StringComparison.OrdinalIgnoreCase) ||
+                   server.EndsWith(".local", StringComparison.OrdinalIgnoreCase) ||
                    server.Equals("127.0.0.1", StringComparison.OrdinalIgnoreCase) ||
                    server.Equals("localhost", StringComparison.OrdinalIgnoreCase);
         }

BTCPayServer/Controllers/StoresController.Changelly.cs

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

BTCPayServer/Controllers/StoresController.LightningLike.cs

@@ -155,7 +155,7 @@ namespace BTCPayServer.Controllers
                     var handler = (LightningLikePaymentHandler)_ServiceProvider.GetRequiredService<IPaymentMethodHandler<Payments.Lightning.LightningSupportedPaymentMethod>>();
                     try
                     {
-                        var info = await handler.GetNodeInfo(paymentMethod, network);
+                        var info = await handler.GetNodeInfo(this.Request.IsOnion(), paymentMethod, network);
                         if (!vm.SkipPortTest)
                         {
                             using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(20)))

BTCPayServer/Controllers/StoresController.cs

@@ -189,24 +189,39 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [Route("{storeId}/rates")]
-        public IActionResult Rates()
+        public IActionResult Rates(string storeId)
         {
             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, CancellationToken cancellationToken = default)
+        public async Task<IActionResult> Rates(RatesViewModel model, string command = null, string storeId = null, CancellationToken cancellationToken = default)
         {
             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);
@@ -220,7 +235,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))
@@ -333,13 +348,14 @@ 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;
             return View(vm);
         }
         void SetCryptoCurrencies(CheckoutExperienceViewModel vm, Data.StoreData storeData)
@@ -396,13 +412,14 @@ 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;
             if (StoreData.SetStoreBlob(blob))
             {
                 needUpdate = true;

BTCPayServer/Data/StoreData.cs

@@ -307,6 +307,25 @@ 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)]
@@ -330,10 +349,11 @@ namespace BTCPayServer.Data
         public List<RateRule_Obsolete> RateRules { get; set; } = new List<RateRule_Obsolete>();
         public string PreferredExchange { get; set; }
 
-        [JsonConverter(typeof(CurrencyValueJsonConverter))]
-        public CurrencyValue LightningMaxValue { 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(UriJsonConverter))]
         public Uri CustomLogo { get; set; }

BTCPayServer/ExplorerClientProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net.Http;
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,7 +18,7 @@ namespace BTCPayServer
 
         public BTCPayNetworkProvider NetworkProviders => _NetworkProviders;
         NBXplorerDashboard _Dashboard;
-        public ExplorerClientProvider(BTCPayNetworkProvider networkProviders, BTCPayServerOptions options, NBXplorerDashboard dashboard)
+        public ExplorerClientProvider(IHttpClientFactory httpClientFactory, BTCPayNetworkProvider networkProviders, BTCPayServerOptions options, NBXplorerDashboard dashboard)
         {
             _Dashboard = dashboard;
             _NetworkProviders = networkProviders;
@@ -32,14 +33,15 @@ namespace BTCPayServer
                 Logs.Configuration.LogInformation($"{setting.CryptoCode}: Cookie file is {(setting.CookieFile ?? "not set")}");
                 if (setting.ExplorerUri != null)
                 {
-                    _Clients.TryAdd(setting.CryptoCode, CreateExplorerClient(_NetworkProviders.GetNetwork(setting.CryptoCode), setting.ExplorerUri, setting.CookieFile));
+                    _Clients.TryAdd(setting.CryptoCode, CreateExplorerClient(httpClientFactory.CreateClient($"NBXPLORER_{setting.CryptoCode}"), _NetworkProviders.GetNetwork(setting.CryptoCode), setting.ExplorerUri, setting.CookieFile));
                 }
             }
         }
 
-        private static ExplorerClient CreateExplorerClient(BTCPayNetwork n, Uri uri, string cookieFile)
+        private static ExplorerClient CreateExplorerClient(HttpClient httpClient, BTCPayNetwork n, Uri uri, string cookieFile)
         {
             var explorer = new ExplorerClient(n.NBXplorerNetwork, uri);
+            explorer.SetClient(httpClient);
             if (cookieFile == null)
             {
                 Logs.Configuration.LogWarning($"{n.CryptoCode}: Not using cookie authentication");

BTCPayServer/Extensions.cs

@@ -33,6 +33,7 @@ using BTCPayServer.Services;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using NBXplorer.DerivationStrategy;
+using System.Net;
 
 namespace BTCPayServer
 {
@@ -165,6 +166,13 @@ namespace BTCPayServer
                             (derivationStrategyBase is DirectDerivationStrategy direct) && direct.Segwit;
         }
 
+        public static bool IsOnion(this HttpRequest request)
+        {
+            if (request?.Host.Host == null)
+                return false;
+            return request.Host.Host.EndsWith(".onion", StringComparison.OrdinalIgnoreCase);
+        }
+
         public static string GetAbsoluteRoot(this HttpRequest request)
         {
             return string.Concat(
@@ -217,8 +225,10 @@ namespace BTCPayServer
         /// <returns></returns>
         public static string GetRelativePathOrAbsolute(this HttpRequest request, string path)
         {
-            if (Uri.TryCreate(path, UriKind.Absolute, out var unused))
+            if (!Uri.TryCreate(path, UriKind.RelativeOrAbsolute, out var uri) || 
+                uri.IsAbsoluteUri)
                 return path;
+
             if (path.Length > 0 && path[0] != '/')
                 path = $"/{path}";
             return string.Concat(
@@ -301,30 +311,6 @@ namespace BTCPayServer
             NBitcoin.Extensions.TryAdd(ctx.Items, "BitpayAuth", value);
         }
 
-        public static async Task<T> WithCancellation<T>(this Task<T> task, CancellationToken cancellationToken)
-        {
-            using (var delayCTS = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken))
-            {
-                var waiting = Task.Delay(-1, delayCTS.Token);
-                var doing = task;
-                await Task.WhenAny(waiting, doing);
-                delayCTS.Cancel();
-                cancellationToken.ThrowIfCancellationRequested();
-                return await doing;
-            }
-        }
-        public static async Task WithCancellation(this Task task, CancellationToken cancellationToken)
-        {
-            using (var delayCTS = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken))
-            {
-                var waiting = Task.Delay(-1, delayCTS.Token);
-                var doing = task;
-                await Task.WhenAny(waiting, doing);
-                delayCTS.Cancel();
-                cancellationToken.ThrowIfCancellationRequested();
-            }
-        }
-
         public static (string Signature, String Id, String Authorization) GetBitpayAuth(this HttpContext ctx)
         {
             ctx.Items.TryGetValue("BitpayAuth", out object obj);

BTCPayServer/HostedServices/BackgroundJobSchedulerHostedService.cs

@@ -1,4 +1,5 @@
 using System;
+using NBitcoin;
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Linq;
@@ -34,6 +35,8 @@ namespace BTCPayServer.HostedServices
 
         public async Task StopAsync(CancellationToken cancellationToken)
         {
+            if (_Stop == null)
+                return;
             _Stop.Cancel();
             try
             {
@@ -43,7 +46,14 @@ namespace BTCPayServer.HostedServices
             {
 
             }
-            await BackgroundJobClient.WaitAllRunning(cancellationToken);
+            try
+            {
+                await BackgroundJobClient.WaitAllRunning(cancellationToken);
+            }
+            catch (OperationCanceledException)
+            {
+
+            }
         }
     }
 
@@ -89,6 +99,8 @@ namespace BTCPayServer.HostedServices
             Task[] processing = null;
             lock (_Processing)
             {
+                if (_Processing.Count == 0)
+                    return;
                 processing = _Processing.ToArray();
             }
 
@@ -96,9 +108,8 @@ namespace BTCPayServer.HostedServices
             {
                 await Task.WhenAll(processing).WithCancellation(cancellationToken);
             }
-            catch (Exception) when (cancellationToken.IsCancellationRequested)
+            catch (Exception) when (!cancellationToken.IsCancellationRequested)
             {
-                throw;
             }
         }
 

BTCPayServer/HostedServices/BaseAsyncService.cs

@@ -59,6 +59,8 @@ namespace BTCPayServer.HostedServices
 
         public Task StopAsync(CancellationToken cancellationToken)
         {
+            if (_Cts == null)
+                return Task.CompletedTask;
             _Cts.Cancel();
             return Task.WhenAll(_Tasks);
         }

BTCPayServer/HostedServices/CssThemeManager.cs

@@ -45,10 +45,12 @@ namespace BTCPayServer.HostedServices
         }
 
         public bool ShowRegister { get; set; }
+        public bool DiscourageSearchEngines { get; set; }
 
         internal void Update(PoliciesSettings data)
         {
             ShowRegister = !data.LockSubscription;
+            DiscourageSearchEngines = data.DiscourageSearchEngines;
         }
     }
 

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -333,6 +333,8 @@ namespace BTCPayServer.HostedServices
 
         public Task StopAsync(CancellationToken cancellationToken)
         {
+            if (_Cts == null)
+                return Task.CompletedTask;
             leases.Dispose();
             _Cts.Cancel();
             var waitingPendingInvoices = _WaitingInvoices ?? Task.CompletedTask;

BTCPayServer/HostedServices/RatesHostedService.cs

@@ -1,4 +1,5 @@
 using System;
+using NBitcoin;
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Linq;
@@ -68,7 +69,7 @@ namespace BTCPayServer.HostedServices
             var exchanges = new CoinAverageExchanges();
             foreach (var item in (await new CoinAverageRateProvider() { Authenticator = _coinAverageSettings }.GetExchangeTickersAsync())
                 .Exchanges
-                .Select(c => new CoinAverageExchange(c.Name, c.DisplayName)))
+                .Select(c => new CoinAverageExchange(c.Name, c.DisplayName, $"https://apiv2.bitcoinaverage.com/exchanges/{c.Name}")))
             {
                 exchanges.Add(item);
             }

BTCPayServer/HostedServices/TorServicesHostedService.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Configuration;
+using BTCPayServer.Services;
+using Microsoft.Extensions.Hosting;
+
+namespace BTCPayServer.HostedServices
+{
+    public class TorServicesHostedService : BaseAsyncService
+    {
+        private readonly BTCPayServerOptions _options;
+        private readonly TorServices _torServices;
+
+        public TorServicesHostedService(BTCPayServerOptions options, TorServices torServices)
+        {
+            _options = options;
+            _torServices = torServices;
+        }
+
+        internal override Task[] InitializeTasks()
+        {
+            // TODO: We should report auto configured services (like bitcoind, lnd or clightning)
+            if (string.IsNullOrEmpty(_options.TorrcFile))
+                return Array.Empty<Task>();
+            return new Task[] { CreateLoopTask(RefreshTorServices) };
+        }
+
+        async Task RefreshTorServices()
+        {
+            await _torServices.Refresh();
+            await Task.Delay(TimeSpan.FromSeconds(120), Cancellation);
+        }
+    }
+}

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -36,7 +36,6 @@ using BTCPayServer.Authentication;
 using Microsoft.Extensions.Caching.Memory;
 using BTCPayServer.Logging;
 using BTCPayServer.HostedServices;
-using Meziantou.AspNetCore.BundleTagHelpers;
 using System.Security.Claims;
 using BTCPayServer.PaymentRequest;
 using BTCPayServer.Payments.Changelly;
@@ -48,6 +47,7 @@ using NBXplorer.DerivationStrategy;
 using NicolasDorier.RateLimits;
 using Npgsql;
 using BTCPayServer.Services.Apps;
+using BundlerMinifier.TagHelpers;
 
 namespace BTCPayServer.Hosting
 {
@@ -62,6 +62,8 @@ namespace BTCPayServer.Hosting
             });
             services.AddHttpClient();
             services.TryAddSingleton<SettingsRepository>();
+            services.TryAddSingleton<TorServices>();
+            services.TryAddSingleton<SocketFactory>();
             services.TryAddSingleton<InvoicePaymentNotification>();
             services.TryAddSingleton<BTCPayServerOptions>(o => o.GetRequiredService<IOptions<BTCPayServerOptions>>().Value);
             services.TryAddSingleton<InvoiceRepository>(o =>
@@ -188,6 +190,7 @@ namespace BTCPayServer.Hosting
             services.AddSingleton<IHostedService, RatesHostedService>();
             services.AddSingleton<IHostedService, BackgroundJobSchedulerHostedService>();
             services.AddSingleton<IHostedService, AppHubStreamer>();
+            services.AddSingleton<IHostedService, TorServicesHostedService>();
             services.AddSingleton<IHostedService, PaymentRequestStreamer>();
             services.AddSingleton<IBackgroundJobClient, BackgroundJobClient>();
             services.AddTransient<IConfigureOptions<MvcOptions>, BTCPayClaimsFilter>();
@@ -215,7 +218,7 @@ namespace BTCPayServer.Hosting
             services.AddAuthorization(o => Policies.AddBTCPayPolicies(o));
             BitpayAuthentication.AddAuthentication(services);
 
-            services.AddBundles();
+            services.AddSingleton<IBundleProvider, ResourceBundleProvider>();
             services.AddTransient<BundleOptions>(provider =>
             {
                 var opts = provider.GetRequiredService<BTCPayServerOptions>();

BTCPayServer/Hosting/BTCpayMiddleware.cs

@@ -88,6 +88,9 @@ namespace BTCPayServer.Hosting
             if (!httpContext.Request.Path.HasValue)
                 return false;
 
+            // In case of anyone can create invoice, the storeId can be set explicitely
+            bitpayAuth |= httpContext.Request.Query.ContainsKey("storeid");
+
             var isJson = (httpContext.Request.ContentType ?? string.Empty).StartsWith("application/json", StringComparison.OrdinalIgnoreCase);
             var path = httpContext.Request.Path.Value;
             var method = httpContext.Request.Method;
@@ -95,7 +98,7 @@ namespace BTCPayServer.Hosting
 
             if (
                 (isCors || bitpayAuth) &&
-              (path == "/invoices" || path == "/invoices/") &&
+                (path == "/invoices" || path == "/invoices/") &&
               (isCors || (method == "POST" && isJson)))
                 return true;
 

BTCPayServer/Hosting/ResourceBundleProvider.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using BundlerMinifier.TagHelpers;
+using Microsoft.AspNetCore.Hosting;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Hosting
+{
+    public class ResourceBundleProvider : IBundleProvider
+    {
+        BundleProvider _InnerProvider;
+        Lazy<Dictionary<string, Bundle>> _BundlesByName;
+        public ResourceBundleProvider(IHostingEnvironment hosting, BundleOptions options)
+        {
+            if (options.UseBundles)
+            {
+                _BundlesByName = new Lazy<Dictionary<string, Bundle>>(() =>
+                {
+                    using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("BTCPayServer.bundleconfig.json"))
+                    using (var reader = new StreamReader(stream, Encoding.UTF8))
+                    {
+                        var content = reader.ReadToEnd();
+                        return JArray.Parse(content).OfType<JObject>()
+                               .Select(jobj => new Bundle()
+                               {
+                                   Name = jobj.Property("name")?.Value.Value<string>() ?? jobj.Property("outputFileName").Value.Value<string>(),
+                                   OutputFileUrl = Path.Combine(hosting.ContentRootPath, jobj.Property("outputFileName").Value.Value<string>())
+                               }).ToDictionary(o => o.Name, o => o);
+                    }
+                }, true);
+            }
+            else
+            {
+                _InnerProvider = new BundleProvider();
+            }
+        }
+        public Bundle GetBundle(string name)
+        {
+            if (_InnerProvider != null)
+                return _InnerProvider.GetBundle(name);
+            _BundlesByName.Value.TryGetValue(name, out var bundle);
+            return bundle;
+        }
+    }
+}

BTCPayServer/Hosting/Startup.cs

@@ -3,7 +3,6 @@ using System.Reflection;
 using System.Linq;
 using Microsoft.AspNetCore.Builder;
 using System;
-using System.Collections.Generic;
 using System.Text;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -14,7 +13,6 @@ using BTCPayServer.Authentication;
 using Microsoft.EntityFrameworkCore;
 using BTCPayServer.Filters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
-using BTCPayServer.Services;
 using BTCPayServer.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.HttpOverrides;
@@ -36,7 +34,6 @@ using Microsoft.AspNetCore.Mvc.Cors.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using System.Net;
 using BTCPayServer.PaymentRequest;
-using Meziantou.AspNetCore.BundleTagHelpers;
 using BTCPayServer.Security;
 using BTCPayServer.Services.Apps;
 
@@ -174,8 +171,8 @@ namespace BTCPayServer.Hosting
             app.UseAuthentication();
             app.UseSignalR(route =>
             {
-                route.MapHub<AppHub>("/apps/hub");
-                route.MapHub<PaymentRequestHub>("/payment-requests/hub");
+                AppHub.Register(route);
+                PaymentRequestHub.Register(route);
             });
             app.UseWebSockets();
             app.UseStatusCodePages();

BTCPayServer/JsonConverters/CurrencyPairJsonConverter.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using NBitcoin.JsonConverters;
+using BTCPayServer.Rating;
+
+namespace BTCPayServer.JsonConverters
+{
+    public class CurrencyPairJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return typeof(CurrencyValue).GetTypeInfo().IsAssignableFrom(objectType.GetTypeInfo());
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            try
+            {
+                return reader.TokenType == JsonToken.Null ? null :
+                       CurrencyPair.TryParse((string)reader.Value, out var result) ? result :
+                       throw new JsonObjectException("Invalid currency pair", reader);
+            }
+            catch (InvalidCastException)
+            {
+                throw new JsonObjectException("Invalid currency pair", reader);
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            if (value != null)
+                writer.WriteValue(value.ToString());
+        }
+    }
+}

BTCPayServer/ModelBinders/InvariantDecimalModelBinder.cs

@@ -0,0 +1,99 @@
+// Copied and adjusted from https://github.com/aspnet/Mvc/blob/master/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs
+using System;
+using System.Globalization;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace BTCPayServer.ModelBinders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> for <see cref="decimal"/> and <see cref="Nullable{T}"/> where <c>T</c> is
+    /// <see cref="decimal"/>.
+    /// </summary>
+    public class InvariantDecimalModelBinder : IModelBinder
+    {
+        private readonly NumberStyles _supportedStyles;
+
+        public InvariantDecimalModelBinder()
+        {
+            _supportedStyles = NumberStyles.Any;
+        }
+
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            var modelName = bindingContext.ModelName;
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                return Task.CompletedTask;
+            }
+
+            var modelState = bindingContext.ModelState;
+            modelState.SetModelValue(modelName, valueProviderResult);
+
+            var metadata = bindingContext.ModelMetadata;
+            var type = metadata.UnderlyingOrModelType;
+            try
+            {
+                var value = valueProviderResult.FirstValue;
+                var culture = CultureInfo.InvariantCulture;
+
+                object model;
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    // Parse() method trims the value (with common NumberStyles) then throws if the result is empty.
+                    model = null;
+                }
+                else if (type == typeof(decimal))
+                {
+                    model = decimal.Parse(value, _supportedStyles, culture);
+                }
+                else
+                {
+                    // unreachable
+                    throw new NotSupportedException();
+                }
+
+                // When converting value, a null model may indicate a failed conversion for an otherwise required
+                // model (can't set a ValueType to null). This detects if a null model value is acceptable given the
+                // current bindingContext. If not, an error is logged.
+                if (model == null && !metadata.IsReferenceOrNullableType)
+                {
+                    modelState.TryAddModelError(
+                        modelName,
+                        metadata.ModelBindingMessageProvider.ValueMustNotBeNullAccessor(
+                            valueProviderResult.ToString()));
+                }
+                else
+                {
+                    bindingContext.Result = ModelBindingResult.Success(model);
+                }
+            }
+            catch (Exception exception)
+            {
+                var isFormatException = exception is FormatException;
+                if (!isFormatException && exception.InnerException != null)
+                {
+                    // Unlike TypeConverters, floating point types do not seem to wrap FormatExceptions. Preserve
+                    // this code in case a cursory review of the CoreFx code missed something.
+                    exception = ExceptionDispatchInfo.Capture(exception.InnerException).SourceException;
+                }
+
+                modelState.TryAddModelError(modelName, exception, metadata);
+
+                // Conversion failed.
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs

@@ -46,6 +46,7 @@ namespace BTCPayServer.Models.AppViewModels
         public string TargetCurrency { get; set; } = "BTC";
 
         [Display(Name = "Set a Target amount ")]
+        [Range(0, double.PositiveInfinity)]
         public decimal? TargetAmount { get; set; }
 
 
@@ -79,5 +80,11 @@ namespace BTCPayServer.Models.AppViewModels
         public bool SortPerksByPopularity { get; set; }
         [Display(Name = "Display contribution ranking")]
         public bool DisplayPerksRanking { get; set; }
+
+
+        [Display(Name = "Sounds to play when a payment is made. One sound per line")]
+        public string Sounds{ get; set; }
+        [Display(Name = "Colors to rotate between with animation when a payment is made. First color is the default background. One color per line. Can be any valid css color value.")]
+        public string AnimationColors{ get; set; }
     }
 }

BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs

@@ -10,7 +10,6 @@ namespace BTCPayServer.Models.AppViewModels
         [Required]
         [MaxLength(5)]
         public string Currency { get; set; }
-        [MaxLength(5000)]
         public string Template { get; set; }
 
         [Display(Name = "Enable shopping cart")]

BTCPayServer/Models/AppViewModels/ViewCrowdfundViewModel.cs

@@ -10,6 +10,7 @@ namespace BTCPayServer.Models.AppViewModels
 {
     public class ViewCrowdfundViewModel
     {
+        public string HubPath { get; set; }
         public string StatusMessage{ get; set; }
         public string StoreId { get; set; }
         public string AppId { get; set; }
@@ -32,6 +33,8 @@ namespace BTCPayServer.Models.AppViewModels
         public bool SoundsEnabled { get; set; }
         public string DisqusShortname { get; set; }
         public bool AnimationsEnabled { get; set; }
+        public string[] AnimationColors { get; set; }
+        public string[] Sounds { get; set; }
         public int ResetEveryAmount { get; set; }
         public bool NeverReset { get; set; }
 

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -20,6 +20,7 @@ namespace BTCPayServer.Models.InvoicingModels
         public string CustomCSSLink { get; set; }
         public string CustomLogoLink { get; set; }
         public string DefaultLang { get; set; }
+        public bool LightningAmountInSatoshi { get; set; }
         public List<AvailableCrypto> AvailableCryptos { get; set; } = new List<AvailableCrypto>();
         public bool IsModal { get; set; }
         public bool IsLightning { get; set; }
@@ -64,5 +65,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public bool CoinSwitchEnabled { get; set; }
         public string CoinSwitchMode { get; set; }
         public string CoinSwitchMerchantId { get; set; }
+        public string RootPath { get; set; }
     }
 }

BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs

@@ -48,7 +48,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
 
         public string Id { get; set; }
         [Required] public string StoreId { get; set; }
-        [Required] public decimal Amount { get; set; }
+        [Required][Range(0, double.PositiveInfinity)]public decimal Amount { get; set; }
 
         [Display(Name = "The currency used for payment request. (e.g. BTC, LTC, USD, etc.)")]
         public string Currency { get; set; }
@@ -134,6 +134,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
         public string AmountCollectedFormatted { get; set; }
         public string AmountFormatted { get; set; }
         public bool AnyPendingInvoice { get; set; }
+        public string HubPath { get; set; }
 
         public class PaymentRequestInvoice
         {

BTCPayServer/Models/ServerViewModels/ServicesViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Configuration;
+using BTCPayServer.Services;
 
 namespace BTCPayServer.Models.ServerViewModels
 {
@@ -17,5 +18,7 @@ namespace BTCPayServer.Models.ServerViewModels
 
         public List<ExternalService> ExternalServices { get; set; } = new List<ExternalService>();
         public List<OtherExternalService> OtherExternalServices { get; set; } = new List<OtherExternalService>();
+        public List<OtherExternalService> TorHttpServices { get; set; } = new List<OtherExternalService>();
+        public List<OtherExternalService> TorOtherServices { get; set; } = new List<OtherExternalService>();
     }
 }

BTCPayServer/Models/StoreViewModels/CheckoutExperienceViewModel.cs

@@ -25,19 +25,6 @@ namespace BTCPayServer.Models.StoreViewModels
         public string DefaultPaymentMethod { get; set; }
         [Display(Name = "Default language on checkout")]
         public string DefaultLang { get; set; }
-        [Display(Name = "Do not propose lightning payment if value of the invoice is above...")]
-        [MaxLength(20)]
-        public string LightningMaxValue { get; set; }
-
-        [Display(Name = "Requires a refund email")]
-        public bool RequiresRefundEmail
-        {
-            get; set;
-        }
-
-        [Display(Name = "Do not propose on chain payment if the value of the invoice is below...")]
-        [MaxLength(20)]
-        public string OnChainMinValue { get; set; }
 
         [Display(Name = "Link to a custom CSS stylesheet")]
         [Uri]
@@ -49,9 +36,23 @@ namespace BTCPayServer.Models.StoreViewModels
         [Display(Name = "Custom HTML title to display on Checkout page")]
         public string HtmlTitle { get; set; }
 
+        [Display(Name = "Requires a refund email")]
+        public bool RequiresRefundEmail { get; set; }
+
+        [Display(Name = "Do not propose on chain payment if the value of the invoice is below...")]
+        [MaxLength(20)]
+        public string OnChainMinValue { get; set; }
+
+        [Display(Name = "Do not propose lightning payment if value of the invoice is above...")]
+        [MaxLength(20)]
+        public string LightningMaxValue { get; set; }
+
+        [Display(Name = "Display lightning payment amounts in Satoshis")]
+        public bool LightningAmountInSatoshi { get; set; }
+
         public void SetLanguages(LanguageService langService, string defaultLang)
         {
-            defaultLang = langService.GetLanguages().Any(language => language.Code == defaultLang)? defaultLang : "en";
+            defaultLang = langService.GetLanguages().Any(language => language.Code == defaultLang) ? defaultLang : "en";
             var choices = langService.GetLanguages().Select(o => new Format() { Name = o.DisplayName, Value = o.Code }).ToArray();
             var chosen = choices.FirstOrDefault(f => f.Value == defaultLang) ?? choices.FirstOrDefault();
             Languages = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);

BTCPayServer/Models/StoreViewModels/PayButtonViewModel.cs

@@ -3,11 +3,14 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.ModelBinders;
+using Microsoft.AspNetCore.Mvc;
 
 namespace BTCPayServer.Models.StoreViewModels
 {
     public class PayButtonViewModel
     {
+        [ModelBinder(BinderType = typeof(InvariantDecimalModelBinder))]
         public decimal Price { get; set; }
         public string InvoiceId { get; set; }
         [Required]

BTCPayServer/Models/StoreViewModels/RatesViewModel.cs

@@ -21,14 +21,16 @@ namespace BTCPayServer.Models.StoreViewModels
         {
             public string Name { get; set; }
             public string Value { get; set; }
+            public string Url { get; set; }
         }
         public void SetExchangeRates(CoinAverageExchange[] supportedList, string preferredExchange)
         {
             var defaultStore = preferredExchange ?? CoinAverageRateProvider.CoinAverageName;
-            var choices = supportedList.Select(o => new Format() { Name = o.Display, Value = o.Name }).ToArray();
+            var choices = supportedList.Select(o => new Format() { Name = o.Display, Value = o.Name, Url = o.Url }).ToArray();
             var chosen = choices.FirstOrDefault(f => f.Value == defaultStore) ?? choices.FirstOrDefault();
             Exchanges = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);
             PreferredExchange = chosen.Value;
+            RateSource = chosen.Url;
         }
 
         public List<TestResultViewModel> TestRateRules { get; set; }
@@ -42,6 +44,8 @@ namespace BTCPayServer.Models.StoreViewModels
         public string Script { get; set; }
         public string DefaultScript { get; set; }
         public string ScriptTest { get; set; }
+        public string DefaultCurrencyPairs { get; set; }
+        public string StoreId { get; set; }
         public CoinAverageExchange[] AvailableExchanges { get; set; }
 
         [Display(Name = "Add a spread on exchange rate of ... %")]
@@ -57,10 +61,8 @@ namespace BTCPayServer.Models.StoreViewModels
 
         public string RateSource
         {
-            get
-            {
-                return PreferredExchange == CoinAverageRateProvider.CoinAverageName ? "https://apiv2.bitcoinaverage.com/indices/global/ticker/short" : $"https://apiv2.bitcoinaverage.com/exchanges/{PreferredExchange}";
-            }
+            get;
+            set;
         }
     }
 }

BTCPayServer/PaymentRequest/PaymentRequestHub.cs

@@ -12,6 +12,7 @@ using BTCPayServer.Services.PaymentRequests;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using BTCPayServer.Services.Apps;
+using Microsoft.AspNetCore.Http;
 
 namespace BTCPayServer.PaymentRequest
 {
@@ -59,6 +60,15 @@ namespace BTCPayServer.PaymentRequest
                     break;
             }
         }
+
+        public static string GetHubPath(HttpRequest request)
+        {
+            return request.GetRelativePathOrAbsolute("/payment-requests/hub");
+        }
+        public static void Register(HubRouteBuilder route)
+        {
+            route.MapHub<PaymentRequestHub>("/payment-requests/hub");
+        }
     }
 
     public class PaymentRequestStreamer : EventHostedServiceBase

BTCPayServer/Payments/Changelly/Changelly.cs

@@ -19,11 +19,11 @@ namespace BTCPayServer.Payments.Changelly
         private readonly bool _showFiat;
         private readonly HttpClient _httpClient;
 
-        public Changelly(IHttpClientFactory httpClientFactory,  string apiKey, string apiSecret, string apiUrl, bool showFiat = true)
+        public Changelly(HttpClient httpClient,  string apiKey, string apiSecret, string apiUrl, bool showFiat = true)
         {
             _apisecret = apiSecret;
             _showFiat = showFiat;
-            _httpClient = httpClientFactory.CreateClient();
+            _httpClient = httpClient;
             _httpClient.BaseAddress = new Uri(apiUrl);
             _httpClient.DefaultRequestHeaders.Add("api-key", apiKey);
         }

BTCPayServer/Payments/Changelly/ChangellyClientProvider.cs

@@ -61,7 +61,7 @@ namespace BTCPayServer.Payments.Changelly
                 throw new ChangellyException("Changelly not enabled for this store");
             }
 
-            var changelly = new Changelly(_httpClientFactory, changellySettings.ApiKey, changellySettings.ApiSecret,
+            var changelly = new Changelly(_httpClientFactory.CreateClient("Changelly"), changellySettings.ApiKey, changellySettings.ApiSecret,
                 changellySettings.ApiUrl, changellySettings.ShowFiat);
             _clientCache.AddOrReplace(storeId, changelly);
             return changelly;

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -1,14 +1,16 @@
 using System;
+using System.Net.Sockets;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Lightning;
 using BTCPayServer.Services.Invoices;
+using BTCPayServer.Services;
+using NBitcoin;
 
 namespace BTCPayServer.Payments.Lightning
 {
@@ -17,15 +19,19 @@ namespace BTCPayServer.Payments.Lightning
         public static int LIGHTNING_TIMEOUT = 5000;
 
         NBXplorerDashboard _Dashboard;
+        private readonly SocketFactory _socketFactory;
+
         public LightningLikePaymentHandler(
-            NBXplorerDashboard dashboard)
+            NBXplorerDashboard dashboard,
+            SocketFactory socketFactory)
         {
             _Dashboard = dashboard;
+            _socketFactory = socketFactory;
         }
         public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network, object preparePaymentObject)
         {
             var storeBlob = store.GetStoreBlob();
-            var test = GetNodeInfo(supportedPaymentMethod, network);
+            var test = GetNodeInfo(paymentMethod.PreferOnion, supportedPaymentMethod, network);
             var invoice = paymentMethod.ParentEntity;
             var due = Extensions.RoundUp(invoice.ProductInformation.Price / paymentMethod.Rate, 8);
             var client = supportedPaymentMethod.CreateClient(network);
@@ -63,7 +69,7 @@ namespace BTCPayServer.Payments.Lightning
             };
         }
 
-        public async Task<NodeInfo> GetNodeInfo(LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
+        public async Task<NodeInfo> GetNodeInfo(bool preferOnion, LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
         {
             if (!_Dashboard.IsFullySynched(network.CryptoCode, out var summary))
                 throw new PaymentMethodUnavailableException($"Full node not available");
@@ -84,8 +90,8 @@ namespace BTCPayServer.Payments.Lightning
                 {
                     throw new PaymentMethodUnavailableException($"Error while connecting to the API ({ex.Message})");
                 }
-
-                if (info.NodeInfo == null)
+                var nodeInfo = info.NodeInfoList.FirstOrDefault(i => i.IsTor == preferOnion) ?? info.NodeInfoList.FirstOrDefault();
+                if (nodeInfo == null)
                 {
                     throw new PaymentMethodUnavailableException($"No lightning node public address has been configured");
                 }
@@ -96,7 +102,7 @@ namespace BTCPayServer.Payments.Lightning
                     throw new PaymentMethodUnavailableException($"The lightning node is not synched ({blocksGap} blocks left)");
                 }
 
-                return info.NodeInfo;
+                return nodeInfo;
             }
         }
 
@@ -104,22 +110,11 @@ namespace BTCPayServer.Payments.Lightning
         {
             try
             {
-                IPAddress address = null;
-                try
-                {
-                    address = IPAddress.Parse(nodeInfo.Host);
-                }
-                catch
-                {
-                    address = (await Dns.GetHostAddressesAsync(nodeInfo.Host)).FirstOrDefault();
-                }
+                if (!Utils.TryParseEndpoint(nodeInfo.Host, nodeInfo.Port, out var endpoint))
+                    throw new PaymentMethodUnavailableException($"Could not parse the endpoint {nodeInfo.Host}");
 
-                if (address == null)
-                    throw new PaymentMethodUnavailableException($"DNS did not resolve {nodeInfo.Host}");
-
-                using (var tcp = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp))
+                using (var tcp = await _socketFactory.ConnectAsync(endpoint, cancellation))
                 {
-                    await tcp.ConnectAsync(new IPEndPoint(address, nodeInfo.Port)).WithCancellation(cancellation);
                 }
             }
             catch (Exception ex)

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -10,117 +10,144 @@ using BTCPayServer.Services.Invoices;
 using Microsoft.Extensions.Hosting;
 using NBXplorer;
 using BTCPayServer.Lightning;
+using System.Collections.Concurrent;
+using System.Threading.Channels;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace BTCPayServer.Payments.Lightning
 {
     public class LightningListener : IHostedService
     {
-        class ListenedInvoice
-        {
-            public LightningLikePaymentMethodDetails PaymentMethodDetails { get; set; }
-            public LightningSupportedPaymentMethod SupportedPaymentMethod { get; set; }
-            public PaymentMethod PaymentMethod { get; set; }
-            public string Uri { get; internal set; }
-            public BTCPayNetwork Network { get; internal set; }
-            public string InvoiceId { get; internal set; }
-        }
-
         EventAggregator _Aggregator;
         InvoiceRepository _InvoiceRepository;
+        private readonly IMemoryCache _memoryCache;
         BTCPayNetworkProvider _NetworkProvider;
+        Channel<string> _CheckInvoices = Channel.CreateUnbounded<string>();
+        Task _CheckingInvoice;
+        Dictionary<(string, string), LightningInstanceListener> _InstanceListeners = new Dictionary<(string, string), LightningInstanceListener>();
+
         public LightningListener(EventAggregator aggregator,
                               InvoiceRepository invoiceRepository,
+                              IMemoryCache memoryCache,
                               BTCPayNetworkProvider networkProvider)
         {
             _Aggregator = aggregator;
             _InvoiceRepository = invoiceRepository;
+            _memoryCache = memoryCache;
             _NetworkProvider = networkProvider;
         }
 
+        async Task CheckingInvoice(CancellationToken cancellation)
+        {
+            while(await _CheckInvoices.Reader.WaitToReadAsync(cancellation) && 
+                        _CheckInvoices.Reader.TryRead(out var invoiceId))
+            {
+                try
+                {
+                    foreach (var listenedInvoice in (await GetListenedInvoices(invoiceId)).Where(i => !i.IsExpired()))
+                    {
+                        var instanceListenerKey = (listenedInvoice.Network.CryptoCode, listenedInvoice.SupportedPaymentMethod.GetLightningUrl().ToString());
+                        if (!_InstanceListeners.TryGetValue(instanceListenerKey, out var instanceListener) || 
+                            !instanceListener.IsListening)
+                        {
+                            instanceListener = instanceListener ?? new LightningInstanceListener(_InvoiceRepository, _Aggregator, listenedInvoice.SupportedPaymentMethod, listenedInvoice.Network);
+                            var status = await instanceListener.PollPayment(listenedInvoice, cancellation);
+                            if (status is null ||
+                                status is LightningInvoiceStatus.Paid ||
+                                status is LightningInvoiceStatus.Expired)
+                            {
+                                continue;
+                            }
+                            instanceListener.AddListenedInvoice(listenedInvoice);
+                            instanceListener.EnsureListening(cancellation);
+                            _InstanceListeners.TryAdd(instanceListenerKey, instanceListener);
+                        }
+                        else
+                        {
+                            instanceListener.AddListenedInvoice(listenedInvoice);
+                        }
+                    }
+                    foreach (var kv in _InstanceListeners)
+                    {
+                        kv.Value.RemoveExpiredInvoices();
+                    }
+                    foreach (var k in _InstanceListeners
+                                                    .Where(kv => !kv.Value.IsListening)
+                                                    .Select(kv => kv.Key).ToArray())
+                    {
+                        _InstanceListeners.Remove(k);
+                    }
+                }
+                catch when (!_Cts.Token.IsCancellationRequested)
+                {
+
+                }
+            }
+        }
+        private Task<List<ListenedInvoice>> GetListenedInvoices(string invoiceId)
+        {
+            return _memoryCache.GetOrCreateAsync(invoiceId, async (cacheEntry) =>
+            {
+                var listenedInvoices = new List<ListenedInvoice>();
+                var invoice = await _InvoiceRepository.GetInvoice(invoiceId);
+                foreach (var paymentMethod in invoice.GetPaymentMethods(_NetworkProvider)
+                                                              .Where(c => c.GetId().PaymentType == PaymentTypes.LightningLike))
+                {
+                    var lightningMethod = paymentMethod.GetPaymentMethodDetails() as LightningLikePaymentMethodDetails;
+                    if (lightningMethod == null)
+                        continue;
+                    var lightningSupportedMethod = invoice.GetSupportedPaymentMethod<LightningSupportedPaymentMethod>(_NetworkProvider)
+                                              .FirstOrDefault(c => c.CryptoCode == paymentMethod.GetId().CryptoCode);
+                    if (lightningSupportedMethod == null)
+                        continue;
+                    var network = _NetworkProvider.GetNetwork(paymentMethod.GetId().CryptoCode);
+
+                    listenedInvoices.Add(new ListenedInvoice()
+                    {
+                        Expiration = invoice.ExpirationTime,
+                        Uri = lightningSupportedMethod.GetLightningUrl().BaseUri.AbsoluteUri,
+                        PaymentMethodDetails = lightningMethod,
+                        SupportedPaymentMethod = lightningSupportedMethod,
+                        PaymentMethod = paymentMethod,
+                        Network = network,
+                        InvoiceId = invoice.Id
+                    });
+                }
+                var expiredIn = DateTimeOffset.UtcNow - invoice.ExpirationTime;
+                cacheEntry.AbsoluteExpiration = DateTimeOffset.UtcNow + (expiredIn >= TimeSpan.FromMinutes(5.0) ? expiredIn : TimeSpan.FromMinutes(5.0));
+                return listenedInvoices;
+            });
+        }
+
+        ConcurrentDictionary<string, LightningInstanceListener> _ListeningInstances = new ConcurrentDictionary<string, LightningInstanceListener>();
+
+
         CompositeDisposable leases = new CompositeDisposable();
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            leases.Add(_Aggregator.Subscribe<Events.InvoiceEvent>(async inv =>
+            leases.Add(_Aggregator.Subscribe<Events.InvoiceEvent>(inv =>
             {
                 if (inv.Name == InvoiceEvent.Created)
                 {
-                    await EnsureListening(inv.Invoice.Id, false);
+                    _CheckInvoices.Writer.TryWrite(inv.Invoice.Id);
                 }
             }));
-
+            _CheckingInvoice = CheckingInvoice(_Cts.Token);
             _ListenPoller = new Timer(async s =>
             {
                 try
                 {
-                    await Task.WhenAll((await _InvoiceRepository.GetPendingInvoices())
-                    .Select(async invoiceId => await EnsureListening(invoiceId, true))
-                    .ToArray());
-                }
-                catch (AggregateException ex)
-                {
-                    Logs.PayServer.LogError(ex.InnerException ?? ex.InnerExceptions.FirstOrDefault(), $"Lightning: Uncaught error");
-                }
-                catch (Exception ex)
-                {
-                    Logs.PayServer.LogError(ex, $"Lightning: Uncaught error");
+                    var invoiceIds = await _InvoiceRepository.GetPendingInvoices();
+                    foreach (var invoiceId in invoiceIds)
+                        _CheckInvoices.Writer.TryWrite(invoiceId);
                 }
+                catch { } // Never throw an unhandled exception on async void
+
             }, null, 0, (int)PollInterval.TotalMilliseconds);
             leases.Add(_ListenPoller);
             return Task.CompletedTask;
         }
 
-        private async Task EnsureListening(string invoiceId, bool poll)
-        {
-            if (Listening(invoiceId))
-                return;
-            var invoice = await _InvoiceRepository.GetInvoice(invoiceId);
-            foreach (var paymentMethod in invoice.GetPaymentMethods(_NetworkProvider)
-                                                          .Where(c => c.GetId().PaymentType == PaymentTypes.LightningLike))
-            {
-                var lightningMethod = paymentMethod.GetPaymentMethodDetails() as LightningLikePaymentMethodDetails;
-                if (lightningMethod == null)
-                    continue;
-                var lightningSupportedMethod = invoice.GetSupportedPaymentMethod<LightningSupportedPaymentMethod>(_NetworkProvider)
-                                          .FirstOrDefault(c => c.CryptoCode == paymentMethod.GetId().CryptoCode);
-                if (lightningSupportedMethod == null)
-                    continue;
-                var network = _NetworkProvider.GetNetwork(paymentMethod.GetId().CryptoCode);
-
-                var listenedInvoice = new ListenedInvoice()
-                {
-                    Uri = lightningSupportedMethod.GetLightningUrl().BaseUri.AbsoluteUri,
-                    PaymentMethodDetails = lightningMethod,
-                    SupportedPaymentMethod = lightningSupportedMethod,
-                    PaymentMethod = paymentMethod,
-                    Network = network,
-                    InvoiceId = invoice.Id
-                };
-
-                if (poll)
-                {
-                    var charge = lightningSupportedMethod.CreateClient(network);
-                    LightningInvoice chargeInvoice = null;
-                    try
-                    {
-                        chargeInvoice = await charge.GetInvoice(lightningMethod.InvoiceId);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logs.PayServer.LogError(ex, $"{lightningSupportedMethod.CryptoCode} (Lightning): Can't connect to the lightning server");
-                        continue;
-                    }
-                    if (chargeInvoice == null)
-                        continue;
-                    if (chargeInvoice.Status == LightningInvoiceStatus.Paid)
-                        await AddPayment(network, chargeInvoice, listenedInvoice);
-                    if (chargeInvoice.Status == LightningInvoiceStatus.Paid || chargeInvoice.Status == LightningInvoiceStatus.Expired)
-                        continue;
-                }
-
-                StartListening(listenedInvoice);
-            }
-        }
-
         TimeSpan _PollInterval = TimeSpan.FromMinutes(1.0);
         public TimeSpan PollInterval
         {
@@ -139,159 +166,190 @@ namespace BTCPayServer.Payments.Lightning
         }
 
         CancellationTokenSource _Cts = new CancellationTokenSource();
-        private async Task Listen(LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
-        {
-            ILightningInvoiceListener session = null;
-            try
-            {
-                Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Start listening {supportedPaymentMethod.GetLightningUrl().BaseUri}");
-                var lightningClient = supportedPaymentMethod.CreateClient(network);
-                session = await lightningClient.Listen(_Cts.Token);
-                while (true)
-                {
-                    var notification = await session.WaitInvoice(_Cts.Token);
-                    ListenedInvoice listenedInvoice = GetListenedInvoice(notification.Id);
-                    if (listenedInvoice == null)
-                        continue;
-                    if (notification.Id == listenedInvoice.PaymentMethodDetails.InvoiceId &&
-                       notification.BOLT11 == listenedInvoice.PaymentMethodDetails.BOLT11)
-                    {
-                        if (notification.Status == LightningInvoiceStatus.Paid && 
-                            notification.PaidAt.HasValue && notification.Amount != null)
-                        {
-                            await AddPayment(network, notification, listenedInvoice);
-                            if (DoneListening(listenedInvoice))
-                                break;
-                        }
-                        if (notification.Status == LightningInvoiceStatus.Expired)
-                        {
-                            if (DoneListening(listenedInvoice))
-                                break;
-                        }
-                    }
-                }
-            }
-            catch when (_Cts.IsCancellationRequested)
-            {
-            }
-            catch (Exception ex)
-            {
-                Logs.PayServer.LogError(ex, $"{supportedPaymentMethod.CryptoCode} (Lightning): Error while contacting {supportedPaymentMethod.GetLightningUrl().BaseUri}");
-                DoneListening(supportedPaymentMethod.GetLightningUrl());
-            }
-            finally
-            {
-                session?.Dispose();
-            }
-            Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Stop listening {supportedPaymentMethod.GetLightningUrl().BaseUri}");
-        }
-
-        private async Task AddPayment(BTCPayNetwork network, LightningInvoice notification, ListenedInvoice listenedInvoice)
-        {
-            var payment = await _InvoiceRepository.AddPayment(listenedInvoice.InvoiceId, notification.PaidAt.Value, new LightningLikePaymentData()
-            {
-                BOLT11 = notification.BOLT11,
-                PaymentHash = BOLT11PaymentRequest.Parse(notification.BOLT11, network.NBitcoinNetwork).PaymentHash,
-                Amount = notification.Amount
-            }, network, accounted: true);
-            if (payment != null)
-            {
-                var invoice = await _InvoiceRepository.GetInvoice(listenedInvoice.InvoiceId);
-                if (invoice != null)
-                    _Aggregator.Publish(new InvoiceEvent(invoice, 1002, InvoiceEvent.ReceivedPayment){Payment = payment});
-            }
-        }
-
-        List<Task> _ListeningLightning = new List<Task>();
-        MultiValueDictionary<string, ListenedInvoice> _ListenedInvoiceByLightningUrl = new MultiValueDictionary<string, ListenedInvoice>();
-        Dictionary<string, ListenedInvoice> _ListenedInvoiceByChargeInvoiceId = new Dictionary<string, ListenedInvoice>();
+        
         HashSet<string> _InvoiceIds = new HashSet<string>();
         private Timer _ListenPoller;
 
-        /// <summary>
-        /// Stop listening an invoice
-        /// </summary>
-        /// <param name="listenedInvoice">The invoice to stop listening</param>
-        /// <returns>true if still need to listen the lightning instance</returns>
-        bool DoneListening(ListenedInvoice listenedInvoice)
-        {
-            lock (_ListenedInvoiceByLightningUrl)
-            {
-                _ListenedInvoiceByChargeInvoiceId.Remove(listenedInvoice.PaymentMethodDetails.InvoiceId);
-                _ListenedInvoiceByLightningUrl.Remove(listenedInvoice.Uri, listenedInvoice);
-                _InvoiceIds.Remove(listenedInvoice.InvoiceId);
-                if (!_ListenedInvoiceByLightningUrl.ContainsKey(listenedInvoice.Uri))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Stop listening all invoices on this server
-        /// </summary>
-        /// <param name="uri"></param>
-        private void DoneListening(LightningConnectionString connectionString)
-        {
-            var uri = connectionString.BaseUri;
-            lock (_ListenedInvoiceByChargeInvoiceId)
-            {
-                foreach (var listenedInvoice in _ListenedInvoiceByLightningUrl[uri.AbsoluteUri])
-                {
-                    _ListenedInvoiceByChargeInvoiceId.Remove(listenedInvoice.PaymentMethodDetails.InvoiceId);
-                    _InvoiceIds.Remove(listenedInvoice.InvoiceId);
-                }
-                _ListenedInvoiceByLightningUrl.Remove(uri.AbsoluteUri);
-            }
-        }
-
-        bool Listening(string invoiceId)
-        {
-            lock (_ListenedInvoiceByLightningUrl)
-            {
-                return _InvoiceIds.Contains(invoiceId);
-            }
-        }
-
-        private ListenedInvoice GetListenedInvoice(string chargeInvoiceId)
-        {
-            ListenedInvoice listenedInvoice = null;
-            lock (_ListenedInvoiceByLightningUrl)
-            {
-                _ListenedInvoiceByChargeInvoiceId.TryGetValue(chargeInvoiceId, out listenedInvoice);
-            }
-            return listenedInvoice;
-        }
-
-        bool StartListening(ListenedInvoice listenedInvoice)
-        {
-            lock (_ListenedInvoiceByLightningUrl)
-            {
-                if (_InvoiceIds.Contains(listenedInvoice.InvoiceId))
-                    return false;
-                if (!_ListenedInvoiceByLightningUrl.ContainsKey(listenedInvoice.Uri))
-                {
-                    var listen = Listen(listenedInvoice.SupportedPaymentMethod, listenedInvoice.Network);
-                    _ListeningLightning.Add(listen);
-                }
-                _ListenedInvoiceByLightningUrl.Add(listenedInvoice.Uri, listenedInvoice);
-                _ListenedInvoiceByChargeInvoiceId.Add(listenedInvoice.PaymentMethodDetails.InvoiceId, listenedInvoice);
-                _InvoiceIds.Add(listenedInvoice.InvoiceId);
-            }
-            return true;
-        }
-
         public async Task StopAsync(CancellationToken cancellationToken)
         {
             leases.Dispose();
             _Cts.Cancel();
-            Task[] listening = null;
-            lock (_ListenedInvoiceByLightningUrl)
+            try
             {
-                listening = _ListeningLightning.ToArray();
+                await _CheckingInvoice;
             }
-            await Task.WhenAll(listening);
+            catch (OperationCanceledException)
+            {
+
+            }
+            try
+            {
+                await Task.WhenAll(_ListeningInstances.Select(c => c.Value.Listening).ToArray());
+            }
+            catch (OperationCanceledException)
+            {
+
+            }
+            Logs.PayServer.LogInformation("Lightning listened stopped");
         }
     }
+
+
+    public class LightningInstanceListener
+    {
+        private LightningSupportedPaymentMethod supportedPaymentMethod;
+        private readonly InvoiceRepository invoiceRepository;
+        private readonly EventAggregator _eventAggregator;
+        private readonly BTCPayNetwork network;
+
+        public LightningInstanceListener(InvoiceRepository invoiceRepository,
+                                        EventAggregator eventAggregator,
+                                        LightningSupportedPaymentMethod supportedPaymentMethod,
+                                        BTCPayNetwork network)
+        {
+            this.supportedPaymentMethod = supportedPaymentMethod;
+            this.invoiceRepository = invoiceRepository;
+            _eventAggregator = eventAggregator;
+            this.network = network;
+        }
+        internal bool AddListenedInvoice(ListenedInvoice invoice)
+        {
+            return _ListenedInvoices.TryAdd(invoice.PaymentMethodDetails.InvoiceId, invoice);
+        }
+
+        internal async Task<LightningInvoiceStatus?> PollPayment(ListenedInvoice listenedInvoice, CancellationToken cancellation)
+        {
+            var client = supportedPaymentMethod.CreateClient(network);
+            LightningInvoice lightningInvoice = await client.GetInvoice(listenedInvoice.PaymentMethodDetails.InvoiceId);
+            if (lightningInvoice?.Status is LightningInvoiceStatus.Paid && 
+                await AddPayment(lightningInvoice, listenedInvoice.InvoiceId))
+            {
+                Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Payment detected via polling on {listenedInvoice.InvoiceId}");
+            }
+            return lightningInvoice?.Status;
+        }
+
+        public bool IsListening => Listening?.Status is TaskStatus.Running || Listening?.Status is TaskStatus.WaitingForActivation;
+        public Task Listening { get; set; }
+        public void EnsureListening(CancellationToken cancellation)
+        {
+            if (!IsListening)
+            {
+                StopListeningCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellation);
+                Listening = Listen(StopListeningCancellationTokenSource.Token);
+            }
+        }
+        public CancellationTokenSource StopListeningCancellationTokenSource;
+        async Task Listen(CancellationToken cancellation)
+        {
+            Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Start listening {supportedPaymentMethod.GetLightningUrl().BaseUri}");
+            try
+            {
+                var lightningClient = supportedPaymentMethod.CreateClient(network);
+                using (var session = await lightningClient.Listen(cancellation))
+                {
+                    // Just in case the payment arrived after our last poll but before we listened.
+                    await PollAllListenedInvoices(cancellation);
+                    if (_ErrorAlreadyLogged)
+                    {
+                        Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Could reconnect successfully to {supportedPaymentMethod.GetLightningUrl().BaseUri}");
+                    }
+                    _ErrorAlreadyLogged = false;
+                    while (!_ListenedInvoices.IsEmpty)
+                    {
+                        var notification = await session.WaitInvoice(cancellation);
+                        if (!_ListenedInvoices.TryGetValue(notification.Id, out var listenedInvoice))
+                            continue;
+                        if (notification.Id == listenedInvoice.PaymentMethodDetails.InvoiceId &&
+                            notification.BOLT11 == listenedInvoice.PaymentMethodDetails.BOLT11)
+                        {
+                            if (notification.Status == LightningInvoiceStatus.Paid &&
+                                notification.PaidAt.HasValue && notification.Amount != null)
+                            {
+                                if (await AddPayment(notification, listenedInvoice.InvoiceId))
+                                {
+                                    Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Payment detected via notification ({listenedInvoice.InvoiceId})");
+                                }
+                                _ListenedInvoices.TryRemove(notification.Id, out var _);
+                            }
+                            else if (notification.Status == LightningInvoiceStatus.Expired)
+                            {
+                                _ListenedInvoices.TryRemove(notification.Id, out var _);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex) when (!cancellation.IsCancellationRequested && !_ErrorAlreadyLogged)
+            {
+                _ErrorAlreadyLogged = true;
+                Logs.PayServer.LogError(ex, $"{supportedPaymentMethod.CryptoCode} (Lightning): Error while contacting {supportedPaymentMethod.GetLightningUrl().BaseUri}");
+                Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Stop listening {supportedPaymentMethod.GetLightningUrl().BaseUri}");
+            }
+            catch (OperationCanceledException) when (cancellation.IsCancellationRequested) { }
+            if (_ListenedInvoices.IsEmpty)
+                Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): No more invoice to listen on {supportedPaymentMethod.GetLightningUrl().BaseUri}, releasing the connection.");
+        }
+        public DateTimeOffset? LastFullPoll { get; set; }
+
+        internal async Task PollAllListenedInvoices(CancellationToken cancellation)
+        {
+            foreach (var invoice in _ListenedInvoices.Values)
+            {
+                var status = await PollPayment(invoice, cancellation);
+                if (status is null ||
+                        status is LightningInvoiceStatus.Paid ||
+                        status is LightningInvoiceStatus.Expired)
+                    _ListenedInvoices.TryRemove(invoice.PaymentMethodDetails.InvoiceId, out var _);
+            }
+            LastFullPoll = DateTimeOffset.UtcNow;
+            if (_ListenedInvoices.IsEmpty)
+            {
+                StopListeningCancellationTokenSource?.Cancel();
+            }
+        }
+
+        bool _ErrorAlreadyLogged = false;
+        ConcurrentDictionary<string, ListenedInvoice> _ListenedInvoices = new ConcurrentDictionary<string, ListenedInvoice>();
+
+        public async Task<bool> AddPayment(LightningInvoice notification, string invoiceId)
+        {
+            var payment = await invoiceRepository.AddPayment(invoiceId, notification.PaidAt.Value, new LightningLikePaymentData()
+            {
+                BOLT11 = notification.BOLT11,
+                PaymentHash = BOLT11PaymentRequest.Parse(notification.BOLT11, network.NBitcoinNetwork).PaymentHash,
+                Amount = notification.AmountReceived ?? notification.Amount, // if running old version amount received might be unavailable
+            }, network, accounted: true);
+            if (payment != null)
+            {
+                var invoice = await invoiceRepository.GetInvoice(invoiceId);
+                if (invoice != null)
+                    _eventAggregator.Publish(new InvoiceEvent(invoice, 1002, InvoiceEvent.ReceivedPayment) { Payment = payment });
+            }
+            return payment != null;
+        }
+
+        internal void RemoveExpiredInvoices()
+        {
+            foreach (var invoice in _ListenedInvoices)
+            {
+                if (invoice.Value.IsExpired())
+                    _ListenedInvoices.TryRemove(invoice.Key, out var _);
+            }
+            if (_ListenedInvoices.IsEmpty)
+                StopListeningCancellationTokenSource?.Cancel();
+        }
+    }
+
+    class ListenedInvoice
+    {
+        public bool IsExpired() { return DateTimeOffset.UtcNow > Expiration; }
+        public DateTimeOffset Expiration { get; set; }
+        public LightningLikePaymentMethodDetails PaymentMethodDetails { get; set; }
+        public LightningSupportedPaymentMethod SupportedPaymentMethod { get; set; }
+        public PaymentMethod PaymentMethod { get; set; }
+        public string Uri { get; internal set; }
+        public BTCPayNetwork Network { get; internal set; }
+        public string InvoiceId { get; internal set; }
+    }
 }

BTCPayServer/Program.cs

@@ -51,6 +51,7 @@ namespace BTCPayServer
                     .ConfigureLogging(l =>
                     {
                         l.AddFilter("Microsoft", LogLevel.Error);
+                        l.AddFilter("System.Net.Http.HttpClient", LogLevel.Critical);
                         l.AddFilter("Microsoft.AspNetCore.Antiforgery.Internal", LogLevel.Critical);
                         l.AddProvider(new CustomConsoleLogProvider(processor));
 

BTCPayServer/Security/BitpayAuthentication.cs

@@ -57,38 +57,52 @@ namespace BTCPayServer.Security
                     List<Claim> claims = new List<Claim>();
                     var bitpayAuth = Context.Request.HttpContext.GetBitpayAuth();
                     string storeId = null;
-
+                    bool anonymous = true;
                     bool? success = null;
                     if (!string.IsNullOrEmpty(bitpayAuth.Signature) && !string.IsNullOrEmpty(bitpayAuth.Id))
                     {
                         var result = await CheckBitId(Context.Request.HttpContext, bitpayAuth.Signature, bitpayAuth.Id, claims);
                         storeId = result.StoreId;
                         success = result.SuccessAuth;
+                        anonymous = false;
                     }
                     else if (!string.IsNullOrEmpty(bitpayAuth.Authorization))
                     {
                         storeId = await CheckLegacyAPIKey(Context.Request.HttpContext, bitpayAuth.Authorization);
                         success = storeId != null;
+                        anonymous = false;
+                    }
+                    else
+                    {
+                        if (Context.Request.HttpContext.Request.Query.TryGetValue("storeId", out var storeIdStringValues))
+                        {
+                            storeId = storeIdStringValues.FirstOrDefault() ?? string.Empty;
+                            success = true;
+                            anonymous = true;
+                        }
                     }
 
-                    if (success.HasValue)
+                    if (success is true)
                     {
-                        if (success.Value)
+                        if (storeId != null)
                         {
-                            if (storeId != null)
+                            claims.Add(new Claim(Policies.CanCreateInvoice.Key, storeId));
+                            var store = await _StoreRepository.FindStore(storeId);
+                            if (store == null ||
+                               (anonymous && !store.GetStoreBlob().AnyoneCanInvoice))
                             {
-                                claims.Add(new Claim(Policies.CanCreateInvoice.Key, storeId));
-                                var store = await _StoreRepository.FindStore(storeId);
-                                store.AdditionalClaims.AddRange(claims);
-                                Context.Request.HttpContext.SetStoreData(store);
+                                return AuthenticateResult.Fail("Invalid credentials");
                             }
-                            return AuthenticateResult.Success(new AuthenticationTicket(new ClaimsPrincipal(new ClaimsIdentity(claims, Policies.BitpayAuthentication)), Policies.BitpayAuthentication));
-                        }
-                        else
-                        {
-                            return AuthenticateResult.Fail("Invalid credentials");
+                            store.AdditionalClaims.AddRange(claims);
+                            Context.Request.HttpContext.SetStoreData(store);
                         }
+                        return AuthenticateResult.Success(new AuthenticationTicket(new ClaimsPrincipal(new ClaimsIdentity(claims, Policies.BitpayAuthentication)), Policies.BitpayAuthentication));
                     }
+                    else if (success is false)
+                    {
+                        return AuthenticateResult.Fail("Invalid credentials");
+                    }
+                    // else if (success is null)
                 }
                 return AuthenticateResult.NoResult();
             }

BTCPayServer/Services/Apps/AppHub.cs

@@ -2,6 +2,7 @@ using System;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Models.AppViewModels;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
@@ -62,5 +63,13 @@ namespace BTCPayServer.Services.Apps
 
         }
 
+        public static string GetHubPath(HttpRequest request)
+        {
+            return request.GetRelativePathOrAbsolute("/apps/hub");
+        }
+        public static void Register(HubRouteBuilder route)
+        {
+            route.MapHub<AppHub>("/apps/hub");
+        }
     }
 }

BTCPayServer/Services/Apps/AppService.cs

@@ -92,10 +92,6 @@ namespace BTCPayServer.Services.Apps
             var completeInvoices = invoices.Where(entity => entity.Status == InvoiceStatus.Complete || entity.Status == InvoiceStatus.Confirmed).ToArray();
             var pendingInvoices = invoices.Where(entity => !(entity.Status == InvoiceStatus.Complete || entity.Status == InvoiceStatus.Confirmed)).ToArray();
 
-            
-
-            var rateRules = appData.StoreData.GetStoreBlob().GetRateRules(_Networks);
-
             var pendingPayments = GetContributionsByPaymentMethodId(settings.TargetCurrency, pendingInvoices, !settings.EnforceTargetAmount);
             var currentPayments = GetContributionsByPaymentMethodId(settings.TargetCurrency, completeInvoices, !settings.EnforceTargetAmount);
 
@@ -142,6 +138,8 @@ namespace BTCPayServer.Services.Apps
                 DisplayPerksRanking = settings.DisplayPerksRanking,
                 PerkCount = perkCount,
                 NeverReset = settings.ResetEvery == CrowdfundResetEvery.Never,
+                Sounds = settings.Sounds,
+                AnimationColors = settings.AnimationColors,
                 CurrencyData = _Currencies.GetCurrencyData(settings.TargetCurrency, true),
                 Info = new ViewCrowdfundViewModel.CrowdfundInfo()
                 {

BTCPayServer/Services/Apps/CrowdfundSettings.cs

@@ -34,6 +34,54 @@ namespace BTCPayServer.Services.Apps
         public bool UseAllStoreInvoices { get; set; }
         public bool DisplayPerksRanking { get; set; }
         public bool SortPerksByPopularity { get; set; }
+        public string[] AnimationColors { get; set; } = new string[]
+        {
+            "#FF6138", "#FFBE53", "#2980B9", "#282741"
+        };
+
+        public string[] Sounds { get; set; } = new string[]
+        {
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/dominating.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/doublekill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/doublekill2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/eagleeye.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/firstblood.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/firstblood2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/firstblood3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/flawless.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/godlike.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/hattrick.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/headhunter.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/headshot.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/headshot2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/headshot3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/holyshit.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/killingspree.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/knife.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/knife2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/knife3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/ludicrouskill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/megakill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/monsterkill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/multikill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/nade.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/ownage.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/payback.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/prepare.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/prepare2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/prepare3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/prepare4.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/rampage.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/suicide.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/suicide2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/suicide3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/suicide4.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/teamkiller.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/triplekill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/ultrakill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/unstoppable.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/whickedsick.wav"
+        };
     }
     public enum CrowdfundResetEvery
     {

BTCPayServer/Services/BTCPayServerEnvironment.cs

@@ -14,7 +14,8 @@ namespace BTCPayServer.Services
     public class BTCPayServerEnvironment
     {
         IHttpContextAccessor httpContext;
-        public BTCPayServerEnvironment(IHostingEnvironment env, BTCPayNetworkProvider provider, IHttpContextAccessor httpContext)
+        TorServices torServices;
+        public BTCPayServerEnvironment(IHostingEnvironment env, BTCPayNetworkProvider provider, IHttpContextAccessor httpContext, TorServices torServices)
         {
             this.httpContext = httpContext;
             Version = typeof(BTCPayServerEnvironment).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
@@ -25,6 +26,7 @@ namespace BTCPayServer.Services
 #endif
             Environment = env;
             NetworkType = provider.NetworkType;
+            this.torServices = torServices;
         }
         public IHostingEnvironment Environment
         {
@@ -34,6 +36,8 @@ namespace BTCPayServer.Services
         public string ExpectedDomain => httpContext.HttpContext.Request.Host.Host;
         public string ExpectedHost => httpContext.HttpContext.Request.Host.Value;
         public string ExpectedProtocol => httpContext.HttpContext.Request.Scheme;
+        public string OnionUrl => this.torServices.Services.Where(s => s.ServiceType == TorServiceType.BTCPayServer)
+                                                           .Select(s => $"http://{s.OnionHost}").FirstOrDefault();
 
         public NetworkType NetworkType { get; set; }
         public string Version

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -717,6 +717,12 @@ namespace BTCPayServer.Services.Invoices
         [Obsolete("Use GetId().PaymentType instead")]
         public string PaymentType { get; set; }
 
+        /// <summary>
+        /// We only use this to pass a singleton asking to the payment handler to prefer payments through TOR, we don't really
+        /// need to save this information
+        /// </summary>
+        [JsonIgnore]
+        public bool PreferOnion { get; set; }
 
         public PaymentMethodId GetId()
         {

BTCPayServer/Services/PoliciesSettings.cs

@@ -18,5 +18,9 @@ namespace BTCPayServer.Services
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
         [Display(Name = "Disable registration")]
         public bool LockSubscription { get; set; }
+        
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        [Display(Name = "Discourage search engines from indexing this site")]
+        public bool DiscourageSearchEngines { get; set; }
     }
 }

BTCPayServer/Services/Rates/BitbankRateProvider.cs

@@ -0,0 +1,32 @@
+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), new BidAsk(p.Value["buy"].Value<decimal>(), p.Value["sell"].Value<decimal>())))
+                .ToArray());
+                
+        }
+    }
+}

BTCPayServer/Services/Rates/CoinAverageRateProvider.cs

@@ -66,7 +66,7 @@ namespace BTCPayServer.Services.Rates
             }
             set
             {
-                _LocalClient = null;
+                _LocalClient = value;
             }
         }
         HttpClient _LocalClient;

BTCPayServer/Services/Rates/CoinAverageSettings.cs

@@ -23,20 +23,18 @@ namespace BTCPayServer.Services.Rates
 
     public class CoinAverageExchange
     {
-        public CoinAverageExchange(string name, string display)
+        public CoinAverageExchange(string name, string display, string url)
         {
             Name = name;
             Display = display;
+            Url = url;
         }
         public string Name { get; set; }
         public string Display { get; set; }
         public string Url
         {
-            get
-            {
-                return Name == CoinAverageRateProvider.CoinAverageName ? $"https://apiv2.bitcoinaverage.com/indices/global/ticker/short"
-                                     : $"https://apiv2.bitcoinaverage.com/exchanges/{Name}";
-            }
+            get;
+            set;
         }
     }
     public class CoinAverageExchanges : Dictionary<string, CoinAverageExchange>
@@ -47,7 +45,11 @@ namespace BTCPayServer.Services.Rates
 
         public void Add(CoinAverageExchange exchange)
         {
-            TryAdd(exchange.Name, exchange);
+            if (!TryAdd(exchange.Name, exchange))
+            {
+                this.Remove(exchange.Name);
+                this.Add(exchange.Name, exchange);
+            }
         }
     }
     public class CoinAverageSettings : ICoinAverageAuthenticator
@@ -84,7 +86,6 @@ namespace BTCPayServer.Services.Rates
                 (DisplayName: "Coincheck", Name: "coincheck"),
                 (DisplayName: "Bittylicious", Name: "bittylicious"),
                 (DisplayName: "Gemini", Name: "gemini"),
-                (DisplayName: "QuadrigaCX", Name: "quadrigacx"),
                 (DisplayName: "Bit2C", Name: "bit2c"),
                 (DisplayName: "Luno", Name: "luno"),
                 (DisplayName: "Negocie Coins", Name: "negociecoins"),
@@ -122,7 +123,7 @@ namespace BTCPayServer.Services.Rates
                 (DisplayName: "Bitso", Name: "bitso"),
                 })
             {
-                AvailableExchanges.TryAdd(item.Name, new CoinAverageExchange(item.Name, item.DisplayName));
+                AvailableExchanges.TryAdd(item.Name, new CoinAverageExchange(item.Name, item.DisplayName, $"https://apiv2.bitcoinaverage.com/exchanges/{item.Name}"));
             }
         }
 

BTCPayServer/Services/Rates/KrakenExchangeRateProvider.cs

@@ -29,7 +29,7 @@ namespace BTCPayServer.Services.Rates
             }
             set
             {
-                _LocalClient = null;
+                _LocalClient = value;
             }
         }
 

BTCPayServer/Services/Rates/RateProviderFactory.cs

@@ -110,9 +110,10 @@ namespace BTCPayServer.Services.Rates
 
             // Handmade providers
             Providers.Add(QuadrigacxRateProvider.QuadrigacxName, new QuadrigacxRateProvider());
-            Providers.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, HttpClient = _httpClientFactory?.CreateClient(), Authenticator = _CoinAverageSettings });
-            Providers.Add("kraken", new KrakenExchangeRateProvider() { HttpClient = _httpClientFactory?.CreateClient() });
-            Providers.Add("bylls", new ByllsRateProvider(_httpClientFactory?.CreateClient()));
+            Providers.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, HttpClient = _httpClientFactory?.CreateClient("EXCHANGE_COINAVERAGE"), Authenticator = _CoinAverageSettings });
+            Providers.Add("kraken", new KrakenExchangeRateProvider() { HttpClient = _httpClientFactory?.CreateClient("EXCHANGE_KRAKEN") });
+            Providers.Add("bylls", new ByllsRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BYLLS")));
+            Providers.Add("bitbank", new BitbankRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BITBANK")));
 
             // Those exchanges make multiple requests when calling GetTickers so we remove them
             //DirectProviders.Add("gdax", new ExchangeSharpRateProvider("gdax", new ExchangeGdaxAPI()));
@@ -168,9 +169,9 @@ namespace BTCPayServer.Services.Rates
             }
 
             // Add other exchanges supported here
-            exchanges.Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average"));
-            exchanges.Add(new CoinAverageExchange("bylls", "Bylls"));
-            exchanges.Add(new CoinAverageExchange("cryptopia", "Cryptopia"));
+            exchanges.Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average", $"https://apiv2.bitcoinaverage.com/indices/global/ticker/short"));
+            exchanges.Add(new CoinAverageExchange("bylls", "Bylls", "https://bylls.com/api/price?from_currency=BTC&to_currency=CAD"));
+            exchanges.Add(new CoinAverageExchange("bitbank", "Bitbank", "https://public.bitbank.cc/prices"));
 
             return exchanges;
         }

BTCPayServer/Services/SocketFactory.cs

@@ -0,0 +1,96 @@
+using System;
+using NBitcoin;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Configuration;
+
+namespace BTCPayServer.Services
+{
+    public class SocketFactory
+    {
+        private readonly BTCPayServerOptions _options;
+        public SocketFactory(BTCPayServerOptions options)
+        {
+            _options = options;
+        }
+        public async Task<Socket> ConnectAsync(EndPoint endPoint, CancellationToken cancellationToken)
+        {
+            Socket socket = null;
+            try
+            {
+                if (endPoint is IPEndPoint ipEndpoint)
+                {
+                    socket = new Socket(ipEndpoint.Address.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+                    await socket.ConnectAsync(ipEndpoint).WithCancellation(cancellationToken);
+                }
+                else if (IsTor(endPoint))
+                {
+                    if (_options.SocksEndpoint == null)
+                        throw new NotSupportedException("It is impossible to connect to an onion address without btcpay's -socksendpoint configured");
+                    if (_options.SocksEndpoint.AddressFamily != AddressFamily.Unspecified)
+                    {
+                        socket = new Socket(_options.SocksEndpoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+                    }
+                    else
+                    {
+                        // If the socket is a DnsEndpoint, we allow either ipv6 or ipv4
+                        socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp);
+                        socket.DualMode = true;
+                    }
+                    await socket.ConnectAsync(_options.SocksEndpoint).WithCancellation(cancellationToken);
+                    await NBitcoin.Socks.SocksHelper.Handshake(socket, endPoint, cancellationToken);
+                }
+                else if (endPoint is DnsEndPoint dnsEndPoint)
+                {
+                    var address = (await Dns.GetHostAddressesAsync(dnsEndPoint.Host)).FirstOrDefault();
+                    socket = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+                    await socket.ConnectAsync(dnsEndPoint).WithCancellation(cancellationToken);
+                }
+                else
+                    throw new NotSupportedException("Endpoint type not supported");
+            }
+            catch
+            {
+                CloseSocket(ref socket);
+                throw;
+            }
+            return socket;
+        }
+
+        private bool IsTor(EndPoint endPoint)
+        {
+            if (endPoint is IPEndPoint)
+                return endPoint.AsOnionDNSEndpoint() != null;
+            if (endPoint is DnsEndPoint dns)
+                return dns.Host.EndsWith(".onion", StringComparison.OrdinalIgnoreCase);
+            return false;
+        }
+
+        private void CloseSocket(ref Socket s)
+        {
+            if (s == null)
+                return;
+            try
+            {
+                s.Shutdown(SocketShutdown.Both);
+            }
+            catch
+            {
+                try
+                {
+                    s.Dispose();
+                }
+                catch { }
+            }
+            finally
+            {
+                s = null;
+            }
+        }
+    }
+}

BTCPayServer/Services/TorServices.cs

@@ -0,0 +1,90 @@
+using System;
+using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Configuration;
+using BTCPayServer.Logging;
+
+namespace BTCPayServer.Services
+{
+    public class TorServices
+    {
+        BTCPayServerOptions _Options;
+        public TorServices(BTCPayServerOptions options)
+        {
+            _Options = options;
+        }
+
+        public TorService[] Services { get; internal set; } = Array.Empty<TorService>();
+
+
+        internal async Task Refresh()
+        {
+            if (string.IsNullOrEmpty(_Options.TorrcFile) || !File.Exists(_Options.TorrcFile))
+            {
+                if (!string.IsNullOrEmpty(_Options.TorrcFile))
+                    Logs.PayServer.LogWarning("Torrc file is not found");
+                Services = Array.Empty<TorService>();
+                return;
+            }
+            List<TorService> result = new List<TorService>();
+            try
+            {
+                var torrcContent = await File.ReadAllTextAsync(_Options.TorrcFile);
+                if (!Torrc.TryParse(torrcContent, out var torrc))
+                {
+                    Logs.PayServer.LogWarning("Torrc file could not be parsed");
+                    Services = Array.Empty<TorService>();
+                    return;
+                }
+
+                var services = torrc.ServiceDirectories.SelectMany(d => d.ServicePorts.Select(p => (Directory: new DirectoryInfo(d.DirectoryPath), VirtualPort: p.VirtualPort)))
+                .Select(d => (ServiceName: d.Directory.Name,
+                              ReadingLines: System.IO.File.ReadAllLinesAsync(Path.Combine(d.Directory.FullName, "hostname")),
+                              VirtualPort: d.VirtualPort))
+                .ToArray();
+                foreach (var service in services)
+                {
+                    try
+                    {
+                        var onionHost = (await service.ReadingLines)[0].Trim();
+                        var torService = new TorService()
+                        {
+                            Name = service.ServiceName,
+                            OnionHost = onionHost,
+                            VirtualPort = service.VirtualPort
+                        };
+                        if (service.ServiceName.Equals("BTCPayServer", StringComparison.OrdinalIgnoreCase))
+                            torService.ServiceType = TorServiceType.BTCPayServer;
+                        result.Add(torService);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logs.PayServer.LogWarning(ex, $"Error while reading hidden service {service.ServiceName} configuration");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logs.PayServer.LogWarning(ex, $"Error while reading torrc file");
+            }
+            Services = result.ToArray();
+        }
+    }
+
+    public class TorService
+    {
+        public TorServiceType ServiceType { get; set; } = TorServiceType.Other;
+        public string Name { get; set; }
+        public string OnionHost { get; set; }
+        public int VirtualPort { get; set; }
+    }
+
+    public enum TorServiceType
+    {
+        BTCPayServer,
+        Other
+    }
+}

BTCPayServer/Services/Torrc.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services
+{
+    public class Torrc
+    {
+        public static bool TryParse(string str, out Torrc value)
+        {
+            value = null;
+            List<HiddenServiceDir> serviceDirectories = new List<HiddenServiceDir>();
+            var lines = str.Split(new char[] { '\n' });
+            HiddenServiceDir currentDirectory = null;
+            foreach (var line in lines)
+            {
+                if (HiddenServiceDir.TryParse(line, out var dir))
+                {
+                    serviceDirectories.Add(dir);
+                    currentDirectory = dir;
+                }
+                else if (HiddenServicePortDefinition.TryParse(line, out var portDef) && currentDirectory != null)
+                {
+                    currentDirectory.ServicePorts.Add(portDef);
+                }
+            }
+            value = new Torrc() { ServiceDirectories = serviceDirectories };
+            return true;
+        }
+
+        public List<HiddenServiceDir> ServiceDirectories { get; set; } = new List<HiddenServiceDir>();
+
+        public override string ToString()
+        {
+            StringBuilder builder = new StringBuilder();
+            foreach(var serviceDir in ServiceDirectories)
+            {
+                builder.AppendLine(serviceDir.ToString());
+                foreach (var port in serviceDir.ServicePorts)
+                    builder.AppendLine(port.ToString());
+            }
+            return builder.ToString();
+        }
+    }
+
+    public class HiddenServiceDir
+    {
+        public static bool TryParse(string str, out HiddenServiceDir serviceDir)
+        {
+            serviceDir = null;
+            if (!str.Trim().StartsWith("HiddenServiceDir ", StringComparison.OrdinalIgnoreCase))
+                return false;
+            var parts = str.Split(new char[] { ' ', '\t' }, StringSplitOptions.None);
+            if (parts.Length != 2)
+                return false;
+            serviceDir = new HiddenServiceDir() { DirectoryPath = parts[1].Trim() };
+            return true;
+        }
+
+        public string DirectoryPath { get; set; }
+        public List<HiddenServicePortDefinition> ServicePorts { get; set; } = new List<HiddenServicePortDefinition>();
+
+        public override string ToString()
+        {
+            return $"HiddenServiceDir {DirectoryPath}";
+        }
+    }
+    public class HiddenServicePortDefinition
+    {
+        public static bool TryParse(string str, out HiddenServicePortDefinition portDefinition)
+        {
+            portDefinition = null;
+            if (!str.Trim().StartsWith("HiddenServicePort ", StringComparison.OrdinalIgnoreCase))
+                return false;
+            var parts = str.Split(new char[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+            if (parts.Length != 3)
+                return false;
+            if (!int.TryParse(parts[1].Trim(), out int virtualPort))
+                return false;
+            var addressPort = parts[2].Trim().Split(':', StringSplitOptions.RemoveEmptyEntries);
+            if (addressPort.Length != 2)
+                return false;
+            if (!int.TryParse(addressPort[1].Trim(), out int port))
+                return false;
+            if (!IPAddress.TryParse(addressPort[0].Trim(), out IPAddress address))
+                return false;
+            portDefinition = new HiddenServicePortDefinition() { VirtualPort = virtualPort, Endpoint = new IPEndPoint(address, port) };
+            return true;
+        }
+        public int VirtualPort { get; set; }
+        public IPEndPoint Endpoint { get; set; }
+        public override string ToString()
+        {
+            return $"HiddenServicePort {VirtualPort} {Endpoint}";
+        }
+    }
+}

BTCPayServer/Views/Apps/ListApps.cshtml

@@ -21,8 +21,13 @@
             </div>
         </div>
 
+        <div class="row no-gutter" style="margin-bottom: 5px;">
+            <div class="col-lg-6">
+                <a asp-action="CreateApp" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new app</a>
+                <a href="https://docs.btcpayserver.org/features/apps" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+            </div>
+        </div>
         <div class="row">
-            <a asp-action="CreateApp" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new app</a>
             <table class="table table-sm table-responsive-md">
                 <thead>
                     <tr>

BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @model UpdateCrowdfundViewModel
 @{
     ViewData["Title"] = "Update Crowdfund";
@@ -67,8 +67,8 @@
                     <div class="form-group">
                         <label asp-for="StartDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="StartDate" class="form-control datetime"/>
-                            <div class="input-group-append only-for-js">
+                            <input asp-for="StartDate" class="form-control datetime"  placeholder="No start date has been set for this crowdfund"/>
+                            <div class="input-group-append">
 
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
@@ -93,8 +93,8 @@
                     <div class="form-group">
                         <label asp-for="EndDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="EndDate" class="form-control datetime" />
-                            <div class="input-group-append only-for-js">
+                            <input asp-for="EndDate" class="form-control datetime"  placeholder="No end date has been set for this crowdfund" />
+                            <div class="input-group-append">
 
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
@@ -167,11 +167,23 @@
                         <input asp-for="SoundsEnabled" type="checkbox" class="form-check"/>
                         <span asp-validation-for="SoundsEnabled" class="text-danger"></span>
                     </div>
+                    
+                    <div class="form-group">
+                        <label asp-for="Sounds"></label>
+                        <textarea asp-for="Sounds" class="form-control"></textarea>
+                        <span asp-validation-for="Sounds" class="text-danger"></span>
+                    </div>
                     <div class="form-group">
                         <label asp-for="AnimationsEnabled"></label>
                         <input asp-for="AnimationsEnabled" type="checkbox" class="form-check"/>
                         <span asp-validation-for="AnimationsEnabled" class="text-danger"></span>
                     </div>
+                     
+                    <div class="form-group">
+                        <label asp-for="AnimationColors"></label>
+                        <textarea asp-for="AnimationColors" class="form-control"></textarea>
+                        <span asp-validation-for="AnimationColors" class="text-danger"></span>
+                    </div>
                     <div class="form-group">
                         <label asp-for="DisqusEnabled"></label>
                         <input asp-for="DisqusEnabled" type="checkbox" class="form-check"/>

BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 @model BTCPayServer.Models.AppViewModels.ViewCrowdfundViewModel
 @{
@@ -10,13 +10,13 @@
 <html class="h-100">
 <head>
     <title>@Model.Title</title>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <link href="@Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet"/>
+    <link href="@Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
     @if (Model.CustomCSSLink != null)
     {
-        <link href="@Model.CustomCSSLink" rel="stylesheet"/>
+        <link href="@Model.CustomCSSLink" rel="stylesheet" />
     }
     @if (!Context.Request.Query.ContainsKey("simple"))
     {
@@ -25,13 +25,15 @@
         </script>
         <bundle name="wwwroot/bundles/crowdfund-bundle-1.min.js"></bundle>
         <bundle name="wwwroot/bundles/crowdfund-bundle-2.min.js"></bundle>
+        @*We need to make sure btcpay.js is not bundled, else it will not work if there is a RootPath*@
+        <script src="~/modal/btcpay.js"></script>
     }
-    
+
     <bundle name="wwwroot/bundles/crowdfund-bundle.min.css"></bundle>
     @if (!string.IsNullOrEmpty(Model.EmbeddedCSS))
     {
         <style>
-            @Html.Raw(Model.EmbeddedCSS); 
+            @Html.Raw(Model.EmbeddedCSS);
         </style>
     }
 

BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 
 @model BTCPayServer.Models.AppViewModels.ViewPointOfSaleViewModel
@@ -35,6 +35,17 @@
         </script>
         <bundle name="wwwroot/bundles/cart-bundle.min.js" />
     }
+    <style>
+        .card-deck {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+            grid-gap: .5rem;
+        }
+        .card-deck .card:only-of-type {
+            max-width: 320px;
+            margin: auto;
+        }
+    </style> 
 </head>
 
 <script id="template-cart-item" type="text/template">
@@ -232,18 +243,18 @@
                 </div>
 
                 <div id="js-pos-list" class="text-center mx-auto px-4">
-                    <div class="row">
-                    @for (int i = 0; i < Model.Items.Length; i++)
-                    {
-                        var item = Model.Items[i];
-                        var image = item.Image;
-                        var description = item.Description;
+                    <div class="row card-deck my-3 mx-auto">
 
-                        <div class="col-sm-6 col-lg-3 my-3 px-2 card-wrapper">
-                            <div class="js-add-cart card" data-id="@i">
+                        @for (var index = 0; index < Model.Items.Length; index++)
+                        {
+                            var item = Model.Items[index];
+                            var image = item.Image;
+                            var description = item.Description;
+
+                            <div class="js-add-cart card my-2" data-id="@index">
                                 @if (!String.IsNullOrWhiteSpace(image))
                                 {
-                                    <img class="card-img-top" src="@image" alt="Card image cap">
+                                    @:<img class="card-img-top" src="@image" alt="Card image cap">
                                 }
                                 <div class="card-body p-3">
                                     <h6 class="card-title mb-0">@item.Title</h6>
@@ -254,8 +265,7 @@
                                     <span class="text-muted small">@String.Format(Model.ButtonText, @item.Price.Formatted)</span>
                                 </div>
                             </div>
-                        </div>
-                    }
+                        }
                     </div>
                 </div>
             </div>
@@ -295,75 +305,68 @@
         <div class="container d-flex h-100">
             <div class="justify-content-center align-self-center text-center mx-auto px-2 py-3 w-100" style="margin: auto;">
                 <h1 class="mb-4">@Model.Title</h1>
-                <div class="row">
-                    @for (int i = 0; i < Model.Items.Length; i++)
+
+                <div class="row  card-deck my-3 mx-auto">
+                    @for (int x = 0; x < Model.Items.Length; x++)
                     {
-                        var className = (Model.Items.Length - i) > (Model.Items.Length % 4) ? "col-sm-6 col-lg-3" : "col-md align-self-start";
-                        var item = Model.Items[i];
-                        var image = item.Image;
-                        var description = item.Description;
-                        <div class="@className my-3 px-2">
-                            <div class="card" data-id="@i">
-                                @if (!String.IsNullOrWhiteSpace(image))
+                        var item = Model.Items[x];
+
+                        <div class="card my-2" data-id="@x">
+                            @if (!String.IsNullOrWhiteSpace(item.Image))
+                            {
+                                <img class="card-img-top" src="@item.Image" alt="Card image cap">
+                            }
+                            <div class="card-body">
+                                <h5 class="card-title">@item.Title</h5>
+                                @if (!String.IsNullOrWhiteSpace(item.Description))
                                 {
-                                    <img class="card-img-top" src="@image" alt="Card image cap">
+                                    <p class="card-text">@item.Description</p>
                                 }
-                                <div class="card-body">
-                                    <h5 class="card-title">@item.Title</h5>
-                                    @if (!String.IsNullOrWhiteSpace(description))
-                                    {
-                                        <p class="card-text">@description</p>
-                                    }
-                                    @if (item.Custom && !Model.EnableShoppingCart)
-                                    {
-                                        <form method="post" asp-antiforgery="false" data-buy>
-                                            <input type="hidden" name="choicekey" value="@item.Id" />
-                                            <div class="input-group">
-                                                <div class="input-group-prepend">
-                                                    <span class="input-group-text">@Model.CurrencySymbol</span>
-                                                </div>
-                                                <input class="form-control" type="number" min="@item.Price.Value" step="@Model.Step" name="amount"
-                                                    value="@item.Price.Value" placeholder="Amount">
-                                                <div class="input-group-append">
-                                                    <button class="btn btn-primary" type="submit">@Model.CustomButtonText</button>
-                                                </div>
-                                            </div>
-                                        </form>
-                                    }
-                                    else
-                                    {
-                                        <form method="post" asp-antiforgery="false">
-                                            <button type="submit" name="choiceKey" class="js-add-cart btn btn-primary" value="@item.Id">
-                                                @String.Format(Model.ButtonText, @item.Price.Formatted)</button>
-                                        </form>
-                                    }
-                                </div>
-                            </div>
-                        </div>
-                    }
-                </div>
-                @if (Model.ShowCustomAmount)
-                {
-                    <div class="row mt-2 mb-4">
-                        <div class="col-lg-4 offset-lg-4 col-md-6 offset-md-3 px-2">
-                            <div class="card">
-                                <div class="card-body">
-                                    <h5 class="card-title">Custom Amount</h5>
-                                    <p class="card-text">Create invoice to pay custom amount</p>
+                                @if (item.Custom && !Model.EnableShoppingCart)
+                                {
                                     <form method="post" asp-antiforgery="false" data-buy>
+                                        <input type="hidden" name="choicekey" value="@item.Id"/>
                                         <div class="input-group">
                                             <div class="input-group-prepend">
                                                 <span class="input-group-text">@Model.CurrencySymbol</span>
                                             </div>
-                                            <input class="form-control" type="number" min="0" step="@Model.Step" name="amount" placeholder="Amount">
-                                            <div class="input-group-append"><button class="btn btn-primary" type="submit">@Model.CustomButtonText</button></div>
+                                            <input class="form-control" type="number" min="@item.Price.Value" step="@Model.Step" name="amount"
+                                                   value="@item.Price.Value" placeholder="Amount">
+                                            <div class="input-group-append">
+                                                <button class="btn btn-primary" type="submit">@Model.CustomButtonText</button>
+                                            </div>
                                         </div>
                                     </form>
-                                </div>
+                                }
+                                else
+                                {
+                                    <form method="post" asp-antiforgery="false">
+                                        <button type="submit" name="choiceKey" class="js-add-cart btn btn-primary" value="@item.Id">
+                                            @String.Format(Model.ButtonText, @item.Price.Formatted)</button>
+                                    </form>
+                                }
                             </div>
                         </div>
-                    </div>
-                }
+                    }
+                    @if (Model.ShowCustomAmount)
+                    {
+                        <div class="card  h-100">
+                            <div class="card-body my-auto">
+                                <h5 class="card-title">Custom Amount</h5>
+                                <p class="card-text">Create invoice to pay custom amount</p>
+                                <form method="post" asp-antiforgery="false" data-buy>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">@Model.CurrencySymbol</span>
+                                        </div>
+                                        <input class="form-control" type="number" min="0" step="@Model.Step" name="amount" placeholder="Amount">
+                                        <div class="input-group-append"><button class="btn btn-primary" type="submit">@Model.CustomButtonText</button></div>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                    }
+                </div>
             </div>
         </div>
     }

BTCPayServer/Views/Home/Home.cshtml

@@ -129,31 +129,31 @@
         </div>
         <div class="row">
             <div class="col-lg-3 ml-auto text-center">
-                <a href="https://chat.btcpayserver.org/">
+                <a href="https://chat.btcpayserver.org/"  target="_blank">
                     <img src="~/img/mattermost.png" height="100" />
                 </a>
-                <p><a href="https://chat.btcpayserver.org/">On Mattermost</a></p>
+                <p><a href="https://chat.btcpayserver.org/"  target="_blank">On Mattermost</a></p>
             </div>
             <div class="col-lg-3 ml-auto text-center">
-                <a href="https://slack.btcpayserver.org/">
+                <a href="https://slack.btcpayserver.org/"  target="_blank">
                     <img src="~/img/slack.png" height="100" />
                 </a>
-                <p><a href="http://slack.forkbitpay.ninja/">On Slack</a></p>
+                <p><a href="http://slack.forkbitpay.ninja/" target="_blank">On Slack</a></p>
             </div>
             <div class="col-lg-3 mr-auto text-center">
-                <a href="https://twitter.com/BtcpayServer">
+                <a href="https://twitter.com/BtcpayServer" target="_blank">
                     <img src="~/img/twitter.png" height="100" />
                 </a>
                 <p>
-                    <a href="https://twitter.com/BtcpayServer">On Twitter</a>
+                    <a href="https://twitter.com/BtcpayServer" target="_blank">On Twitter</a>
                 </p>
             </div>
             <div class="col-lg-3 mr-auto text-center">
-                <a href="https://github.com/btcpayserver/btcpayserver">
+                <a href="https://github.com/btcpayserver/btcpayserver" target="_blank">
                     <img src="~/img/github.png" height="100" />
                 </a>
                 <p>
-                    <a href="https://github.com/btcpayserver/btcpayserver">On Github</a>
+                    <a href="https://github.com/btcpayserver/btcpayserver" target="_blank">On Github</a>
                 </p>
             </div>
         </div>

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -48,7 +48,7 @@
                 <div class="paywithRowRight cursorPointer" onclick="openPaymentMethodDialog()">
                     <span class="payment__currencies ">
                         <img v-bind:src="srvModel.cryptoImage" />
-                        <span>{{srvModel.paymentMethodName}} ({{srvModel.cryptoCode}})</span>
+                        <span>{{srvModel.paymentMethodName}} ({{srvModel.cryptoCodeSrv}})</span>
                         <span v-show="srvModel.isLightning">&#9889;</span>
                         <span class="clickable_indicator fa fa-angle-right"></span>
                     </span>
@@ -73,7 +73,7 @@
             {
                 <div class="payment__currencies_noborder">
                     <img v-bind:src="srvModel.cryptoImage" />
-                    <span>{{srvModel.paymentMethodName}} ({{srvModel.cryptoCode}})</span>
+                    <span>{{srvModel.paymentMethodName}} ({{srvModel.cryptoCodeSrv}})</span>
                     <span v-show="srvModel.isLightning">&#9889;</span>
                 </div>
             }
@@ -101,7 +101,7 @@
             </div>
 
             <div class="single-item-order__right__ex-rate" v-if="srvModel.orderAmountFiat">
-                1 {{ srvModel.cryptoCode }} = {{ srvModel.rate }}
+                1 {{ srvModel.cryptoCodeSrv }} = {{ srvModel.rate }}
             </div>
         </div>
 
@@ -192,7 +192,7 @@
         </form>
     </div>
     <div class="bp-view payment scan" id="scan">
-        <div class="wrapBtnGroup" v-bind:class="{ invisible: lndModel === null }">
+        <div class="wrapBtnGroup" v-bind:class="{ invisible: lndModel === null || !scanDisplayQr }">
             <div class="btnGroupLnd">
                 <button onclick="lndToggleBolt11()" v-bind:class="{ active: lndModel != null && lndModel.toggle === 0 }"
                         v-bind:title="$t('BOLT 11 Invoice')">
@@ -205,11 +205,18 @@
             </div>
         </div>
         <div class="payment__scan">
-            <img v-bind:src="srvModel.cryptoImage" class="qr_currency_icon" />
-            <qrcode v-bind:val="scanDisplayQr" v-bind:size="256" bg-color="#f5f5f7" fg-color="#000">
+            <img v-bind:src="srvModel.cryptoImage" class="qr_currency_icon"
+                 v-if="scanDisplayQr" />
+            <qrcode v-bind:value="scanDisplayQr" :options="{ width: 256, margin: 0, color: {dark:'#000', light:'#f5f5f7'} }" tag="svg"
+                    v-if="scanDisplayQr">
             </qrcode>
+
+
+            <div class="payment__spinner qr_currency_icon" style="padding-right: 20px;">
+                <partial name="Checkout-Spinner" />
+            </div>
         </div>
-        <div class="payment__details__instruction__open-wallet">
+        <div class="payment__details__instruction__open-wallet" v-if="scanDisplayQr">
             <a class="payment__details__instruction__open-wallet__btn action-button" v-bind:href="srvModel.invoiceBitcoinUrl">
                 <span>{{$t("Open in wallet")}}</span>
             </a>

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.Services.LanguageService langService
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Linq
@@ -82,15 +82,15 @@
                         @* Not working because of nsSeparator: false, keySeparator: false,
                             {{$t("nested.lang")}} >>
                         *@
-                    
-                        <select asp-for="DefaultLang"  
+
+                        <select asp-for="DefaultLang"
                                 class="cmblang reverse invisible"
-                            onchange="changeLanguage($(this).val())"
-                            asp-items="@langService.GetLanguages().Select((language) => new SelectListItem(language.DisplayName,language.Code, false))"></select>
-                    
+                                onchange="changeLanguage($(this).val())"
+                                asp-items="@langService.GetLanguages().Select((language) => new SelectListItem(language.DisplayName,language.Code, false))"></select>
+
                         <script>
                             var languageSelectorPrettyDropdown;
-                            $(function() {
+                            $(function () {
                                 // REVIEW: don't use initDropdown method but rather directly initialize select whenever you are using it
                                 $("#DefaultLang").val(startingLanguage);
                                 languageSelectorPrettyDropdown = initDropdown("#DefaultLang");
@@ -113,11 +113,8 @@
             </div>
         </div>
     </invoice>
-<script type="text/javascript">
-    var availableLanguages = @Html.Raw(Json.Serialize(
-                                     langService
-                                         .GetLanguages()
-                                         .Select((language) => language.Code)));;
+    <script type="text/javascript">
+    var availableLanguages = @Html.Raw(Json.Serialize(langService.GetLanguages().Select((language) => language.Code)));;
     var storeDefaultLang = "@Model.DefaultLang";
     var fallbackLanguage = "en";
     startingLanguage = computeStartingLanguage();
@@ -126,14 +123,14 @@
         .use(window.i18nextXHRBackend)
         .init({
             backend: {
-                loadPath: '/locales/{{lng}}.json'
+                loadPath: '@(Model.RootPath)locales/{{lng}}.json'
             },
             lng: startingLanguage,
             fallbackLng: fallbackLanguage,
             nsSeparator: false,
             keySeparator: false
         });
-    
+
     function computeStartingLanguage() {
         if (urlParams.lang && isLanguageAvailable(urlParams.lang)) {
             return urlParams.lang;
@@ -150,11 +147,11 @@
             i18next.changeLanguage(lang);
         }
     }
-        
+
     function isLanguageAvailable(languageCode) {
         return availableLanguages.indexOf(languageCode) >= 0;
     }
-    
+
     const i18n = new VueI18next(i18next);
 
     // TODO: Move all logic from core.js to Vue controller
@@ -169,7 +166,7 @@
         i18n: i18n,
         el: '#checkoutCtrl',
         components: {
-            qrcode: VueQr,
+            qrcode: VueQrcode,
             changelly: ChangellyComponent,
             coinswitch: CoinSwitchComponent
         },
@@ -179,9 +176,10 @@
             scanDisplayQr: "",
             expiringSoon: false,
             isModal: srvModel.isModal,
+            lightningAmountInSatoshi: srvModel.lightningAmountInSatoshi,
             selectedThirdPartyProcessor: ""
         }
     });
-</script>
+    </script>
 </body>
 </html>

BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml

@@ -1,6 +1,6 @@
 @using BTCPayServer.Services.PaymentRequests
 @model BTCPayServer.Models.PaymentRequestViewModels.UpdatePaymentRequestViewModel
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 
 <section>
     <div class="container">
@@ -17,8 +17,8 @@
         </div>
         <div class="row">
             <div class="col-lg-12">
-                <form method="post">
-                    <input type="hidden" asp-for="Id"/>
+                <form method="post" action="@Url.Action("EditPaymentRequest", "PaymentRequest", new { id = Model.Id}, Context.Request.Scheme)">
+                    <input type="hidden" name="Id" value="@Model.Id"/>
                     <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                     <div class="form-group">
                         <label asp-for="Title" class="control-label"></label>*
@@ -34,7 +34,7 @@
 
                     <div class="form-group">
                         <label asp-for="Currency" class="control-label"></label>*
-                        <input placeholder="BTC" asp-for="Currency" class="form-control"/>
+                        <input  asp-for="Currency" class="form-control"/>
                         <span asp-validation-for="Currency" class="text-danger"></span>
                     </div>
                     <div class="form-group">
@@ -66,8 +66,8 @@
                     <div class="form-group">
                         <label asp-for="ExpiryDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="ExpiryDate" class="form-control datetime" min="today"/>
-                            <div class="input-group-append only-for-js">
+                            <input asp-for="ExpiryDate" class="form-control datetime" min="today" placeholder="No expiry date has been set for this payment request"/>
+                            <div class="input-group-append">
 
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
@@ -105,7 +105,7 @@
                                asp-action="ListInvoices"
                                asp-controller="Invoice" 
                                asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(Model.Id)}")">Invoices</a>
-                                                                                                                   
+                            <a class="btn btn-secondary" asp-action="ClonePaymentRequest" id="@Model.Id">Clone</a>                                                                              
                         }
                         <a class="btn btn-secondary" target="_blank" asp-action="GetPaymentRequests">Back to list</a>
                     </div>

BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml

@@ -23,6 +23,7 @@
         <div class="row no-gutter" style="margin-bottom: 5px;">
             <div class="col-lg-6">
                 <a asp-action="EditPaymentRequest" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new payment request</a>
+                <a href="https://docs.btcpayserver.org/features/paymentrequests" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
             </div>
         </div>
 
@@ -54,6 +55,8 @@
                             <span> - </span>
                             <a target="_blank" asp-action="PayPaymentRequest" asp-route-id="@item.Id">Pay</a>
                             <span> - </span>
+                            <a target="_blank" asp-action="ClonePaymentRequest" asp-route-id="@item.Id">Clone</a>
+                            <span> - </span>
                             <a asp-action="RemovePaymentRequestPrompt" asp-route-id="@item.Id">Remove</a>
                         </td>
                     </tr>

BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml

@@ -1,6 +1,6 @@
 @model BTCPayServer.Models.PaymentRequestViewModels.ViewPaymentRequestViewModel
 
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 @{
     ViewData["Title"] = Model.Title;
@@ -11,13 +11,13 @@
 <html class="h-100">
 <head>
     <title>@Model.Title</title>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <link href="@Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet"/>
+    <link href="@Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
     @if (Model.CustomCSSLink != null)
     {
-        <link href="@Model.CustomCSSLink" rel="stylesheet"/>
+        <link href="@Model.CustomCSSLink" rel="stylesheet" />
     }
     @if (!Context.Request.Query.ContainsKey("simple"))
     {
@@ -26,13 +26,15 @@
         </script>
         <bundle name="wwwroot/bundles/payment-request-bundle-1.min.js"></bundle>
         <bundle name="wwwroot/bundles/payment-request-bundle-2.min.js"></bundle>
+        @*We need to make sure btcpay.js is not bundled, else it will not work if there is a RootPath*@
+        <script src="~/modal/btcpay.js"></script>
     }
 
     <bundle name="wwwroot/bundles/payment-request-bundle.min.css"></bundle>
     @if (!string.IsNullOrEmpty(Model.EmbeddedCSS))
     {
         <style>
-            @Html.Raw(Model.EmbeddedCSS); 
+            @Html.Raw(Model.EmbeddedCSS);
         </style>
     }
 </head>

BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 
 @model BTCPayServer.Controllers.ShowLightningNodeInfoViewModel
@@ -10,7 +10,7 @@
 <html>
 <head>
     <title>@Model.CryptoCode LN Node Info</title>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="apple-touch-icon" href="~/img/icons/icon-512x512.png">
@@ -18,10 +18,10 @@
 
     <link rel="manifest" href="~/manifest.json">
 
-    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet"/>
-    <link href="~/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
+    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
+    <link href="~/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
 
-    <bundle name="wwwroot/bundles/lightning-node-info-bundle.min.js"/>
+    <bundle name="wwwroot/bundles/lightning-node-info-bundle.min.js" />
     <script type="text/javascript">
         var srvModel = @Html.Raw(Json.Serialize(Model));
 
@@ -31,7 +31,7 @@
             var app = new Vue({
                 el: '#app',
                 components: {
-                    qrcode: VueQr
+                    qrcode: VueQrcode
                 },
                 data: {
                     srvModel: srvModel
@@ -74,70 +74,76 @@
             text-align: center;
         }
 
-        .copy { cursor: copy; }
-        
+            .qr-container svg {
+                width: 256px;
+                height: 256px;
+            }
+
+        .copy {
+            cursor: copy;
+        }
     </style>
 </head>
-<body >
-<noscript>
-    <div class="container">
-        <div class="row " style="height: 100vh">
-            <div class="col-md-8 col-sm-12 col-lg-6 mx-auto my-auto ">
+<body>
+    <noscript>
+        <div class="container">
+            <div class="row " style="height: 100vh">
                 <div class="col-md-8 col-sm-12 col-lg-6 mx-auto my-auto ">
-                    <div class="card border-0">
-                        <div class="row"></div>
-                        <h1 class="card-title text-center">
-                            @Model.CryptoCode Lightning Node - @(Model.Available ? "Online" : "Unavailable")
-                            <small class="@(Model.Available ? "text-success" : "text-danger")">
-                                <span class="fa fa-circle "></span>
-                            </small>
-                        </h1>
-                        @if (Model.Available)
-                        {
-                            <div class="card-body m-sm-0 p-sm-0">
-                                <div class="input-group">
-                                    <input type="text" class="form-control " readonly="readonly" asp-for="NodeInfo" id="peer-info"/>
-                                    <div class="input-group-append">
-                                        <span class="input-group-text fa fa-copy"> </span>
+                    <div class="col-md-8 col-sm-12 col-lg-6 mx-auto my-auto ">
+                        <div class="card border-0">
+                            <div class="row"></div>
+                            <h1 class="card-title text-center">
+                                @Model.CryptoCode Lightning Node - @(Model.Available ? "Online" : "Unavailable")
+                                <small class="@(Model.Available ? "text-success" : "text-danger")">
+                                    <span class="fa fa-circle "></span>
+                                </small>
+                            </h1>
+                            @if (Model.Available)
+                            {
+                                <div class="card-body m-sm-0 p-sm-0">
+                                    <div class="input-group">
+                                        <input type="text" class="form-control " readonly="readonly" asp-for="NodeInfo" id="peer-info" />
+                                        <div class="input-group-append">
+                                            <span class="input-group-text fa fa-copy"> </span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        }
+                            }
 
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-</noscript>
-<div id="app" class="container">
-    <div class="row " style="height: 100vh">
-        <div class="col-md-8 col-sm-12 col-lg-6 mx-auto my-auto ">
-            <div class="card border-0">
-                <div class="row"></div>
-                <h1 class="card-title text-center">
-                    {{srvModel.cryptoCode}} Lightning Node
-                    - {{srvModel.available? "Online" : "Unavailable"}}
-                    <small v-bind:class="{ 'text-success': srvModel.available, 'text-danger': !srvModel.available }">
-                        <span class="fa fa-circle "></span>
-                    </small>
-                </h1>
-                <div class="card-body m-sm-0 p-sm-0" v-if="srvModel.available">
-                    <div class="qr-container mb-2">
-                        <img v-bind:src="srvModel.cryptoImage" class="qr-icon"/>
-                        <qrcode v-bind:val="srvModel.nodeInfo" v-bind:size="256" bg-color="#f5f5f7" fg-color="#000">
-                        </qrcode>
-                    </div>
-                    <div class="input-group copy" data-clipboard-target="#vue-peer-info">
-                        <input type="text" class=" form-control " readonly="readonly" :value="srvModel.nodeInfo" id="vue-peer-info"/>
-                        <div class="input-group-append">
-                            <span class="input-group-text fa fa-copy"> </span>
+    </noscript>
+    <div id="app" class="container">
+        <div class="row " style="height: 100vh">
+            <div class="col-md-8 col-sm-12 col-lg-6 mx-auto my-auto ">
+                <div class="card border-0">
+                    <div class="row"></div>
+                    <h1 class="card-title text-center">
+                        {{srvModel.cryptoCode}} Lightning Node
+                        - {{srvModel.available? "Online" : "Unavailable"}}
+                        <small v-bind:class="{ 'text-success': srvModel.available, 'text-danger': !srvModel.available }">
+                            <span class="fa fa-circle "></span>
+                        </small>
+                    </h1>
+                    <div class="card-body m-sm-0 p-sm-0" v-if="srvModel.available">
+                        <div class="qr-container mb-2">
+                            <img v-bind:src="srvModel.cryptoImage" class="qr-icon" />
+                            <qrcode v-bind:value="srvModel.nodeInfo" :options="{ width: 256, margin: 0, color: {dark:'#000', light:'#fff'} }" tag="svg">
+                            </qrcode>
+                        </div>
+                        <div class="input-group copy" data-clipboard-target="#vue-peer-info">
+                            <input type="text" class=" form-control " readonly="readonly" :value="srvModel.nodeInfo" id="vue-peer-info" />
+                            <div class="input-group-append">
+                                <span class="input-group-text fa fa-copy"> </span>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 </body>
 </html>

BTCPayServer/Views/Server/LightningWalletServices.cshtml

@@ -37,7 +37,7 @@
         <div class="form-group">
             <h5>QR Code connection</h5>
             <p>
-                <span>You can use QR Code to connect to your clightning from your mobile.<br /></span>
+                <span>You can use QR Code to connect to your @Model.WalletName from your mobile.<br /></span>
             </p>
         </div>
         <div class="form-group">

BTCPayServer/Views/Server/LndServices.cshtml

@@ -21,6 +21,55 @@
             </p>
         </div>
 
+        <div class="form-group">
+            <h5>Compatible wallets</h5>
+        </div>
+        @if (Model.Uri == null) // if GRPC
+        {
+            <div class="row">
+                <div class="col-lg-3 ml-auto text-center">
+                    <a href="https://www.pebble.indiesquare.me/" target="_blank">
+                        <img src="~/img/pebblewallet.jpg" height="100" />
+                    </a>
+                    <p><a href="https://www.pebble.indiesquare.me/" target="_blank">Pebble</a></p>
+                </div>
+                <div class="col-lg-3 ml-auto text-center">
+                    <a href="https://zap.jackmallers.com/" target="_blank">
+                        <img src="~/img/zapwallet.jpg" height="100" />
+                    </a>
+                    <p><a href="https://zap.jackmallers.com/" target="_blank">Zap</a></p>
+                </div>
+                <div class="col-lg-3 mr-auto text-center">
+
+                </div>
+                <div class="col-lg-3 mr-auto text-center">
+
+                </div>
+            </div>
+        }
+        else
+        {
+            <div class="row">
+                <div class="col-lg-3 ml-auto text-center">
+                    <a href="https://lightningjoule.com/" target="_blank">
+                        <img src="~/img/joule.png" height="100" />
+                    </a>
+                    <p><a href="https://lightningjoule.com/" target="_blank">Joule</a></p>
+                </div>
+                <div class="col-lg-3 ml-auto text-center">
+                    <a href="https://github.com/ZeusLN/zeus" target="_blank">
+                        <img src="~/img/zeus.jpg" height="100" />
+                    </a>
+                    <p><a href="https://github.com/ZeusLN/zeus" target="_blank">Zeus</a></p>
+                </div>
+                <div class="col-lg-3 mr-auto text-center">
+
+                </div>
+                <div class="col-lg-3 mr-auto text-center">
+
+                </div>
+            </div>
+        }
         <div class="form-group">
             <h5>QR Code connection</h5>
             <p>
@@ -29,7 +78,7 @@
             </p>
         </div>
         <div class="form-group">
-            @if(Model.QRCode == null)
+            @if (Model.QRCode == null)
             {
                 <div class="form-group">
                     <form method="post">

BTCPayServer/Views/Server/Policies.cshtml

@@ -21,6 +21,10 @@
             <div class="form-group">
                 <label asp-for="LockSubscription"></label>
                 <input asp-for="LockSubscription" type="checkbox" class="form-check-inline" />
+            </div> 
+            <div class="form-group">
+                <label asp-for="DiscourageSearchEngines"></label>
+                <input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-inline" />
             </div>
             <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
         </form>

BTCPayServer/Views/Server/Services.cshtml

@@ -48,35 +48,99 @@
 
 @if (Model.OtherExternalServices.Count != 0)
 {
-<div class="row">
-    <div class="col-md-8">
-        <h4>Other services</h4>
-        <div class="form-group">
-            <span>Other external services</span>
-        </div>
-        <div class="form-group">
-            <table class="table table-sm table-responsive-md">
-                <thead>
-                    <tr>
-                        <th>Name</th>
-                        <th style="text-align:right">Actions</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    @foreach (var s in Model.OtherExternalServices)
-                    {
+    <div class="row">
+        <div class="col-md-8">
+            <h4>Other services</h4>
+            <div class="form-group">
+                <span>Other external services</span>
+            </div>
+            <div class="form-group">
+                <table class="table table-sm table-responsive-md">
+                    <thead>
                         <tr>
-                            <td>@s.Name</td>
-                            <td style="text-align:right">
-                                <a href="@s.Link" target="_blank">See information</a>
-                            </td>
+                            <th>Name</th>
+                            <th style="text-align:right">Actions</th>
                         </tr>
-                    }
-                </tbody>
-            </table>
+                    </thead>
+                    <tbody>
+                        @foreach (var s in Model.OtherExternalServices)
+                        {
+                            <tr>
+                                <td>@s.Name</td>
+                                <td style="text-align:right">
+                                    <a href="@s.Link" target="_blank">See information</a>
+                                </td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+}
+
+@if (Model.TorHttpServices.Count != 0)
+{
+    <div class="row">
+        <div class="col-md-8">
+            <h4>HTTP TOR hidden services</h4>
+            <div class="form-group">
+                <span>TOR services hosted on this server, only http servers are listed here.</span>
+            </div>
+            <div class="form-group">
+                <table class="table table-sm table-responsive-md">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th style="text-align:right">Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var s in Model.TorHttpServices)
+                        {
+                            <tr>
+                                <td>@s.Name</td>
+                                <td style="text-align:right">
+                                    <a href="@s.Link" target="_blank">See information</a>
+                                </td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+}
+
+@if (Model.TorOtherServices.Count != 0)
+{
+    <div class="row">
+        <div class="col-md-8">
+            <h4>Other TOR hidden services</h4>
+            <div class="form-group">
+                <span>TOR services hosted on this server which are not http based.</span>
+            </div>
+            <div class="form-group">
+                <table class="table table-sm table-responsive-md">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th style="text-align:right">Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var s in Model.TorOtherServices)
+                        {
+                            <tr>
+                                <td>@s.Name</td>
+                                <td style="text-align:right">@s.Link</td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>
-</div>
 }
 
 @section Scripts {

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -5,7 +5,7 @@
 @inject BTCPayServer.HostedServices.NBXplorerDashboard dashboard
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 
 <!DOCTYPE html>
 <html lang="en">
@@ -15,6 +15,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="description" content="">
     <meta name="author" content="">
+    @if (themeManager.DiscourageSearchEngines)
+    {
+        <META NAME="robots" CONTENT="noindex">
+    }
 
     <title>BTCPay Server</title>
 
@@ -51,6 +55,14 @@
                     <span class="badge badge-warning" style="font-size:10px;">@env.NetworkType.ToString()</span>
                 }
             </a>
+            @if (env.OnionUrl != null)
+            {
+                <span>
+                    <a href="@env.OnionUrl" target="_blank">
+                        <img src="~/img/icons/onion.svg" width="26" height="32" />
+                    </a>
+                </span>
+            }
             <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
@@ -58,7 +70,7 @@
                 <ul class="navbar-nav ml-auto">
                     @if (SignInManager.IsSignedIn(User))
                     {
-                        @if (User.IsInRole(Roles.ServerAdmin))
+                        if (User.IsInRole(Roles.ServerAdmin))
                         {
                             <li class="nav-item"><a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger">Server settings</a></li>
                         }
@@ -75,7 +87,7 @@
                         </li>}
                     else
                     {
-                        @if (themeManager.ShowRegister)
+                        if (themeManager.ShowRegister)
                         {
                             <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Register" class="nav-link js-scroll-trigger">Register</a></li>
                         }

BTCPayServer/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -1,3 +1,3 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 
 <bundle name="wwwroot/bundles/jqueryvalidate-bundle.min.js" />

BTCPayServer/Views/Stores/CheckoutExperience.cshtml

@@ -42,6 +42,12 @@
                 <label asp-for="RequiresRefundEmail"></label>
                 <input asp-for="RequiresRefundEmail" type="checkbox" class="form-check" />
             </div>
+            <div class="form-group">
+                <label asp-for="OnChainMinValue"></label>
+                <input asp-for="OnChainMinValue" class="form-control" />
+                <span asp-validation-for="OnChainMinValue" class="text-danger"></span>
+                <p class="form-text text-muted">Example: 5.50 USD</p>
+            </div>
             <div class="form-group">
                 <label asp-for="LightningMaxValue"></label>
                 <input asp-for="LightningMaxValue" class="form-control" />
@@ -49,11 +55,10 @@
                 <p class="form-text text-muted">Example: 5.50 USD</p>
             </div>
             <div class="form-group">
-                <label asp-for="OnChainMinValue"></label>
-                <input asp-for="OnChainMinValue" class="form-control" />
-                <span asp-validation-for="OnChainMinValue" class="text-danger"></span>
-                <p class="form-text text-muted">Example: 5.50 USD</p>
+                <label asp-for="LightningAmountInSatoshi"></label>
+                <input asp-for="LightningAmountInSatoshi" type="checkbox" class="form-check" />
             </div>
+            <br />
             <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
         </form>
     </div>

BTCPayServer/Views/Stores/Rates.cshtml

@@ -15,14 +15,14 @@
 <div class="row">
     <div class="col-md-8">
         <form method="post">
-            @if(Model.ShowScripting)
+            @if (Model.ShowScripting)
             {
                 <div class="form-group">
                     <h5>Scripting</h5>
                     <span>Rate script allows you to express precisely how you want to calculate rates for currency pairs.</span>
                     <p class="text-muted">
                         <b>Supported exchanges are</b>:
-                        @for(int i = 0; i < Model.AvailableExchanges.Length; i++)
+                        @for (int i = 0; i < Model.AvailableExchanges.Length; i++)
                         {
                             <a href="@Model.AvailableExchanges[i].Url">@Model.AvailableExchanges[i].Name</a><span>@(i == Model.AvailableExchanges.Length - 1 ? "" : ",")</span>
                         }
@@ -30,16 +30,16 @@
                     <p><a href="#help" data-toggle="collapse"><b>Click here for more information</b></a></p>
                 </div>
             }
-            @if(Model.TestRateRules != null)
+            @if (Model.TestRateRules != null)
             {
                 <div class="form-group">
                     <h5>Test results:</h5>
                     <table class="table table-sm table-responsive-md">
                         <tbody>
-                            @foreach(var result in Model.TestRateRules)
+                            @foreach (var result in Model.TestRateRules)
                             {
                                 <tr>
-                                    @if(result.Error)
+                                    @if (result.Error)
                                     {
                                         <th class="small"><span class="fa fa-times" style="color:red;"></span> @result.CurrencyPair</th>
                                     }
@@ -54,7 +54,7 @@
                     </table>
                 </div>
             }
-            @if(Model.ShowScripting)
+            @if (Model.ShowScripting)
             {
                 <div id="help" class="collapse text-left">
                     <p>
@@ -157,6 +157,14 @@
                 </div>
                 <span asp-validation-for="ScriptTest" class="text-danger"></span>
             </div>
+            <div class="form-group">
+                <h5>Default currency pairs</h5>
+                <span>You can query those pairs via REST by querying <a asp-controller="Rate" asp-action="GetRates2" asp-route-storeId="@Model.StoreId" target="_blank">this link</a> without the need to specify currencyPairs.</span>
+                <div class="input-group">
+                    <input placeholder="BTC_USD, BTC_CAD" asp-for="DefaultCurrencyPairs" class="form-control" />
+                </div>
+                <span asp-validation-for="DefaultCurrencyPairs" class="text-danger"></span>
+            </div>
             <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
             <input type="hidden" asp-for="ShowScripting" />
         </form>

BTCPayServer/bundleconfig.json

@@ -44,7 +44,7 @@
             "wwwroot/vendor/clipboard.js/clipboard.js",
             "wwwroot/vendor/jquery/jquery.js",
             "wwwroot/vendor/vuejs/vue.min.js",
-            "wwwroot/vendor/vuejs/vue-qrcode.js",
+            "wwwroot/vendor/vue-qrcode/vue-qrcode.js",
             "wwwroot/vendor/i18next/i18next.js",
             "wwwroot/vendor/i18next/i18nextXHRBackend.js",
             "wwwroot/vendor/i18next/vue-i18next.js",
@@ -60,7 +60,7 @@
             "wwwroot/vendor/clipboard.js/clipboard.js",
             "wwwroot/vendor/jquery/jquery.js",
             "wwwroot/vendor/vuejs/vue.min.js",
-            "wwwroot/vendor/vuejs/vue-qrcode.js",
+            "wwwroot/vendor/vue-qrcode/vue-qrcode.js",
             "wwwroot/vendor/vue-toasted/vue-toasted.min.js"
         ]
     },
@@ -83,7 +83,6 @@
             "wwwroot/vendor/bootstrap-vue/bootstrap-vue.js",
             "wwwroot/vendor/signalr/signalr.js",
             "wwwroot/vendor/animejs/anime.min.js",
-            "wwwroot/modal/btcpay.js",
             "wwwroot/crowdfund/**/*.js"
         ]
     },
@@ -151,7 +150,6 @@
             "wwwroot/vendor/bootstrap-vue/bootstrap-vue.js",
             "wwwroot/vendor/signalr/signalr.js",
             "wwwroot/vendor/animejs/anime.min.js",
-            "wwwroot/modal/btcpay.js",
             "wwwroot/payment-request/**/*.js"
         ]
     },

BTCPayServer/wwwroot/checkout/coinswitch.html

@@ -46,7 +46,9 @@
                     setTimeout(waitForCoinSwitch, 1000);
                     return;
                 }
-                payment.open(config);
+                payment.on("Exchange:Ready", function(){
+                    payment.open(config);
+                });                
                 payment.on("Exchange:Complete", function () {
                     if(window.localStorage){
                         window.localStorage.removeItem(toCurrencyAddress);

BTCPayServer/wwwroot/checkout/css/normalizer.css

@@ -9444,6 +9444,13 @@ strong {
 .payment__scan {
     position: relative;
     text-align: center;
+    height: 256px;
+    margin-bottom: 5px;
+}
+
+.payment__scan svg {
+    width: 256px;
+    height: 256px;
 }
 
 .payment__scan__checkmark-wrapper {

BTCPayServer/wwwroot/checkout/js/core.js

@@ -90,10 +90,28 @@ function onDataCallback(jsonData) {
         checkoutCtrl.lndModel = null;
     }
 
+    // displaying satoshis for lightning payments
+    jsonData.cryptoCodeSrv = jsonData.cryptoCode;
+    if (jsonData.isLightning && checkoutCtrl.lightningAmountInSatoshi && jsonData.cryptoCode === "BTC") {
+        var SATOSHIME = 100000000;
+        jsonData.cryptoCode = "Sats";
+        jsonData.btcDue = numberFormatted(jsonData.btcDue * SATOSHIME);
+        jsonData.btcPaid = numberFormatted(jsonData.btcPaid * SATOSHIME);
+        jsonData.networkFee = numberFormatted(jsonData.networkFee * SATOSHIME);
+        jsonData.orderAmount = numberFormatted(jsonData.orderAmount * SATOSHIME);
+    }
+
     // updating ui
     checkoutCtrl.srvModel = jsonData;
 }
 
+function numberFormatted(x) {
+    var rounded = Math.round(x);
+    var parts = rounded.toString().split(".");
+    parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, " ");
+    return parts.join(".");
+}
+
 function fetchStatus() {
     $.ajax({
         url: window.location.pathname + "/status?invoiceId=" + srvModel.invoiceId + "&paymentMethodId=" + srvModel.paymentMethodId,

BTCPayServer/wwwroot/crowdfund/app.js

@@ -216,7 +216,6 @@ addLoadEvent(function (ev) {
             this.sound = this.srvModel.soundsEnabled;
             this.animation = this.srvModel.animationsEnabled;
             eventAggregator.$on("invoice-created", function (invoiceId) {
-                btcpay.setApiUrlPrefix(window.location.origin);
                 btcpay.showInvoice(invoiceId);
                 btcpay.showFrame();
 
@@ -256,7 +255,7 @@ addLoadEvent(function (ev) {
             eventAggregator.$on("payment-received", function (amount, cryptoCode, type) {
                 var onChain = type.toLowerCase() === "btclike";
                 if(self.sound) {
-                    playRandomQuakeSound();
+                    playRandomSound();
                 }
                 if(self.animation) {
                     fireworks();

BTCPayServer/wwwroot/crowdfund/services/audioplayer.js

@@ -1,5 +1,3 @@
-
-
 function playSound(path) {
     // audio supported?
     if (typeof window.Audio === 'function') {
@@ -11,55 +9,7 @@ function playSound(path) {
     }
 }
 
-
-function playQuakeSound (name){
-    // var path = window.location.protocol +"://github.com/ClaudiuHKS/AdvancedQuakeSounds/blob/master/sound/QuakeSounds/"+name+"?raw=true"
-    var path = window.location.protocol + "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/" + name;
-    playSound(path);
+function playRandomSound(){
+    var sound  =  srvModel.sounds[Math.floor((Math.random() *  srvModel.sounds.length) )];
+    playSound(sound);
 }
-
-function playRandomQuakeSound(){
-    playQuakeSound(quake[Math.floor((Math.random() * quake.length) )]);
-}
-
-var quake = [
-"dominating.wav"
-,"doublekill.wav"
-,"doublekill2.wav"
-,"eagleeye.wav"
-,"firstblood.wav"
-,"firstblood2.wav"
-,"firstblood3.wav"
-,"flawless.wav"
-,"godlike.wav"
-,"hattrick.wav"
-,"headhunter.wav"
-,"headshot.wav"
-,"headshot2.wav"
-,"headshot3.wav"
-,"holyshit.wav"
-,"killingspree.wav"
-,"knife.wav"
-,"knife2.wav"
-,"knife3.wav"
-,"ludicrouskill.wav"
-,"megakill.wav"
-,"monsterkill.wav"
-,"multikill.wav"
-,"nade.wav"
-,"ownage.wav"
-,"payback.wav"
-,"prepare.wav"
-,"prepare2.wav"
-,"prepare3.wav"
-,"prepare4.wav"
-,"rampage.wav"
-,"suicide.wav"
-,"suicide2.wav"
-,"suicide3.wav"
-,"suicide4.wav"
-,"teamkiller.wav"
-,"triplekill.wav"
-,"ultrakill.wav"
-,"unstoppable.wav"
-,"whickedsick.wav"];

BTCPayServer/wwwroot/crowdfund/services/fireworks.js

@@ -1,14 +1,15 @@
 addLoadEvent(function(){
 var c = document.getElementById("fireworks");
 var ctx = c.getContext("2d");
+
 var cH;
 var cW;
-var bgColor = "#FF6138";
+var bgColor = srvModel.animationColors[0];
 var animations = [];
 var circles = [];
 
 var colorPicker = (function() {
-    var colors = ["#FF6138", "#FFBE53", "#2980B9", "#282741"];
+    var colors = srvModel.animationColors;
     var index = 0;
     function next() {
         index = index++ < colors.length-1 ? index : 0;

BTCPayServer/wwwroot/crowdfund/services/listener.js

@@ -1,7 +1,7 @@
 
 var hubListener = function(){
    
-    var connection = new signalR.HubConnectionBuilder().withUrl("/apps/hub").build();
+    var connection = new signalR.HubConnectionBuilder().withUrl(srvModel.hubPath).build();
 
     connection.onclose(function(){
         eventAggregator.$emit("connection-lost");

BTCPayServer/wwwroot/img/icons/onion.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 228.46 342.85"><defs><style>.cls-1{fill:#fefefe;}.cls-2{fill:#111316;}.cls-3{fill:#868686;}.cls-4{fill:#b1b1b1;}.cls-5{fill:#454545;}.cls-6{fill:#909090;}.cls-7{fill:#7a7a7a;}.cls-8{fill:#9e9e9e;}.cls-9{fill:#555;}.cls-10{fill:#5f5f5f;}.cls-11{fill:#878787;}.cls-12{fill:#5e5e5e;}</style></defs><title>Artboard 1</title><path class="cls-1" d="M174.18,1.15c-12.79,15.54-25.44,31.17-35,49a.81.81,0,0,0-.13,1.16c.37.29.62-.11.91-.34,14.89-18.65,34.39-30.35,56.88-37.71C168.44,39.75,143.05,68.71,121.8,102l13.66,2.14c-3.72,20.24,6.33,32.87,22.43,42.15,13.7,7.89,27.63,15.55,38.79,27,26.69,27.29,36.54,59.88,26.11,96.68S186.55,329,149.45,337c-29.9,6.44-60.06,6.49-88.73-5.95C31.47,318.33,11,297,4.13,265.19-4,227.54,6.39,195.42,35.89,170.07c12.79-11,27-20.09,41.32-28.79,15.76-9.57,16.88-22.58,13.4-36.47C89,98.35,86.13,92.39,83.17,86.64c.6-1.64,1.94-2,3-2.93l18.37,12.14C108.18,69.64,117.17,46.14,130.1,24l-7.71,30.83c4.68-6.78,9-13.78,14.15-20.21a172,172,0,0,1,17-18.29A193.73,193.73,0,0,1,173.11.09C174.12-.2,174.4.23,174.18,1.15Z"/><path class="cls-2" d="M105.39,142.67c-.54,2.26-.13,4.81-2,6.65-1.33,4.1-2.7,8.19-4,12.3-2.94,9.35-8.78,16-17.44,20.79a159.8,159.8,0,0,0-26.84,19c-12.21,10.49-20.24,23.62-24.85,39-2.89,9.63-.69,18.88,2.31,27.89,6.38,19.22,17,36,30.72,50.82,3.3,3.57,7.49,6,12.45,9.21a56.79,56.79,0,0,1-15.69-6c-26.8-14.88-45.19-36.45-49.11-67.45-3.61-28.6,3.69-54.2,26.61-73.69,10.91-9.27,21.8-18.54,34.25-25.77a86.33,86.33,0,0,0,17.76-13.65c10.31-10.3,11.58-22.34,7.13-35.46-1.58-4.66-3.8-9.1-6.16-14.64l19.65,8.58c1.5,2,1.45,4.36,1.45,6.7q0,65.25,0,130.49c0,3.35.14,6.77-3.22,8.92-1.79,3.64-4.57,6.52-7.27,9.44-11,11.89-13.48,26.43-10.71,41.39,2.42,13.05,7.1,25.75,19.42,33.65-12.07-2.3-23.29-6-31.89-15.45-9-9.84-15.93-20.73-20-33.49a35.89,35.89,0,0,1,2.74-29.35,67.11,67.11,0,0,1,25.28-26.26c8.75-5.15,15.45-12,18.34-22,.32-2,.84-4,1.31-6-.1-.69-1,0-.33-.12.29-.05.41.07.33.35-.48,1.72-.7,3.56-2.17,4.83-4,10-10.86,17.15-20.4,22.28-14,7.5-25.18,18.15-28.63,34.09-4.9,22.61,2.2,42,19.08,57.72,6.08,5.67,13.15,9.93,20.62,13.62-8.59-1.5-17.33-3.21-23.57-9.53-17-17.27-30.29-36.88-36.6-60.76C31.33,251,32.67,242,36.44,233a78,78,0,0,1,25.86-33c7.61-5.64,15.25-11.32,23.32-16.25,8.86-5.42,13.72-13.26,16.29-22.9.94-3.52,1.6-7.12,2.39-10.69.38-2.54.46-5.14,1.22-6.84"/><path class="cls-2" d="M115.56,151.29c0,5.4,1.52,10.67,1.43,16.08.34,5.26,2.4,9.88,4.89,14.45,7.68,14.11,14.61,28.47,18.4,44.31,5.06,21.13,2.58,41.88-1.53,62.66-1.29,6.49-2.28,13.07-4.72,19.28-1.91,0-1.21-1.16-1-2.12a211.41,211.41,0,0,0,4.22-30.08c1-19-4.07-36.53-13.21-52.88-4.44-8-8.47-15.77-8.49-25.11-1.24,8.49-.75,16.8,4.4,24,6.83,9.59,10.07,20.46,12.23,31.77,2.86,15,.79,29.79-1.72,44.59-1.84,10.82-5.17,20.95-13.32,28.85-.88.19-1.35,0-1-1,4-5.93,5.09-12.71,6.18-19.64,3.21-20.33.45-39.93-6.28-59.15-1.41-1.95-1.74-4.33-2.56-6.53a20.81,20.81,0,0,1,1.51,8.57c2.8,13.37,5,26.75,4.32,40.54-.54,11.72-2.26,23.12-6.2,34.17-3.21-1.21-2.25-4.06-2.26-6.31-.1-21-.31-42,0-62.94.72-49.27.15-98.55.39-147.82,0-2-.49-4,1-5.73a16.56,16.56,0,0,1,6.28,2.7c.81,5.24-.18,10.37-.34,15.5-.38,11.8,1.83,22.91,8.79,32.6,23.31,32.48,25.59,69.38,22.73,107.35a270.61,270.61,0,0,1-5.5,36.45,43.13,43.13,0,0,1-7,16.32.78.78,0,0,1-1.28,0c6-19.91,11.48-39.82,10.66-61-.77-20.13-5.41-38.94-14.9-56.75-4.51-8.45-10.14-16.38-12.92-25.71-.33-1.11-.52-2.26-.77-3.4-2.34-4.74-1.76-10-2.63-15-.92-4.13-.55-8.37-.89-12.55"/><path class="cls-2" d="M109.16,325.19c-15-15.28-24.62-43.24-7.89-65.34,3.17-4.18,6.84-8.2,7.79-13.7,2.54.21,2.07,2.24,2.07,3.74q.11,35.73,0,71.46C111.13,322.85,111.64,324.86,109.16,325.19Z"/><path class="cls-3" d="M109.16,325.19c1.44-.63,1-1.94,1-3q0-36.53,0-73.06c0-1.07.42-2.41-1.1-3l-.33.17-.36,0a24.68,24.68,0,0,0,1.86-10.15q-.12-68-.08-136l2.1,1q0,109.61,0,219.21c0,1.21-.67,2.7.86,3.59C112.42,326.62,111,326.7,109.16,325.19Z"/><path class="cls-4" d="M117,167.37c-1.63-5.25-1.87-10.68-2-16.12-.29-1,.11-1.27,1-1l1.92,15Z"/><path class="cls-5" d="M133,306c.39.68,0,1.73,1,2.12-1.4,4-2.43,8.17-5.91,11l.09.08Q130.61,312.56,133,306Z"/><path class="cls-6" d="M115,249.33c-1.36-3-1.61-6.19-1.77-10.22a20,20,0,0,1,2.82,8.18Z"/><path class="cls-7" d="M103.36,149.32c.16-2.64,1.35-4.95,2.66-8.31-.2,3.83-.25,6.64-1.72,9.21Z"/><path class="cls-8" d="M103.41,203.3l2.5-7.07a10.65,10.65,0,0,1-1.64,8Z"/><path class="cls-9" d="M135.91,312.14l1.28,0a7.25,7.25,0,0,1-2.71,3.84A4.33,4.33,0,0,1,135.91,312.14Z"/><path class="cls-10" d="M116.11,326.08l1,1a3.76,3.76,0,0,1-3,2.28C113.9,327.66,115.06,326.9,116.11,326.08Z"/><path class="cls-11" d="M127.18,321.13c.35,1.34-.49,2.07-1.67,2.95,0-1.49.12-2.6,1.7-2.92Z"/><path class="cls-5" d="M127.21,321.16c0-.84-.12-1.71,1-2l-.09-.08c.29,1,.23,1.76-.94,2Z"/><path class="cls-12" d="M116.06,150.27l-1,1c-1.91-4.67-.52-9.42-.2-14.16Q115.44,143.67,116.06,150.27Z"/></svg>