Fix broken lightning payments on Checkout page

* add warning for third parties

* Update UpdateCoinSwitchSettings.cshtml

* Update UpdateChangellySettings.cshtml

* Update UpdateChangellySettings.cshtml

* Update UpdateCoinSwitchSettings.cshtml

BTCPayServer.Tests/CrowdfundTests.cs

@@ -5,6 +5,7 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
+using BTCPayServer.Crowdfund;
 using BTCPayServer.Data;
 using BTCPayServer.Events;
 using BTCPayServer.Hubs;

BTCPayServer.Tests/MockDelay.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Tests
+{
+    public class MockDelay : IDelay
+    {
+        class WaitObj
+        {
+            public DateTimeOffset Expiration;
+            public TaskCompletionSource<bool> CTS;
+        }
+
+        List<WaitObj> waits = new List<WaitObj>();
+        DateTimeOffset _Now = new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero);
+        public async Task Wait(TimeSpan delay, CancellationToken cancellation)
+        {
+            WaitObj w = new WaitObj();
+            w.Expiration = _Now + delay;
+            w.CTS = new TaskCompletionSource<bool>();
+            using (cancellation.Register(() =>
+             {
+                 w.CTS.TrySetCanceled();
+             }))
+            {
+                lock (waits)
+                {
+                    waits.Add(w);
+                }
+                await w.CTS.Task;
+            }
+        }
+
+        public void Advance(TimeSpan time)
+        {
+            _Now += time;
+            lock (waits)
+            {
+                foreach (var wait in waits.ToArray())
+                {
+                    if (_Now >= wait.Expiration)
+                    {
+                        wait.CTS.TrySetResult(true);
+                        waits.Remove(wait);
+                    }
+                }
+            }
+        }
+
+        public void AdvanceMilliseconds(long milli)
+        {
+            Advance(TimeSpan.FromMilliseconds(milli));
+        }
+
+        public override string ToString()
+        {
+            return _Now.Millisecond.ToString(CultureInfo.InvariantCulture);
+        }
+    }
+}

BTCPayServer.Tests/UnitTest1.cs

@@ -1549,23 +1549,96 @@ donation:
             }
         }
 
+
+        [Fact]
+        [Trait("Fast", "Fast")]
+        public void CanScheduleBackgroundTasks()
+        {
+            BackgroundJobClient client = new BackgroundJobClient();
+            MockDelay mockDelay = new MockDelay();
+            client.Delay = mockDelay;
+            bool[] jobs = new bool[4];
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+            Logs.Tester.LogInformation("Start Job[0] in 5 sec");
+            client.Schedule(async () => { Logs.Tester.LogInformation("Job[0]"); jobs[0] = true; }, TimeSpan.FromSeconds(5.0));
+            Logs.Tester.LogInformation("Start Job[1] in 2 sec");
+            client.Schedule(async () => { Logs.Tester.LogInformation("Job[1]"); jobs[1] = true; }, TimeSpan.FromSeconds(2.0));
+            Logs.Tester.LogInformation("Start Job[2] fails in 6 sec");
+            client.Schedule(async () => { jobs[2] = true; throw new Exception("Job[2]"); }, TimeSpan.FromSeconds(6.0));
+            Logs.Tester.LogInformation("Start Job[3] starts in in 7 sec");
+            client.Schedule(async () => { Logs.Tester.LogInformation("Job[3]"); jobs[3] = true; }, TimeSpan.FromSeconds(7.0));
+
+            Assert.True(new[] { false, false, false, false }.SequenceEqual(jobs));
+            CancellationTokenSource cts = new CancellationTokenSource();
+            var processing = client.ProcessJobs(cts.Token);
+
+            Assert.Equal(4, client.GetExecutingCount());
+
+            var waitJobsFinish = client.WaitAllRunning(default);
+
+            mockDelay.Advance(TimeSpan.FromSeconds(2.0));
+            Assert.True(new[] { false, true, false, false }.SequenceEqual(jobs));
+
+            mockDelay.Advance(TimeSpan.FromSeconds(3.0));
+            Assert.True(new[] { true, true, false, false }.SequenceEqual(jobs));
+
+            mockDelay.Advance(TimeSpan.FromSeconds(1.0));
+            Assert.True(new[] { true, true, true, false }.SequenceEqual(jobs));
+            Assert.Equal(1, client.GetExecutingCount());
+
+            Assert.False(waitJobsFinish.Wait(100));
+            Assert.False(waitJobsFinish.IsCompletedSuccessfully);
+
+            mockDelay.Advance(TimeSpan.FromSeconds(1.0));
+            Assert.True(new[] { true, true, true, true }.SequenceEqual(jobs));
+
+            Assert.True(waitJobsFinish.Wait(100));
+            Assert.True(waitJobsFinish.IsCompletedSuccessfully);
+            Assert.True(!waitJobsFinish.IsFaulted);
+            Assert.Equal(0, client.GetExecutingCount());
+
+            bool jobExecuted = false;
+            Logs.Tester.LogInformation("This job will be cancelled");
+            client.Schedule(async () => { jobExecuted = true; }, TimeSpan.FromSeconds(1.0));
+            mockDelay.Advance(TimeSpan.FromSeconds(0.5));
+            Assert.False(jobExecuted);
+            Thread.Sleep(100);
+            Assert.Equal(1, client.GetExecutingCount());
+
+
+            waitJobsFinish = client.WaitAllRunning(default);
+            Assert.False(waitJobsFinish.Wait(100));
+            cts.Cancel();
+            Assert.True(waitJobsFinish.Wait(1000));
+            Assert.True(waitJobsFinish.IsCompletedSuccessfully);
+            Assert.True(!waitJobsFinish.IsFaulted);
+            Assert.False(jobExecuted);
+
+            mockDelay.Advance(TimeSpan.FromSeconds(1.0));
+            Thread.Sleep(100); // Make sure it get cancelled
+
+            Assert.False(jobExecuted);
+            Assert.Equal(0, client.GetExecutingCount());
+            Assert.True(processing.IsCanceled);
+            Assert.True(client.WaitAllRunning(default).Wait(100));
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+        }
+
         [Fact]
         [Trait("Fast", "Fast")]
         public void PosDataParser_ParsesCorrectly()
         {
             var testCases =
-                new List<(string input, Dictionary<string, string> expectedOutput)>()
+                new List<(string input, Dictionary<string, object> expectedOutput)>()
                 {
-                    { (null, new Dictionary<string, string>())},
-                    {("", new Dictionary<string, string>())},
-                    {("{}", new Dictionary<string, string>())},
-                    {("non-json-content", new Dictionary<string, string>(){ {string.Empty, "non-json-content"}})},
-                    {("[1,2,3]", new Dictionary<string, string>(){ {string.Empty, "[1,2,3]"}})},
-                    {("{ \"key\": \"value\"}", new Dictionary<string, string>(){ {"key", "value"}})},
-                    {("{ \"key\": true}", new Dictionary<string, string>(){ {"key", "True"}})},
-                    {("{ \"key\": \"value\", \"key2\": [\"value\", \"value2\"]}",
-                        new Dictionary<string, string>(){ {"key", "value"}, {"key2", "value,value2"}})},
-                    {("{ invalidjson file here}", new Dictionary<string, string>(){ {String.Empty, "{ invalidjson file here}"}})}
+                    { (null, new Dictionary<string, object>())},
+                    {("", new Dictionary<string, object>())},
+                    {("{}", new Dictionary<string, object>())},
+                    {("non-json-content", new Dictionary<string, object>(){ {string.Empty, "non-json-content"}})},
+                    {("[1,2,3]", new Dictionary<string, object>(){ {string.Empty, "[1,2,3]"}})},
+                    {("{ \"key\": \"value\"}", new Dictionary<string, object>(){ {"key", "value"}})},
+                    {("{ \"key\": true}", new Dictionary<string, object>(){ {"key", "True"}})},
+                    {("{ invalidjson file here}", new Dictionary<string, object>(){ {String.Empty, "{ invalidjson file here}"}})}
                 };
 
             testCases.ForEach(tuple =>
@@ -1588,18 +1661,16 @@ donation:
                 var controller = tester.PayTester.GetController<InvoiceController>(null);
 
                 var testCases =
-                    new List<(string input, Dictionary<string, string> expectedOutput)>()
+                    new List<(string input, Dictionary<string, object> expectedOutput)>()
                     {
-                        { (null, new Dictionary<string, string>())},
-                        {("", new Dictionary<string, string>())},
-                        {("{}", new Dictionary<string, string>())},
-                        {("non-json-content", new Dictionary<string, string>(){ {string.Empty, "non-json-content"}})},
-                        {("[1,2,3]", new Dictionary<string, string>(){ {string.Empty, "[1,2,3]"}})},
-                        {("{ \"key\": \"value\"}", new Dictionary<string, string>(){ {"key", "value"}})},
-                        {("{ \"key\": true}", new Dictionary<string, string>(){ {"key", "True"}})},
-                        {("{ \"key\": \"value\", \"key2\": [\"value\", \"value2\"]}",
-                        new Dictionary<string, string>(){ {"key", "value"}, {"key2", "value,value2"}})},
-                        {("{ invalidjson file here}", new Dictionary<string, string>(){ {String.Empty, "{ invalidjson file here}"}})}
+                        { (null, new Dictionary<string, object>())},
+                        {("", new Dictionary<string, object>())},
+                        {("{}", new Dictionary<string, object>())},
+                        {("non-json-content", new Dictionary<string, object>(){ {string.Empty, "non-json-content"}})},
+                        {("[1,2,3]", new Dictionary<string, object>(){ {string.Empty, "[1,2,3]"}})},
+                        {("{ \"key\": \"value\"}", new Dictionary<string, object>(){ {"key", "value"}})},
+                        {("{ \"key\": true}", new Dictionary<string, object>(){ {"key", "True"}})},
+                        {("{ invalidjson file here}", new Dictionary<string, object>(){ {String.Empty, "{ invalidjson file here}"}})}
                     };
 
                 var tasks = new List<Task>();
@@ -1856,6 +1927,50 @@ donation:
             }
         }
 
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public void CanCreateStrangeInvoice()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                user.RegisterDerivationScheme("BTC");
+                var invoice1 = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 0.000000012m,
+                    Currency = "BTC",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+                var invoice2 = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 0.000000019m,
+                    Currency = "BTC",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+                Assert.Equal(0.00000001m, invoice1.Price);
+                Assert.Equal(0.00000002m, invoice2.Price);
+
+                var invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = -0.1m,
+                    Currency = "BTC",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+                Assert.Equal(0.0m, invoice.Price);
+            }
+        }
+
         [Fact]
         [Trait("Integration", "Integration")]
         public void InvoiceFlowThroughDifferentStatesCorrectly()
@@ -1869,6 +1984,7 @@ donation:
                 var invoice = user.BitPay.CreateInvoice(new Invoice()
                 {
                     Price = 5000.0m,
+                    TaxIncluded = 1000.0m,
                     Currency = "USD",
                     PosData = "posData",
                     OrderId = "orderId",
@@ -1898,6 +2014,8 @@ donation:
                 });
 
                 invoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
+                Assert.Equal(1000.0m, invoice.TaxIncluded);
+                Assert.Equal(5000.0m, invoice.Price);
                 Assert.Equal(Money.Coins(0), invoice.BtcPaid);
                 Assert.Equal("new", invoice.Status);
                 Assert.False((bool)((JValue)invoice.ExceptionStatus).Value);

BTCPayServer.Tests/docker-compose.yml

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

BTCPayServer/BTCPayNetworkProvider.Bitcoinplus.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using NBitcoin;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitBitcoinplus()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("XBC");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                DisplayName = "Bitcoinplus",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/xbc/tx.dws?{0}" : "https://chainz.cryptoid.info/xbc/tx.dws?{0}",
+                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "bitcoinplus",
+                DefaultRateRules = new[] 
+                {
+                                "XBC_X = XBC_BTC * BTC_X",
+                                "XBC_BTC = cryptopia(XBC_BTC)"
+                },
+                CryptoImagePath = "imlegacy/bitcoinplus.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("65'") : new KeyPath("1'")
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.Bitcore.cs

@@ -24,7 +24,7 @@ namespace BTCPayServer
                 DefaultRateRules = new[]
                 {
                                 "BTX_X = BTX_BTC * BTC_X",
-                                "BTX_BTC = cryptopia(BTX_BTC)"
+                                "BTX_BTC = hitbtc(BTX_BTC)"
                 },
                 CryptoImagePath = "imlegacy/bitcore.svg",
                 LightningImagePath = "imlegacy/bitcore-lightning.svg",

BTCPayServer/BTCPayNetworkProvider.cs

@@ -52,10 +52,13 @@ namespace BTCPayServer
             InitBitcoinGold();
             InitMonacoin();
             InitDash();
-            InitPolis();
             InitFeathercoin();
             InitGroestlcoin();
             InitViacoin();
+
+            // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
+            //InitPolis();
+            //InitBitcoinplus();
             //InitUfo();
         }
 

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.42</Version>
+		<Version>1.0.3.49</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -33,11 +33,9 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.4" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.5" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
-    <PackageReference Include="Hangfire" Version="1.6.20" />
-    <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
     <PackageReference Include="HtmlSanitizer" Version="4.0.199" />
     <PackageReference Include="LedgerWallet" Version="2.0.0.3" />
     <PackageReference Include="Meziantou.AspNetCore.BundleTagHelpers" Version="2.0.0" />
@@ -47,10 +45,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NBitcoin" Version="4.1.1.73" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.30" />	  
+    <PackageReference Include="NBitcoin" Version="4.1.1.78" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.31" />	  
     <PackageReference Include="DBreeze" Version="1.92.0" />
-    <PackageReference Include="NBXplorer.Client" Version="2.0.0.1" />
+    <PackageReference Include="NBXplorer.Client" Version="2.0.0.3" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
     <PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" />

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -110,7 +110,7 @@ namespace BTCPayServer.Configuration
                         if (!LightningConnectionString.TryParse(lightning, true, out var connectionString, out var error))
                         {
                             throw new ConfigException($"Invalid setting {net.CryptoCode}.lightning, " + Environment.NewLine +
-                                $"If you have a lightning server use: 'type=clightning;server=/root/.lightning/lightning-rpc', " + Environment.NewLine +
+                                $"If you have a c-lightning server use: 'type=clightning;server=/root/.lightning/lightning-rpc', " + Environment.NewLine +
                                 $"If you have a lightning charge server: 'type=charge;server=https://charge.example.com;api-token=yourapitoken'" + Environment.NewLine +
                                 $"If you have a lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
                                 $"              lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
@@ -118,7 +118,7 @@ namespace BTCPayServer.Configuration
                         }
                         if (connectionString.IsLegacy)
                         {
-                            Logs.Configuration.LogWarning($"Setting {net.CryptoCode}.lightning will work but use an deprecated format, please replace it by '{connectionString.ToString()}'");
+                            Logs.Configuration.LogWarning($"Setting {net.CryptoCode}.lightning is a deprecated format, it will work now, but please replace it for future versions with '{connectionString.ToString()}'");
                         }
                         InternalLightningByCryptoCode.Add(net.CryptoCode, connectionString);
                     }
@@ -177,10 +177,11 @@ namespace BTCPayServer.Configuration
             var services = conf.GetOrDefault<string>("externalservices", null);
             if (services != null)
             {
-                foreach (var service in services.Split(new[] { ';', ',' })
-                                                .Select(p => p.Split(':'))
-                                                .Where(p => p.Length == 2)
-                                                .Select(p => (Name: p[0], Link: p[1])))
+                foreach (var service in services.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries)
+                                                .Select(p => (p, SeparatorIndex: p.IndexOf(':', StringComparison.OrdinalIgnoreCase)))
+                                                .Where(p => p.SeparatorIndex != -1)
+                                                .Select(p => (Name: p.p.Substring(0, p.SeparatorIndex), 
+                                                              Link: p.p.Substring(p.SeparatorIndex + 1))))
                 {
                     ExternalServices.AddOrReplace(service.Name, service.Link);
                 }
@@ -235,7 +236,7 @@ namespace BTCPayServer.Configuration
                 RootPath = "/" + RootPath;
             var old = conf.GetOrDefault<Uri>("internallightningnode", null);
             if (old != null)
-                throw new ConfigException($"internallightningnode should not be used anymore, use btclightning instead");
+                throw new ConfigException($"internallightningnode is deprecated and should not be used anymore, use btclightning instead");
 
             LogFile = GetDebugLog(conf);
             if (!string.IsNullOrEmpty(LogFile))

BTCPayServer/Controllers/AccountController.cs

@@ -28,7 +28,7 @@ namespace BTCPayServer.Controllers
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
-        private readonly IEmailSender _emailSender;
+        private readonly EmailSenderFactory _EmailSenderFactory;
         StoreRepository storeRepository;
         RoleManager<IdentityRole> _RoleManager;
         SettingsRepository _SettingsRepository;
@@ -40,14 +40,14 @@ namespace BTCPayServer.Controllers
             RoleManager<IdentityRole> roleManager,
             StoreRepository storeRepository,
             SignInManager<ApplicationUser> signInManager,
-            IEmailSender emailSender,
+            EmailSenderFactory emailSenderFactory,
             SettingsRepository settingsRepository,
             Configuration.BTCPayServerOptions options)
         {
             this.storeRepository = storeRepository;
             _userManager = userManager;
             _signInManager = signInManager;
-            _emailSender = emailSender;
+            _EmailSenderFactory = emailSenderFactory;
             _RoleManager = roleManager;
             _SettingsRepository = settingsRepository;
             _Options = options;
@@ -286,7 +286,8 @@ namespace BTCPayServer.Controllers
                     var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
                     var callbackUrl = Url.EmailConfirmationLink(user.Id, code, Request.Scheme);
                     RegisteredUserId = user.Id;
-                    await _emailSender.SendEmailConfirmationAsync(model.Email, callbackUrl);
+
+                    _EmailSenderFactory.GetEmailSender().SendEmailConfirmation(model.Email, callbackUrl);
                     if (!policies.RequiresConfirmedEmail)
                     {
                         if(logon)
@@ -446,8 +447,9 @@ namespace BTCPayServer.Controllers
                 // visit https://go.microsoft.com/fwlink/?LinkID=532713
                 var code = await _userManager.GeneratePasswordResetTokenAsync(user);
                 var callbackUrl = Url.ResetPasswordCallbackLink(user.Id, code, Request.Scheme);
-                await _emailSender.SendEmailAsync(model.Email, "Reset Password",
-                   $"Please reset your password by clicking here: <a href='{callbackUrl}'>link</a>");
+                _EmailSenderFactory.GetEmailSender().SendEmail(model.Email, "Reset Password",
+                    $"Please reset your password by clicking here: <a href='{callbackUrl}'>link</a>");
+                
                 return RedirectToAction(nameof(ForgotPasswordConfirmation));
             }
 

BTCPayServer/Controllers/AppsPublicController.cs

@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using BTCPayServer.Crowdfund;
 using BTCPayServer.Data;
 using BTCPayServer.Filters;
 using BTCPayServer.Hubs;
@@ -19,10 +20,12 @@ using BTCPayServer.Services.Rates;
 using Ganss.XSS;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using NBitpayClient;
+using Newtonsoft.Json.Linq;
 using YamlDotNet.RepresentationModel;
 using static BTCPayServer.Controllers.AppsController;
 
@@ -153,10 +156,11 @@ namespace BTCPayServer.Controllers
             var store = await _AppsHelper.GetStore(app);
             var title =  settings.Title;
             var price = request.Amount;
+            ViewPointOfSaleViewModel.Item choice = null;
             if (!string.IsNullOrEmpty(request.ChoiceKey))
             {
                 var choices = _AppsHelper.Parse(settings.PerksTemplate, settings.TargetCurrency);
-                var choice = choices.FirstOrDefault(c => c.Id == request.ChoiceKey);
+                choice = choices.FirstOrDefault(c => c.Id == request.ChoiceKey);
                 if (choice == null)
                     return NotFound("Incorrect option provided");
                 title = choice.Title;
@@ -183,7 +187,7 @@ namespace BTCPayServer.Controllers
                 NotificationURL = settings.NotificationUrl,
                 FullNotifications = true,
                 ExtendedNotifications = true,
-                RedirectURL = request.RedirectUrl,
+                RedirectURL = request.RedirectUrl ?? Request.GetDisplayUrl(),
                 
                 
             }, store, HttpContext.Request.GetAbsoluteRoot());
@@ -209,7 +213,8 @@ namespace BTCPayServer.Controllers
                                                         string orderId,
                                                         string notificationUrl,
                                                         string redirectUrl,
-                                                        string choiceKey)
+                                                        string choiceKey,
+                                                        string posData = null)
         {
             var app = await _AppsHelper.GetApp(appId, AppType.PointOfSale);
             if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
@@ -225,10 +230,11 @@ namespace BTCPayServer.Controllers
             }
             string title = null;
             var price = 0.0m;
+            ViewPointOfSaleViewModel.Item choice = null;
             if (!string.IsNullOrEmpty(choiceKey))
             {
                 var choices = _AppsHelper.Parse(settings.Template, settings.Currency);
-                var choice = choices.FirstOrDefault(c => c.Id == choiceKey);
+                choice = choices.FirstOrDefault(c => c.Id == choiceKey);
                 if (choice == null)
                     return NotFound();
                 title = choice.Title;
@@ -247,15 +253,16 @@ namespace BTCPayServer.Controllers
             store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
             var invoice = await _InvoiceController.CreateInvoiceCore(new NBitpayClient.Invoice()
             {
-                ItemCode = choiceKey ?? string.Empty,
+                ItemCode = choice?.Id,
                 ItemDesc = title,
                 Currency = settings.Currency,
                 Price = price,
                 BuyerEmail = email,
                 OrderId = orderId,
                 NotificationURL = notificationUrl,
-                RedirectURL = redirectUrl,
+                RedirectURL = redirectUrl  ?? Request.GetDisplayUrl(),
                 FullNotifications = true,
+                PosData = string.IsNullOrEmpty(posData) ? null : posData
             }, store, HttpContext.Request.GetAbsoluteRoot());
             return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
         }

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -21,6 +21,7 @@ using BTCPayServer.Services.Invoices.Export;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore.Internal;
 using NBitcoin;
 using NBitpayClient;
 using NBXplorer;
@@ -278,7 +279,6 @@ namespace BTCPayServer.Controllers
                 PaymentMethodName = GetDisplayName(paymentMethodId, network),
                 CryptoImage = GetImage(paymentMethodId, network),
                 IsLightning = paymentMethodId.PaymentType == PaymentTypes.LightningLike,
-                ServerUrl = HttpContext.Request.GetAbsoluteRoot(),
                 OrderId = invoice.OrderId,
                 InvoiceId = invoice.Id,
                 DefaultLang = storeBlob.DefaultLang ?? "en",
@@ -369,6 +369,9 @@ namespace BTCPayServer.Controllers
         [HttpGet]
         [Route("i/{invoiceId}/status")]
         [Route("i/{invoiceId}/{paymentMethodId}/status")]
+        [Route("invoice/{invoiceId}/status")]
+        [Route("invoice/{invoiceId}/{paymentMethodId}/status")]
+        [Route("invoice/status")]
         public async Task<IActionResult> GetStatus(string invoiceId, string paymentMethodId = null)
         {
             var model = await GetInvoiceModel(invoiceId, paymentMethodId);
@@ -379,6 +382,10 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [Route("i/{invoiceId}/status/ws")]
+        [Route("i/{invoiceId}/{paymentMethodId}/status/ws")]
+        [Route("invoice/{invoiceId}/status/ws")]
+        [Route("invoice/{invoiceId}/{paymentMethodId}/status")]
+        [Route("invoice/status/ws")]
         public async Task<IActionResult> GetStatusWebSocket(string invoiceId)
         {
             if (!HttpContext.WebSockets.IsWebSocketRequest)
@@ -424,6 +431,7 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("i/{invoiceId}/UpdateCustomer")]
+        [Route("invoice/UpdateCustomer")]
         public async Task<IActionResult> UpdateCustomer(string invoiceId, [FromBody]UpdateCustomerModel data)
         {
             if (!ModelState.IsValid)
@@ -447,8 +455,11 @@ namespace BTCPayServer.Controllers
                 Count = count,
                 StatusMessage = StatusMessage
             };
-
-            var list = await ListInvoicesProcess(searchTerm, skip, count);
+            InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm);
+            var counting = _InvoiceRepository.GetInvoicesTotal(invoiceQuery);
+            invoiceQuery.Count = count;
+            invoiceQuery.Skip = skip;
+            var list = await _InvoiceRepository.GetInvoices(invoiceQuery);
             foreach (var invoice in list)
             {
                 var state = invoice.GetInvoiceState();
@@ -465,17 +476,16 @@ namespace BTCPayServer.Controllers
                     CanMarkComplete = state.CanMarkComplete()
                 });
             }
+            model.Total = await counting;
             return View(model);
         }
 
-        private async Task<InvoiceEntity[]> ListInvoicesProcess(string searchTerm = null, int skip = 0, int count = 50)
+        private InvoiceQuery GetInvoiceQuery(string searchTerm = null)
         {
             var filterString = new SearchString(searchTerm);
-            var list = await _InvoiceRepository.GetInvoices(new InvoiceQuery()
+            var invoiceQuery = new InvoiceQuery()
             {
                 TextSearch = filterString.TextSearch,
-                Count = count,
-                Skip = skip,
                 UserId = GetUserId(),
                 Unusual = !filterString.Filters.ContainsKey("unusual") ? null
                           : !bool.TryParse(filterString.Filters["unusual"].First(), out var r) ? (bool?)null
@@ -485,9 +495,8 @@ namespace BTCPayServer.Controllers
                 StoreId = filterString.Filters.ContainsKey("storeid") ? filterString.Filters["storeid"].ToArray() : null,
                 ItemCode = filterString.Filters.ContainsKey("itemcode") ? filterString.Filters["itemcode"].ToArray() : null,
                 OrderId = filterString.Filters.ContainsKey("orderid") ? filterString.Filters["orderid"].ToArray() : null
-            });
-
-            return list;
+            };
+            return invoiceQuery;
         }
 
         [HttpGet]
@@ -497,7 +506,10 @@ namespace BTCPayServer.Controllers
         {
             var model = new InvoiceExport(_NetworkProvider, _CurrencyNameTable);
 
-            var invoices = await ListInvoicesProcess(searchTerm, 0, int.MaxValue);
+            InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm);
+            invoiceQuery.Count = int.MaxValue;
+            invoiceQuery.Skip = 0;
+            var invoices = await _InvoiceRepository.GetInvoices(invoiceQuery);
             var res = model.Process(invoices, format);
 
             var cd = new ContentDisposition
@@ -675,9 +687,9 @@ namespace BTCPayServer.Controllers
 
         public class PosDataParser
         {
-            public static Dictionary<string, string> ParsePosData(string posData)
+            public static Dictionary<string, object> ParsePosData(string posData)
             {
-                var result = new Dictionary<string,string>();
+                var result = new Dictionary<string,object>();
                 if (string.IsNullOrEmpty(posData))
                 {
                     return result;
@@ -685,7 +697,6 @@ namespace BTCPayServer.Controllers
             
                 try
                 {
-                
                     var jObject =JObject.Parse(posData);
                     foreach (var item in jObject)
                     {
@@ -693,7 +704,14 @@ namespace BTCPayServer.Controllers
                         switch (item.Value.Type)
                         {
                             case JTokenType.Array:
-                                result.Add(item.Key, string.Join(',', item.Value.AsEnumerable()));
+                                var items = item.Value.AsEnumerable().ToList();
+                                for (var i = 0; i < items.Count(); i++)
+                                {
+                                    result.Add($"{item.Key}[{i}]", ParsePosData(items[i].ToString()));
+                                }
+                                break;
+                            case JTokenType.Object:
+                                result.Add(item.Key, ParsePosData(item.Value.ToString()));
                                 break;
                             default:
                                 result.Add(item.Key, item.Value.ToString());

BTCPayServer/Controllers/InvoiceController.cs

@@ -71,7 +71,6 @@ namespace BTCPayServer.Controllers
             {
                 InvoiceTime = DateTimeOffset.UtcNow
             };
-
             var storeBlob = store.GetStoreBlob();
             Uri notificationUri = Uri.IsWellFormedUriString(invoice.NotificationURL, UriKind.Absolute) ? new Uri(invoice.NotificationURL, UriKind.Absolute) : null;
             if (notificationUri == null || (notificationUri.Scheme != "http" && notificationUri.Scheme != "https")) //TODO: Filer non routable addresses ?
@@ -95,7 +94,20 @@ namespace BTCPayServer.Controllers
                     throw new BitpayHttpException(400, "Invalid email");
                 entity.RefundMail = entity.BuyerInformation.BuyerEmail;
             }
+
+            var currencyInfo = _CurrencyNameTable.GetNumberFormatInfo(invoice.Currency, false);
+            if (currencyInfo != null)
+            {
+                invoice.Price = Math.Round(invoice.Price, currencyInfo.CurrencyDecimalDigits);
+                invoice.TaxIncluded = Math.Round(invoice.TaxIncluded, currencyInfo.CurrencyDecimalDigits);
+            }
+            invoice.Price = Math.Max(0.0m, invoice.Price);
+            invoice.TaxIncluded = Math.Max(0.0m, invoice.TaxIncluded);
+            invoice.TaxIncluded = Math.Min(invoice.TaxIncluded, invoice.Price);
+
             entity.ProductInformation = Map<Invoice, ProductInformation>(invoice);
+
+
             entity.RedirectURL = invoice.RedirectURL ?? store.StoreWebsite;
             if (!Uri.IsWellFormedUriString(entity.RedirectURL, UriKind.Absolute))
                 entity.RedirectURL = null;
@@ -147,7 +159,7 @@ namespace BTCPayServer.Controllers
             if (supported.Count == 0)
             {
                 StringBuilder errors = new StringBuilder();
-                errors.AppendLine("No payment method available for this store");
+                errors.AppendLine("Warning: No wallet has been linked to your BTCPay Store. See the following link for more information on how to connect your store and wallet. (https://docs.btcpayserver.org/btcpay-basics/gettingstarted#connecting-btcpay-store-to-your-wallet)");
                 foreach (var error in logs.ToList())
                 {
                     errors.AppendLine(error.ToString());

BTCPayServer/Controllers/ManageController.cs

@@ -31,7 +31,7 @@ namespace BTCPayServer.Controllers
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
-        private readonly IEmailSender _emailSender;
+        private readonly EmailSenderFactory _EmailSenderFactory;
         private readonly ILogger _logger;
         private readonly UrlEncoder _urlEncoder;
         TokenRepository _TokenRepository;
@@ -44,7 +44,7 @@ namespace BTCPayServer.Controllers
         public ManageController(
           UserManager<ApplicationUser> userManager,
           SignInManager<ApplicationUser> signInManager,
-          IEmailSender emailSender,
+          EmailSenderFactory emailSenderFactory,
           ILogger<ManageController> logger,
           UrlEncoder urlEncoder,
           TokenRepository tokenRepository,
@@ -54,7 +54,7 @@ namespace BTCPayServer.Controllers
         {
             _userManager = userManager;
             _signInManager = signInManager;
-            _emailSender = emailSender;
+            _EmailSenderFactory = emailSenderFactory;
             _logger = logger;
             _urlEncoder = urlEncoder;
             _TokenRepository = tokenRepository;
@@ -156,8 +156,7 @@ namespace BTCPayServer.Controllers
             var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
             var callbackUrl = Url.EmailConfirmationLink(user.Id, code, Request.Scheme);
             var email = user.Email;
-            await _emailSender.SendEmailConfirmationAsync(email, callbackUrl);
-
+            _EmailSenderFactory.GetEmailSender().SendEmailConfirmation(email, callbackUrl);
             StatusMessage = "Verification email sent. Please check your email.";
             return RedirectToAction(nameof(Index));
         }

BTCPayServer/Controllers/ServerController.cs

@@ -465,7 +465,7 @@ namespace BTCPayServer.Controllers
                 result.ExternalServices.Add(new ServicesViewModel.ExternalService()
                 {
                     Name = externalService.Key,
-                    Link = this.Request.GetRelativePath(externalService.Value)
+                    Link = this.Request.GetRelativePathOrAbsolute(externalService.Value)
                 });
             }
             if(_Options.SSHSettings != null)

BTCPayServer/Controllers/StoresController.Email.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+using BTCPayServer.Models.ServerViewModels;
+using BTCPayServer.Models.StoreViewModels;
+using BTCPayServer.Payments.Changelly;
+using BTCPayServer.Services.Mails;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BTCPayServer.Controllers
+{
+    public partial class StoresController
+    {
+        
+        [Route("{storeId}/emails")]
+        public IActionResult Emails()
+        {
+            var store = HttpContext.GetStoreData();
+            if (store == null)
+                return NotFound();
+            var data = store.GetStoreBlob().EmailSettings ?? new EmailSettings();
+            return View(new EmailsViewModel() { Settings = data });
+        }
+        
+        [Route("{storeId}/emails")]
+        [HttpPost]
+        public async Task<IActionResult> Emails(string storeId, EmailsViewModel model, string command)
+        {
+            var store = HttpContext.GetStoreData();
+            if (store == null)
+                return NotFound();
+            if (command == "Test")
+            {
+                try
+                {
+                    if (!model.Settings.IsComplete())
+                    {
+                        model.StatusMessage = "Error: Required fields missing";
+                        return View(model);
+                    }
+                    var client = model.Settings.CreateSmtpClient();
+                    await client.SendMailAsync(model.Settings.From, model.TestEmail, "BTCPay test", "BTCPay test");
+                    model.StatusMessage = "Email sent to " + model.TestEmail + ", please, verify you received it";
+                }
+                catch (Exception ex)
+                {
+                    model.StatusMessage = "Error: " + ex.Message;
+                }
+                return View(model);
+            }
+            else // if(command == "Save")
+            {
+                
+                var storeBlob = store.GetStoreBlob();
+                storeBlob.EmailSettings = model.Settings;
+                store.SetStoreBlob(storeBlob);
+                await _Repo.UpdateStore(store);
+                StatusMessage = "Email settings modified";
+                return RedirectToAction(nameof(UpdateStore), new {
+                    storeId});
+
+            }
+        }
+    }
+}

BTCPayServer/Controllers/StoresController.cs

@@ -96,6 +96,11 @@ namespace BTCPayServer.Controllers
         {
             get; set;
         }
+        [TempData]
+        public bool StoreNotConfigured
+        {
+            get; set;
+        }
 
         [HttpGet]
         [Route("{storeId}/users")]
@@ -167,7 +172,7 @@ namespace BTCPayServer.Controllers
             return View("Confirm", new ConfirmModel()
             {
                 Title = $"Remove store user",
-                Description = $"Are you sure to remove access to remove access to {user.Email}?",
+                Description = $"Are you sure you want to remove store access for {user.Email}?",
                 Action = "Delete"
             });
         }
@@ -567,6 +572,7 @@ namespace BTCPayServer.Controllers
             var model = new TokensViewModel();
             var tokens = await _TokenRepository.GetTokensByStoreIdAsync(StoreData.Id);
             model.StatusMessage = StatusMessage;
+            model.StoreNotConfigured = StoreNotConfigured;
             model.Tokens = tokens.Select(t => new TokenViewModel()
             {
                 Facade = t.Facade,
@@ -794,6 +800,10 @@ namespace BTCPayServer.Controllers
             var pairingResult = await _TokenRepository.PairWithStoreAsync(pairingCode, store.Id);
             if (pairingResult == PairingResult.Complete || pairingResult == PairingResult.Partial)
             {
+                var excludeFilter = store.GetStoreBlob().GetExcludedPaymentMethods();
+                StoreNotConfigured = store.GetSupportedPaymentMethods(_NetworkProvider)
+                                          .Where(p => !excludeFilter.Match(p.PaymentId))
+                                          .Count() == 0;
                 StatusMessage = "Pairing is successful";
                 if (pairingResult == PairingResult.Partial)
                     StatusMessage = "Server initiated pairing code: " + pairingCode;

BTCPayServer/Controllers/WalletsController.cs

@@ -146,7 +146,7 @@ namespace BTCPayServer.Controllers
         [Route("{walletId}/send")]
         public async Task<IActionResult> WalletSend(
             [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, string defaultDestination = null, string defaultAmount = null)
+            WalletId walletId, string defaultDestination = null, string defaultAmount = null, bool advancedMode = false)
         {
             if (walletId?.StoreId == null)
                 return NotFound();
@@ -195,6 +195,7 @@ namespace BTCPayServer.Controllers
                 }
                 catch (Exception ex) { model.RateError = ex.Message; }
             }
+            model.AdvancedMode = advancedMode;
             return View(model);
         }
 
@@ -202,7 +203,7 @@ namespace BTCPayServer.Controllers
         [Route("{walletId}/send")]
         public async Task<IActionResult> WalletSend(
             [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId, WalletSendModel vm)
+            WalletId walletId, WalletSendModel vm, string command = null)
         {
             if (walletId?.StoreId == null)
                 return NotFound();
@@ -212,6 +213,14 @@ namespace BTCPayServer.Controllers
             var network = this.NetworkProvider.GetNetwork(walletId?.CryptoCode);
             if (network == null)
                 return NotFound();
+
+            if (command == "noob" || command == "expert")
+            {
+                ModelState.Clear();
+                vm.AdvancedMode = command == "expert";
+                return View(vm);
+            }
+
             var destination = ParseDestination(vm.Destination, network.NBitcoinNetwork);
             if (destination == null)
                 ModelState.AddModelError(nameof(vm.Destination), "Invalid address");
@@ -231,7 +240,8 @@ namespace BTCPayServer.Controllers
                 Destination = vm.Destination,
                 Amount = vm.Amount.Value,
                 SubstractFees = vm.SubstractFees,
-                FeeSatoshiPerByte = vm.FeeSatoshiPerByte
+                FeeSatoshiPerByte = vm.FeeSatoshiPerByte,
+                NoChange = vm.NoChange
             });
         }
 
@@ -403,6 +413,7 @@ namespace BTCPayServer.Controllers
             // getxpub
             int account = 0,
             // sendtoaddress
+            bool noChange = false,
             string destination = null, string amount = null, string feeRate = null, string substractFees = null
             )
         {
@@ -436,7 +447,7 @@ namespace BTCPayServer.Controllers
                     {
                         try
                         {
-                            destinationAddress = BitcoinAddress.Create(destination, network.NBitcoinNetwork);
+                            destinationAddress = BitcoinAddress.Create(destination.Trim(), network.NBitcoinNetwork);
                         }
                         catch { }
                         if (destinationAddress == null)
@@ -487,24 +498,16 @@ namespace BTCPayServer.Controllers
                         var strategy = GetDirectDerivationStrategy(derivationScheme);
                         var wallet = _walletProvider.GetWallet(network);
                         var change = wallet.GetChangeAddressAsync(derivationScheme);
-
-                        var unspentCoins = await wallet.GetUnspentCoins(derivationScheme);
-                        var changeAddress = await change;
-                        var send = new[] { (
-                        destination: destinationAddress as IDestination,
-                        amount: amountBTC,
-                        substractFees: subsctractFeesValue) };
-
-                        foreach (var element in send)
+                        var keypaths = new Dictionary<Script, KeyPath>();
+                        List<Coin> availableCoins = new List<Coin>();
+                        foreach (var c in await wallet.GetUnspentCoins(derivationScheme))
                         {
-                            if (element.destination == null)
-                                throw new ArgumentNullException(nameof(element.destination));
-                            if (element.amount == null)
-                                throw new ArgumentNullException(nameof(element.amount));
-                            if (element.amount <= Money.Zero)
-                                throw new ArgumentOutOfRangeException(nameof(element.amount), "The amount should be above zero");
+                            keypaths.TryAdd(c.Coin.ScriptPubKey, c.KeyPath);
+                            availableCoins.Add(c.Coin);
                         }
 
+                        var changeAddress = await change;
+
                         var storeBlob = storeData.GetStoreBlob();
                         var paymentId = new Payments.PaymentMethodId(cryptoCode, Payments.PaymentTypes.BTCLike);
                         var foundKeyPath = storeBlob.GetWalletKeyPathRoot(paymentId);
@@ -520,10 +523,25 @@ namespace BTCPayServer.Controllers
                             storeData.SetStoreBlob(storeBlob);
                             await Repository.UpdateStore(storeData);
                         }
+retry:
+                        var send = new[] { (
+                        destination: destinationAddress as IDestination,
+                        amount: amountBTC,
+                        substractFees: subsctractFeesValue) };
+
+                        foreach (var element in send)
+                        {
+                            if (element.destination == null)
+                                throw new ArgumentNullException(nameof(element.destination));
+                            if (element.amount == null)
+                                throw new ArgumentNullException(nameof(element.amount));
+                            if (element.amount <= Money.Zero)
+                                throw new ArgumentOutOfRangeException(nameof(element.amount), "The amount should be above zero");
+                        }
 
                         TransactionBuilder builder = network.NBitcoinNetwork.CreateTransactionBuilder();
                         builder.StandardTransactionPolicy.MinRelayTxFee = summary.Status.BitcoinStatus.MinRelayTxFee;
-                        builder.AddCoins(unspentCoins.Select(c => c.Coin).ToArray());
+                        builder.AddCoins(availableCoins);
 
                         foreach (var element in send)
                         {
@@ -531,6 +549,7 @@ namespace BTCPayServer.Controllers
                             if (element.substractFees)
                                 builder.SubtractFees();
                         }
+
                         builder.SetChange(changeAddress.Item1);
 
                         if (network.MinFee == null)
@@ -547,13 +566,15 @@ namespace BTCPayServer.Controllers
                         }
                         var unsigned = builder.BuildTransaction(false);
 
-                        var keypaths = new Dictionary<Script, KeyPath>();
-                        foreach (var c in unspentCoins)
+                        var hasChange = unsigned.Outputs.Any(o => o.ScriptPubKey == changeAddress.Item1.ScriptPubKey);
+                        if (noChange && hasChange)
                         {
-                            keypaths.TryAdd(c.Coin.ScriptPubKey, c.KeyPath);
+                            availableCoins = builder.FindSpentCoins(unsigned).Cast<Coin>().ToList();
+                            amountBTC = builder.FindSpentCoins(unsigned).Select(c => c.TxOut.Value).Sum();
+                            subsctractFeesValue = true;
+                            goto retry;
                         }
 
-                        var hasChange = unsigned.Outputs.Count == 2;
                         var usedCoins = builder.FindSpentCoins(unsigned);
 
                         Dictionary<uint256, Transaction> parentTransactions = new Dictionary<uint256, Transaction>();

BTCPayServer/Crowdfund/CrowdfundHub.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Models.AppViewModels;
@@ -35,20 +36,30 @@ namespace BTCPayServer.Hubs
         {
                model.RedirectToCheckout = false;
                _AppsPublicController.ControllerContext.HttpContext = Context.GetHttpContext();
-               var result = await _AppsPublicController.ContributeToCrowdfund(Context.Items["app"].ToString(), model);
-               switch (result)
+               try
                {
-                   case OkObjectResult okObjectResult:
-                       await Clients.Caller.SendCoreAsync(InvoiceCreated, new[] {okObjectResult.Value.ToString()});
-                       break;
-                   case ObjectResult objectResult:
-                       await Clients.Caller.SendCoreAsync(InvoiceError, new[] {objectResult.Value});
-                       break;
-                   default:
-                       await Clients.Caller.SendCoreAsync(InvoiceError, System.Array.Empty<object>());
-                       break;
+
+                   var result =
+                       await _AppsPublicController.ContributeToCrowdfund(Context.Items["app"].ToString(), model);
+                   switch (result)
+                   {
+                       case OkObjectResult okObjectResult:
+                           await Clients.Caller.SendCoreAsync(InvoiceCreated, new[] {okObjectResult.Value.ToString()});
+                           break;
+                       case ObjectResult objectResult:
+                           await Clients.Caller.SendCoreAsync(InvoiceError, new[] {objectResult.Value});
+                           break;
+                       default:
+                           await Clients.Caller.SendCoreAsync(InvoiceError, System.Array.Empty<object>());
+                           break;
+                   }
                }
-               
+               catch (Exception)
+               {
+                   await Clients.Caller.SendCoreAsync(InvoiceError, System.Array.Empty<object>());
+
+               }
+
         }
 
     }

BTCPayServer/Crowdfund/CrowdfundHubStreamer.cs

@@ -2,11 +2,11 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Data;
 using BTCPayServer.Events;
+using BTCPayServer.Hubs;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Rating;
@@ -16,14 +16,11 @@ using BTCPayServer.Services.Rates;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Primitives;
 using NBitcoin;
-using YamlDotNet.Core;
 
-namespace BTCPayServer.Hubs
+namespace BTCPayServer.Crowdfund
 {
-    public class 
-        CrowdfundHubStreamer
+    public class CrowdfundHubStreamer: IDisposable
     {
         public const string CrowdfundInvoiceOrderIdPrefix = "crowdfund-app_";
         private readonly EventAggregator _EventAggregator;
@@ -37,7 +34,9 @@ namespace BTCPayServer.Hubs
 
         private readonly ConcurrentDictionary<string,(string appId, bool useAllStoreInvoices,bool useInvoiceAmount)> _QuickAppInvoiceLookup = 
             new ConcurrentDictionary<string, (string appId, bool useAllStoreInvoices, bool useInvoiceAmount)>();
-        
+
+        private List<IEventAggregatorSubscription> _Subscriptions;
+
         public CrowdfundHubStreamer(EventAggregator eventAggregator, 
             IHubContext<CrowdfundHub> hubContext, 
             IMemoryCache memoryCache,
@@ -116,13 +115,15 @@ namespace BTCPayServer.Hubs
 
         private void SubscribeToEvents()
         {
-            
-            _EventAggregator.Subscribe<InvoiceEvent>(OnInvoiceEvent);
-            _EventAggregator.Subscribe<AppsController.CrowdfundAppUpdated>(updated =>
+            _Subscriptions = new List<IEventAggregatorSubscription>()
             {
-                UpdateLookup(updated.AppId, updated.StoreId, updated.Settings);
-                InvalidateCacheForApp(updated.AppId);
-            });
+                _EventAggregator.Subscribe<InvoiceEvent>(OnInvoiceEvent),
+                _EventAggregator.Subscribe<AppsController.CrowdfundAppUpdated>(updated =>
+                {
+                    UpdateLookup(updated.AppId, updated.StoreId, updated.Settings);
+                    InvalidateCacheForApp(updated.AppId);
+                })
+            };
         }
 
         private string GetCacheKey(string appId)
@@ -152,7 +153,7 @@ namespace BTCPayServer.Hubs
                         Enum.GetName(typeof(PaymentTypes), 
                             invoiceEvent.Payment.GetPaymentMethodId().PaymentType)
                     } );
-                    
+                    _Logger.LogInformation($"App {quickLookup.appId}: Received Payment");
                     InvalidateCacheForApp(quickLookup.appId);
                     break;
                 case InvoiceEvent.Created:
@@ -361,5 +362,10 @@ namespace BTCPayServer.Hubs
                 StartDate = startDate
             });
         }
+
+        public void Dispose()
+        {
+            _Subscriptions.ForEach(subscription => subscription.Dispose());
+        }
     }
 }

BTCPayServer/Data/ApplicationDbContextFactory.cs

@@ -3,8 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Hangfire;
-using Hangfire.MemoryStorage;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations;
 using JetBrains.Annotations;
@@ -98,15 +96,5 @@ namespace BTCPayServer.Data
             else if (_Type == DatabaseType.MySQL)
                 builder.UseMySql(_ConnectionString);
         }
-
-        public void ConfigureHangfireBuilder(IGlobalConfiguration builder)
-        {
-            builder.UseMemoryStorage();
-            //We always use memory storage because of incompatibilities with the latest postgres in 2.1
-            //if (_Type == DatabaseType.Sqlite)
-            //    builder.UseMemoryStorage(); //Sqlite provider does not support multiple workers
-            //else if (_Type == DatabaseType.Postgres)
-            //    builder.UsePostgreSqlStorage(_ConnectionString);
-        }
     }
 }

BTCPayServer/Data/StoreData.cs

@@ -21,6 +21,7 @@ using BTCPayServer.Payments.Changelly;
 using BTCPayServer.Payments.CoinSwitch;
 using BTCPayServer.Security;
 using BTCPayServer.Rating;
+using BTCPayServer.Services.Mails;
 
 namespace BTCPayServer.Data
 {
@@ -403,6 +404,8 @@ namespace BTCPayServer.Data
         [Obsolete("Use SetWalletKeyPathRoot/GetWalletKeyPathRoot instead")]
         public Dictionary<string, string> WalletKeyPathRoots { get; set; } = new Dictionary<string, string>();
 
+        public EmailSettings EmailSettings { get; set; }
+
         public IPaymentFilter GetExcludedPaymentMethods()
         {
 #pragma warning disable CS0618 // Type or member is obsolete

BTCPayServer/Extensions/EmailSenderExtensions.cs

@@ -10,9 +10,9 @@ namespace BTCPayServer.Services
 {
     public static class EmailSenderExtensions
     {
-        public static Task SendEmailConfirmationAsync(this IEmailSender emailSender, string email, string link)
+        public static void SendEmailConfirmation(this IEmailSender emailSender, string email, string link)
         {
-            return emailSender.SendEmailAsync(email, "Confirm your email",
+            emailSender.SendEmail(email, "Confirm your email",
                 $"Please confirm your account by clicking this link: <a href='{HtmlEncoder.Default.Encode(link)}'>link</a>");
         }
     }

BTCPayServer/HostedServices/BackgroundJobSchedulerHostedService.cs

@@ -0,0 +1,133 @@
+using System;
+using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using BTCPayServer.Logging;
+using BTCPayServer.Services;
+using Microsoft.Extensions.Hosting;
+using NicolasDorier.RateLimits;
+
+namespace BTCPayServer.HostedServices
+{
+    public class BackgroundJobSchedulerHostedService : IHostedService
+    {
+        public BackgroundJobSchedulerHostedService(IBackgroundJobClient backgroundJobClient)
+        {
+            BackgroundJobClient = (BackgroundJobClient)backgroundJobClient;
+        }
+
+        public BackgroundJobClient BackgroundJobClient { get; }
+
+        Task _Loop;
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            _Stop = new CancellationTokenSource();
+            _Loop = BackgroundJobClient.ProcessJobs(_Stop.Token);
+            return Task.CompletedTask;
+        }
+
+        CancellationTokenSource _Stop;
+
+        public async Task StopAsync(CancellationToken cancellationToken)
+        {
+            _Stop.Cancel();
+            try
+            {
+                await _Loop;
+            }
+            catch (OperationCanceledException)
+            {
+
+            }
+            await BackgroundJobClient.WaitAllRunning(cancellationToken);
+        }
+    }
+
+    public class BackgroundJobClient : IBackgroundJobClient
+    {
+        class BackgroundJob
+        {
+            public Func<Task> Action;
+            public TimeSpan Delay;
+            public IDelay DelayImplementation;
+            public BackgroundJob(Func<Task> action, TimeSpan delay, IDelay delayImplementation)
+            {
+                this.Action = action;
+                this.Delay = delay;
+                this.DelayImplementation = delayImplementation;
+            }
+
+            public async Task Run(CancellationToken cancellationToken)
+            {
+                await DelayImplementation.Wait(Delay, cancellationToken);
+                await Action();
+            }
+        }
+
+        public IDelay Delay { get; set; } = TaskDelay.Instance;
+        public int GetExecutingCount()
+        {
+            lock (_Processing)
+            {
+                return _Processing.Count();
+            }
+        }
+
+        private Channel<BackgroundJob> _Jobs = Channel.CreateUnbounded<BackgroundJob>();
+        HashSet<Task> _Processing = new HashSet<Task>();
+        public void Schedule(Func<Task> action, TimeSpan delay)
+        {
+            _Jobs.Writer.TryWrite(new BackgroundJob(action, delay, Delay));
+        }
+
+        public async Task WaitAllRunning(CancellationToken cancellationToken)
+        {
+            Task[] processing = null;
+            lock (_Processing)
+            {
+                processing = _Processing.ToArray();
+            }
+
+            try
+            {
+                await Task.WhenAll(processing).WithCancellation(cancellationToken);
+            }
+            catch (Exception) when (cancellationToken.IsCancellationRequested)
+            {
+                throw;
+            }
+        }
+
+        public async Task ProcessJobs(CancellationToken cancellationToken)
+        {
+            while (await _Jobs.Reader.WaitToReadAsync(cancellationToken))
+            {
+                if (_Jobs.Reader.TryRead(out var job))
+                {
+                    var processing = job.Run(cancellationToken);
+                    lock (_Processing)
+                    {
+                        _Processing.Add(processing);
+                    }
+#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+                    processing.ContinueWith(t =>
+                    {
+                        if (t.IsFaulted)
+                        {
+                            Logs.PayServer.LogWarning(t.Exception, "Unhandled exception while job running");
+                        }
+                        lock (_Processing)
+                        {
+                            _Processing.Remove(processing);
+                        }
+                    }, default, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+                }
+            }
+        }
+    }
+}

BTCPayServer/HostedServices/InvoiceNotificationManager.cs

@@ -1,10 +1,7 @@
-using Hangfire;
-using Hangfire.Common;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Hangfire.Annotations;
 using System.Reflection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -21,6 +18,7 @@ using NBXplorer;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Payments;
 using BTCPayServer.Services.Mails;
+using BTCPayServer.Services;
 
 namespace BTCPayServer.HostedServices
 {
@@ -44,16 +42,11 @@ namespace BTCPayServer.HostedServices
             public string Message { get; set; }
         }
 
-        public ILogger Logger
-        {
-            get; set;
-        }
-
         IBackgroundJobClient _JobClient;
         EventAggregator _EventAggregator;
         InvoiceRepository _InvoiceRepository;
         BTCPayNetworkProvider _NetworkProvider;
-        IEmailSender _EmailSender;
+        private readonly EmailSenderFactory _EmailSenderFactory;
 
         public InvoiceNotificationManager(
             IBackgroundJobClient jobClient,
@@ -61,17 +54,16 @@ namespace BTCPayServer.HostedServices
             InvoiceRepository invoiceRepository,
             BTCPayNetworkProvider networkProvider,
             ILogger<InvoiceNotificationManager> logger,
-            IEmailSender emailSender)
+            EmailSenderFactory emailSenderFactory)
         {
-            Logger = logger as ILogger ?? NullLogger.Instance;
             _JobClient = jobClient;
             _EventAggregator = eventAggregator;
             _InvoiceRepository = invoiceRepository;
             _NetworkProvider = networkProvider;
-            _EmailSender = emailSender;
+            _EmailSenderFactory = emailSenderFactory;
         }
 
-        async Task Notify(InvoiceEntity invoice, int? eventCode = null, string name = null)
+        void Notify(InvoiceEntity invoice, int? eventCode = null, string name = null)
         {
             CancellationTokenSource cts = new CancellationTokenSource(10000);
 
@@ -85,58 +77,31 @@ namespace BTCPayServer.HostedServices
                     invoice.StoreId
                 };
                 // TODO: Consider adding info on ItemDesc and payment info (amount)
-
+                
                 var emailBody = NBitcoin.JsonConverters.Serializer.ToString(ipn);
-                await _EmailSender.SendEmailAsync(
-                    invoice.NotificationEmail, $"BtcPayServer Invoice Notification - ${invoice.StoreId}", emailBody);
-            }
 
-            try
-            {
-                if (string.IsNullOrEmpty(invoice.NotificationURL))
-                    return;
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name));
-                var response = await SendNotification(invoice, eventCode, name, cts.Token);
-                response.EnsureSuccessStatusCode();
+                _EmailSenderFactory.GetEmailSender(invoice.StoreId).SendEmail(
+                    invoice.NotificationEmail,
+                    $"BtcPayServer Invoice Notification - ${invoice.StoreId}",
+                    emailBody);
+
+            }
+            if (string.IsNullOrEmpty(invoice.NotificationURL))
                 return;
-            }
-            catch (OperationCanceledException) when (cts.IsCancellationRequested)
-            {
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name)
-                {
-                    Error = "Timeout"
-                });
-            }
-            catch (Exception ex) // It fails, it is OK because we try with hangfire after
-            {
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name)
-                {
-                    Error = ex.Message
-                });
-            }
             var invoiceStr = NBitcoin.JsonConverters.Serializer.ToString(new ScheduledJob() { TryCount = 0, Invoice = invoice, EventCode = eventCode, Message = name });
             if (!string.IsNullOrEmpty(invoice.NotificationURL))
                 _JobClient.Schedule(() => NotifyHttp(invoiceStr), TimeSpan.Zero);
         }
 
-        ConcurrentDictionary<string, string> _Executing = new ConcurrentDictionary<string, string>();
         public async Task NotifyHttp(string invoiceData)
         {
             var job = NBitcoin.JsonConverters.Serializer.ToObject<ScheduledJob>(invoiceData);
-            var jobId = GetHttpJobId(job.Invoice);
-
-            if (!_Executing.TryAdd(jobId, jobId))
-                return; //For some reason, Hangfire fire the job several time
-
-            Logger.LogInformation("Running " + jobId);
             bool reschedule = false;
             CancellationTokenSource cts = new CancellationTokenSource(10000);
             try
             {
                 HttpResponseMessage response = await SendNotification(job.Invoice, job.EventCode, job.Message, cts.Token);
                 reschedule = !response.IsSuccessStatusCode;
-                Logger.LogInformation("Job " + jobId + " returned " + response.StatusCode);
-
                 _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
                 {
                     Error = reschedule ? $"Unexpected return code: {(int)response.StatusCode}" : null
@@ -149,9 +114,8 @@ namespace BTCPayServer.HostedServices
                     Error = "Timeout"
                 });
                 reschedule = true;
-                Logger.LogInformation("Job " + jobId + " timed out");
             }
-            catch (Exception ex) // It fails, it is OK because we try with hangfire after
+            catch (Exception ex)
             {
                 _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
                 {
@@ -166,21 +130,18 @@ namespace BTCPayServer.HostedServices
                     ex = ex.InnerException;
                 }
                 string message = String.Join(',', messages.ToArray());
-                Logger.LogInformation("Job " + jobId + " threw exception " + message);
 
                 _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
                 {
                     Error = $"Unexpected error: {message}"
                 });
             }
-            finally { cts.Dispose(); _Executing.TryRemove(jobId, out jobId); }
+            finally { cts?.Dispose(); }
 
             job.TryCount++;
 
             if (job.TryCount < MaxTry && reschedule)
             {
-                Logger.LogInformation("Rescheduling " + jobId + " in 10 minutes, remaining try " + (MaxTry - job.TryCount));
-
                 invoiceData = NBitcoin.JsonConverters.Serializer.ToString(job);
                 _JobClient.Schedule(() => NotifyHttp(invoiceData), TimeSpan.FromMinutes(10.0));
             }
@@ -320,11 +281,6 @@ namespace BTCPayServer.HostedServices
 
         int MaxTry = 6;
 
-        private static string GetHttpJobId(InvoiceEntity invoice)
-        {
-            return $"{invoice.Id}-{invoice.Status}-HTTP";
-        }
-
         CompositeDisposable leases = new CompositeDisposable();
         public Task StartAsync(CancellationToken cancellationToken)
         {
@@ -350,19 +306,18 @@ namespace BTCPayServer.HostedServices
                        e.Name == InvoiceEvent.Completed ||
                        e.Name == InvoiceEvent.ExpiredPaidPartial
                      )
-                        tasks.Add(Notify(invoice));
+                        Notify(invoice);
                 }
 
                 if (e.Name == "invoice_confirmed")
                 {
-                    tasks.Add(Notify(invoice));
+                    Notify(invoice);
                 }
 
                 if (invoice.ExtendedNotifications)
                 {
-                    tasks.Add(Notify(invoice, e.EventCode, e.Name));
+                    Notify(invoice, e.EventCode, e.Name);
                 }
-                await Task.WhenAll(tasks.ToArray());
             }));
 
 

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -11,7 +11,6 @@ using BTCPayServer.Logging;
 using System.Threading;
 using Microsoft.Extensions.Hosting;
 using System.Collections.Concurrent;
-using Hangfire;
 using BTCPayServer.Services.Wallets;
 using BTCPayServer.Controllers;
 using BTCPayServer.Events;

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -38,6 +38,7 @@ using BTCPayServer.Logging;
 using BTCPayServer.HostedServices;
 using Meziantou.AspNetCore.BundleTagHelpers;
 using System.Security.Claims;
+using BTCPayServer.Crowdfund;
 using BTCPayServer.Hubs;
 using BTCPayServer.Payments.Changelly;
 using BTCPayServer.Payments.Lightning;
@@ -116,7 +117,7 @@ namespace BTCPayServer.Hosting
             services.TryAddSingleton<CurrencyNameTable>();
             services.TryAddSingleton<IFeeProviderFactory>(o => new NBXplorerFeeProviderFactory(o.GetRequiredService<ExplorerClientProvider>())
             {
-                Fallback = new FeeRate(100, 1),
+                Fallback = new FeeRate(100L, 1),
                 BlockTarget = 20
             });
 
@@ -144,6 +145,8 @@ namespace BTCPayServer.Hosting
             services.AddSingleton<IHostedService, InvoiceNotificationManager>();
             services.AddSingleton<IHostedService, InvoiceWatcher>();
             services.AddSingleton<IHostedService, RatesHostedService>();
+            services.AddSingleton<IHostedService, BackgroundJobSchedulerHostedService>();
+            services.AddSingleton<IBackgroundJobClient, BackgroundJobClient>();
             services.AddTransient<IConfigureOptions<MvcOptions>, BTCPayClaimsFilter>();
 
             services.TryAddSingleton<ExplorerClientProvider>();
@@ -162,7 +165,7 @@ namespace BTCPayServer.Hosting
             services.AddTransient<InvoiceController>();
             services.AddTransient<AppsPublicController>();
             // Add application services.
-            services.AddTransient<IEmailSender, EmailSender>();
+            services.AddSingleton<EmailSenderFactory>();
             // bundling
 
             services.AddAuthorization(o => Policies.AddBTCPayPolicies(o));

BTCPayServer/Hosting/Startup.cs

@@ -19,7 +19,6 @@ using BTCPayServer.Models;
 using Microsoft.AspNetCore.Identity;
 using BTCPayServer.Data;
 using Microsoft.Extensions.Logging;
-using Hangfire;
 using BTCPayServer.Logging;
 using Microsoft.AspNetCore.Authorization;
 using System.Threading.Tasks;
@@ -27,11 +26,8 @@ using BTCPayServer.Controllers;
 using BTCPayServer.Services.Stores;
 using BTCPayServer.Services.Mails;
 using Microsoft.Extensions.Configuration;
-using Hangfire.AspNetCore;
 using BTCPayServer.Configuration;
 using System.IO;
-using Hangfire.Dashboard;
-using Hangfire.Annotations;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System.Threading;
 using Microsoft.Extensions.Options;
@@ -46,18 +42,6 @@ namespace BTCPayServer.Hosting
 {
     public class Startup
     {
-        class NeedRole : IDashboardAuthorizationFilter
-        {
-            string _Role;
-            public NeedRole(string role)
-            {
-                _Role = role;
-            }
-            public bool Authorize([NotNull] DashboardContext context)
-            {
-                return context.GetHttpContext().User.IsInRole(_Role);
-            }
-        }
         public Startup(IConfiguration conf, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
             Configuration = conf;
@@ -108,13 +92,6 @@ namespace BTCPayServer.Hosting
                 options.Lockout.MaxFailedAccessAttempts = 5;
                 options.Lockout.AllowedForNewUsers = true;
             });
-
-            services.AddHangfire((o) =>
-            {
-                var scope = AspNetCoreJobActivator.Current.BeginScope(null);
-                var options = (ApplicationDbContextFactory)scope.Resolve(typeof(ApplicationDbContextFactory));
-                options.ConfigureHangfireBuilder(o);
-            });
             services.AddCors(o =>
             {
                 o.AddPolicy("BitpayAPI", b =>
@@ -193,12 +170,6 @@ namespace BTCPayServer.Hosting
             app.UsePayServer();
             app.UseStaticFiles();
             app.UseAuthentication();
-            app.UseHangfireServer();
-            app.UseHangfireDashboard("/hangfire", new DashboardOptions()
-            {
-                AppPath = options.GetRootUri(),
-                Authorization = new[] { new NeedRole(Roles.ServerAdmin) }
-            });
             app.UseSignalR(route =>
             {
                 route.MapHub<CrowdfundHub>("/apps/crowdfund/hub");

BTCPayServer/IDelay.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BTCPayServer
+{
+    public interface IDelay
+    {
+        Task Wait(TimeSpan delay, CancellationToken cancellationToken);
+    }
+
+    public class TaskDelay : IDelay
+    {
+        TaskDelay()
+        {
+
+        }
+        private static readonly TaskDelay _Instance = new TaskDelay();
+        public static TaskDelay Instance
+        {
+            get
+            {
+                return _Instance;
+            }
+        }
+        public Task Wait(TimeSpan delay, CancellationToken cancellationToken)
+        {
+            return Task.Delay(delay, cancellationToken);
+        }
+    }
+}

BTCPayServer/Models/InvoiceResponse.cs

@@ -90,6 +90,12 @@ namespace BTCPayServer.Models
             get; set;
         }
 
+        [JsonProperty("taxIncluded", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public decimal TaxIncluded
+        {
+            get; set;
+        }
+
         //"currency":"USD"
         [JsonProperty("currency")]
         public string Currency

BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs

@@ -143,6 +143,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public DateTimeOffset MonitoringDate { get; internal set; }
         public List<Data.InvoiceEventData> Events { get; internal set; }
         public string NotificationEmail { get; internal set; }
-        public Dictionary<string, string> PosData { get; set; }
+        public Dictionary<string, object> PosData { get; set; }
     }
 }

BTCPayServer/Models/InvoicingModels/InvoicesModel.cs

@@ -15,6 +15,10 @@ namespace BTCPayServer.Models.InvoicingModels
         {
             get; set;
         }
+        public int Total
+        {
+            get; set;
+        }
         public string SearchTerm
         {
             get; set;

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -24,7 +24,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public bool IsModal { get; set; }
         public bool IsLightning { get; set; }
         public string CryptoCode { get; set; }
-        public string ServerUrl { get; set; }
         public string InvoiceId { get; set; }
         public string BtcAddress { get; set; }
         public string BtcDue { get; set; }

BTCPayServer/Models/StoreViewModels/TokensViewModel.cs

@@ -72,5 +72,6 @@ namespace BTCPayServer.Models.StoreViewModels
         [Display(Name = "API Key")]
         public string ApiKey { get; set; }
         public string EncodedApiKey { get; set; }
+        public bool StoreNotConfigured { get; set; }
     }
 }

BTCPayServer/Models/WalletViewModels/WalletSendLedgerModel.cs

@@ -11,5 +11,6 @@ namespace BTCPayServer.Models.WalletViewModels
         public bool SubstractFees { get; set; }
         public decimal Amount { get; set; }
         public string Destination { get; set; }
+        public bool NoChange { get; set; }
     }
 }

BTCPayServer/Models/WalletViewModels/WalletSendModel.cs

@@ -28,6 +28,10 @@ namespace BTCPayServer.Models.WalletViewModels
         [Display(Name = "Fee rate (satoshi per byte)")]
         [Required]
         public int FeeSatoshiPerByte { get; set; }
+
+        [Display(Name = "Make sure no change UTXO is created")]
+        public bool NoChange { get; set; }
+        public bool AdvancedMode { get; set; }
         public decimal? Rate { get; set; }
         public int Divisibility { get; set; }
         public string Fiat { get; set; }

BTCPayServer/Payments/Lightning/LightningLikePaymentData.cs

@@ -7,6 +7,7 @@ using BTCPayServer.Lightning;
 using BTCPayServer.Lightning.JsonConverters;
 using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Services.Invoices;
+using NBitcoin;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Payments.Lightning
@@ -16,17 +17,21 @@ namespace BTCPayServer.Payments.Lightning
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
         public string BOLT11 { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.UInt256JsonConverter))]
+        public uint256 PaymentHash { get; set; }
 
         public string GetDestination(BTCPayNetwork network)
         {
-            return GetPaymentId();
+            return BOLT11;
         }
 
         public decimal NetworkFee { get; set; }
 
+
         public string GetPaymentId()
         {
-            return BOLT11;
+            // Legacy, some old payments don't have the PaymentHash set
+            return PaymentHash?.ToString() ?? BOLT11;
         }
 
         public PaymentTypes GetPaymentType()

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -47,7 +47,7 @@ namespace BTCPayServer.Payments.Lightning
                 }
                 catch (OperationCanceledException) when (cts.IsCancellationRequested)
                 {
-                    throw new PaymentMethodUnavailableException($"The lightning node did not replied in a timely maner");
+                    throw new PaymentMethodUnavailableException($"The lightning node did not reply in a timely maner");
                 }
                 catch (Exception ex)
                 {
@@ -78,7 +78,7 @@ namespace BTCPayServer.Payments.Lightning
                 }
                 catch (OperationCanceledException) when (cts.IsCancellationRequested)
                 {
-                    throw new PaymentMethodUnavailableException($"The lightning node did not replied in a timely manner");
+                    throw new PaymentMethodUnavailableException($"The lightning node did not reply in a timely manner");
                 }
                 catch (Exception ex)
                 {
@@ -115,7 +115,7 @@ namespace BTCPayServer.Payments.Lightning
                 }
 
                 if (address == null)
-                    throw new PaymentMethodUnavailableException($"DNS did not resolved {nodeInfo.Host}");
+                    throw new PaymentMethodUnavailableException($"DNS did not resolve {nodeInfo.Host}");
 
                 using (var tcp = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp))
                 {

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -191,6 +191,7 @@ namespace BTCPayServer.Payments.Lightning
             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)

BTCPayServer/Security/BitpayAuthentication.cs

@@ -198,44 +198,6 @@ namespace BTCPayServer.Security
                 }
                 yield return token;
             }
-
-            private bool IsBitpayAPI(HttpContext httpContext, bool bitpayAuth)
-            {
-                if (!httpContext.Request.Path.HasValue)
-                    return false;
-
-                var isJson = (httpContext.Request.ContentType ?? string.Empty).StartsWith("application/json", StringComparison.OrdinalIgnoreCase);
-                var path = httpContext.Request.Path.Value;
-                if (
-                    bitpayAuth &&
-                    (path == "/invoices" || path == "/invoices/") &&
-                  httpContext.Request.Method == "POST" &&
-                  isJson)
-                    return true;
-
-                if (
-                    bitpayAuth &&
-                    (path == "/invoices" || path == "/invoices/") &&
-                  httpContext.Request.Method == "GET")
-                    return true;
-
-                if (
-                    path.StartsWith("/invoices/", StringComparison.OrdinalIgnoreCase) &&
-                    httpContext.Request.Method == "GET" &&
-                    (isJson || httpContext.Request.Query.ContainsKey("token")))
-                    return true;
-
-                if (path.Equals("/rates", StringComparison.OrdinalIgnoreCase) &&
-                    httpContext.Request.Method == "GET")
-                    return true;
-
-                if (
-                    path.Equals("/tokens", StringComparison.Ordinal) &&
-                    (httpContext.Request.Method == "GET" || httpContext.Request.Method == "POST"))
-                    return true;
-
-                return false;
-            }
         }
         internal static void AddAuthentication(IServiceCollection services, Action<BitpayAuthOptions> bitpayAuth = null)
         {

BTCPayServer/Services/IBackgroundJobClient.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services
+{
+    public interface IBackgroundJobClient
+    {
+        void Schedule(Func<Task> act, TimeSpan zero);
+    }
+}

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -91,6 +91,12 @@ namespace BTCPayServer.Services.Invoices
             get; set;
         }
 
+        [JsonProperty(PropertyName = "taxIncluded", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public decimal TaxIncluded
+        {
+            get; set;
+        }
+
         [JsonProperty(PropertyName = "currency")]
         public string Currency
         {

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -178,7 +178,6 @@ retry:
             textSearch.Add(invoice.StoreId);
 
             AddToTextSearch(invoice.Id, textSearch.ToArray());
-
             return invoice;
         }
 
@@ -420,91 +419,108 @@ retry:
             return entity;
         }
 
+        private IQueryable<Data.InvoiceData> GetInvoiceQuery(ApplicationDbContext context, InvoiceQuery queryObject)
+        {
+            IQueryable<Data.InvoiceData> query = context.Invoices;
+
+            if (!string.IsNullOrEmpty(queryObject.InvoiceId))
+            {
+                query = query.Where(i => i.Id == queryObject.InvoiceId);
+            }
+
+            if (queryObject.StoreId != null && queryObject.StoreId.Length > 0)
+            {
+                var stores = queryObject.StoreId.ToHashSet();
+                query = query.Where(i => stores.Contains(i.StoreDataId));
+            }
+
+            if (queryObject.UserId != null)
+            {
+                query = query.Where(i => i.StoreData.UserStores.Any(u => u.ApplicationUserId == queryObject.UserId));
+            }
+
+            if (!string.IsNullOrEmpty(queryObject.TextSearch))
+            {
+                var ids = new HashSet<string>(SearchInvoice(queryObject.TextSearch));
+                if (ids.Count == 0)
+                {
+                    // Hacky way to return an empty query object. The nice way is much too elaborate:
+                    // https://stackoverflow.com/questions/33305495/how-to-return-empty-iqueryable-in-an-async-repository-method
+                    return query.Where(x => false); 
+                }
+                query = query.Where(i => ids.Contains(i.Id));
+            }
+
+            if (queryObject.StartDate != null)
+                query = query.Where(i => queryObject.StartDate.Value <= i.Created);
+
+            if (queryObject.EndDate != null)
+                query = query.Where(i => i.Created <= queryObject.EndDate.Value);
+
+            if (queryObject.OrderId != null && queryObject.OrderId.Length > 0)
+            {
+                var statusSet = queryObject.OrderId.ToHashSet();
+                query = query.Where(i => statusSet.Contains(i.OrderId));
+            }
+            if (queryObject.ItemCode != null && queryObject.ItemCode.Length > 0)
+            {
+                var statusSet = queryObject.ItemCode.ToHashSet();
+                query = query.Where(i => statusSet.Contains(i.ItemCode));
+            }
+
+            if (queryObject.Status != null && queryObject.Status.Length > 0)
+            {
+                var statusSet = queryObject.Status.ToHashSet();
+                query = query.Where(i => statusSet.Contains(i.Status));
+            }
+
+            if (queryObject.Unusual != null)
+            {
+                var unused = queryObject.Unusual.Value;
+                query = query.Where(i => unused == (i.Status == "invalid" || i.ExceptionStatus != null));
+            }
+
+            if (queryObject.ExceptionStatus != null && queryObject.ExceptionStatus.Length > 0)
+            {
+                var exceptionStatusSet = queryObject.ExceptionStatus.Select(s => NormalizeExceptionStatus(s)).ToHashSet();
+                query = query.Where(i => exceptionStatusSet.Contains(i.ExceptionStatus));
+            }
+
+            query = query.OrderByDescending(q => q.Created);
+
+            if (queryObject.Skip != null)
+                query = query.Skip(queryObject.Skip.Value);
+
+            if (queryObject.Count != null)
+                query = query.Take(queryObject.Count.Value);
+
+            return query;
+        }
+
+        public async Task<int> GetInvoicesTotal(InvoiceQuery queryObject)
+        {
+            using (var context = _ContextFactory.CreateContext())
+            {
+                var query = GetInvoiceQuery(context, queryObject);
+                return await query.CountAsync();
+            }
+        }
 
         public async Task<InvoiceEntity[]> GetInvoices(InvoiceQuery queryObject)
         {
             using (var context = _ContextFactory.CreateContext())
             {
-                IQueryable<Data.InvoiceData> query = context
-                    .Invoices
-                    .Include(o => o.Payments)
+                var query = GetInvoiceQuery(context, queryObject);
+                query = query.Include(o => o.Payments)
                     .Include(o => o.RefundAddresses);
                 if (queryObject.IncludeAddresses)
                     query = query.Include(o => o.HistoricalAddressInvoices).Include(o => o.AddressInvoices);
                 if (queryObject.IncludeEvents)
                     query = query.Include(o => o.Events);
-                if (!string.IsNullOrEmpty(queryObject.InvoiceId))
-                {
-                    query = query.Where(i => i.Id == queryObject.InvoiceId);
-                }
-
-                if (queryObject.StoreId != null && queryObject.StoreId.Length > 0)
-                {
-                    var stores = queryObject.StoreId.ToHashSet();
-                    query = query.Where(i => stores.Contains(i.StoreDataId));
-                }
-
-                if (queryObject.UserId != null)
-                {
-                    query = query.Where(i => i.StoreData.UserStores.Any(u => u.ApplicationUserId == queryObject.UserId));
-                }
-
-                if (!string.IsNullOrEmpty(queryObject.TextSearch))
-                {
-                    var ids = new HashSet<string>(SearchInvoice(queryObject.TextSearch));
-                    if (ids.Count == 0)
-                        return Array.Empty<InvoiceEntity>();
-                    query = query.Where(i => ids.Contains(i.Id));
-                }
-
-                if (queryObject.StartDate != null)
-                    query = query.Where(i => queryObject.StartDate.Value <= i.Created);
-
-                if (queryObject.EndDate != null)
-                    query = query.Where(i => i.Created <= queryObject.EndDate.Value);
-
-                if (queryObject.OrderId != null && queryObject.OrderId.Length > 0)
-                {
-                    var statusSet = queryObject.OrderId.ToHashSet();
-                    query = query.Where(i => statusSet.Contains(i.OrderId));
-                }
-                if (queryObject.ItemCode != null && queryObject.ItemCode.Length > 0)
-                {
-                    var statusSet = queryObject.ItemCode.ToHashSet();
-                    query = query.Where(i => statusSet.Contains(i.ItemCode));
-                }
-
-                if (queryObject.Status != null && queryObject.Status.Length > 0)
-                {
-                    var statusSet = queryObject.Status.ToHashSet();
-                    query = query.Where(i => statusSet.Contains(i.Status));
-                }
-
-                if (queryObject.Unusual != null)
-                {
-                    var unused = queryObject.Unusual.Value;
-                    query = query.Where(i => unused == (i.Status == "invalid" || i.ExceptionStatus != null));
-                }
-
-                if (queryObject.ExceptionStatus != null && queryObject.ExceptionStatus.Length > 0)
-                {
-                    var exceptionStatusSet = queryObject.ExceptionStatus.Select(s => NormalizeExceptionStatus(s)).ToHashSet();
-                    query = query.Where(i => exceptionStatusSet.Contains(i.ExceptionStatus));
-                }
-
-                query = query.OrderByDescending(q => q.Created);
-
-                if (queryObject.Skip != null)
-                    query = query.Skip(queryObject.Skip.Value);
-
-                if (queryObject.Count != null)
-                    query = query.Take(queryObject.Count.Value);
 
                 var data = await query.ToArrayAsync().ConfigureAwait(false);
-
                 return data.Select(ToEntity).ToArray();
             }
-
         }
 
         private string NormalizeExceptionStatus(string status)

BTCPayServer/Services/Mails/EmailSender.cs

@@ -1,48 +1,40 @@
 using BTCPayServer.Logging;
 using Microsoft.Extensions.Logging;
-using Hangfire;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Mail;
 using System.Threading.Tasks;
 
 namespace BTCPayServer.Services.Mails
 {
-    // This class is used by the application to send email for account confirmation and password reset.
-    // For more details see https://go.microsoft.com/fwlink/?LinkID=532713
-    public class EmailSender : IEmailSender
+    public abstract class EmailSender : IEmailSender
     {
         IBackgroundJobClient _JobClient;
-        SettingsRepository _Repository;
-        public EmailSender(IBackgroundJobClient jobClient, SettingsRepository repository)
+
+        public EmailSender(IBackgroundJobClient jobClient)
         {
-            if (jobClient == null)
-                throw new ArgumentNullException(nameof(jobClient));
-            _JobClient = jobClient;
-            _Repository = repository;
-        }
-        public async Task SendEmailAsync(string email, string subject, string message)
-        {
-            var settings = await _Repository.GetSettingAsync<EmailSettings>() ?? new EmailSettings();
-            if (!settings.IsComplete())
-            {
-                Logs.Configuration.LogWarning("Should have sent email, but email settings are not configured");
-                return;
-            }
-            _JobClient.Schedule(() => SendMailCore(email, subject, message), TimeSpan.Zero);
-            return;
+            _JobClient = jobClient ?? throw new ArgumentNullException(nameof(jobClient));
         }
 
-        public async Task SendMailCore(string email, string subject, string message)
+        public void SendEmail(string email, string subject, string message)
         {
-            var settings = await _Repository.GetSettingAsync<EmailSettings>() ?? new EmailSettings();
-            if (!settings.IsComplete())
-                throw new InvalidOperationException("Email settings not configured");
-            var smtp = settings.CreateSmtpClient();
-            MailMessage mail = new MailMessage(settings.From, email, subject, message);
-            mail.IsBodyHtml = true;
-            await smtp.SendMailAsync(mail);
+            _JobClient.Schedule(async () =>
+            {
+                var emailSettings = await GetEmailSettings();
+                if (emailSettings?.IsComplete() != true)
+                {
+                    Logs.Configuration.LogWarning("Should have sent email, but email settings are not configured");
+                    return;
+                }
+                var smtp = emailSettings.CreateSmtpClient();
+                var mail = new MailMessage(emailSettings.From, email, subject, message)
+                {
+                    IsBodyHtml = true
+                };
+                await smtp.SendMailAsync(mail);
+
+           }, TimeSpan.Zero);
         }
+
+        public abstract Task<EmailSettings> GetEmailSettings();
     }
 }

BTCPayServer/Services/Mails/EmailSenderFactory.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Concurrent;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Stores;
+
+namespace BTCPayServer.Services.Mails
+{
+    public class EmailSenderFactory
+    {
+        private readonly IBackgroundJobClient _JobClient;
+        private readonly SettingsRepository _Repository;
+        private readonly StoreRepository _StoreRepository;
+
+        public EmailSenderFactory(IBackgroundJobClient jobClient,
+            SettingsRepository repository,
+            StoreRepository storeRepository)
+        {
+            _JobClient = jobClient;
+            _Repository = repository;
+            _StoreRepository = storeRepository;
+        }
+
+        public IEmailSender GetEmailSender(string storeId = null)
+        {
+            var serverSender = new ServerEmailSender(_Repository, _JobClient);
+            if (string.IsNullOrEmpty(storeId))
+                return serverSender;
+            return new StoreEmailSender(_StoreRepository, serverSender, _JobClient, storeId);
+        }
+    }
+}

BTCPayServer/Services/Mails/IEmailSender.cs

@@ -7,6 +7,6 @@ namespace BTCPayServer.Services.Mails
 {
     public interface IEmailSender
     {
-        Task SendEmailAsync(string email, string subject, string message);
+        void SendEmail(string email, string subject, string message);
     }
 }

BTCPayServer/Services/Mails/ServerEmailSender.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services.Mails
+{
+    class ServerEmailSender : EmailSender
+    {
+        public ServerEmailSender(SettingsRepository settingsRepository,
+                                IBackgroundJobClient backgroundJobClient) : base(backgroundJobClient)
+        {
+            if (settingsRepository == null)
+                throw new ArgumentNullException(nameof(settingsRepository));
+            SettingsRepository = settingsRepository;
+        }
+
+        public SettingsRepository SettingsRepository { get; }
+
+        public override Task<EmailSettings> GetEmailSettings()
+        {
+            return SettingsRepository.GetSettingAsync<EmailSettings>();
+        }
+    }
+}

BTCPayServer/Services/Mails/StoreEmailSender.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Stores;
+
+namespace BTCPayServer.Services.Mails
+{
+    class StoreEmailSender : EmailSender
+    {
+        public StoreEmailSender(StoreRepository storeRepository,
+                                EmailSender fallback,
+                                IBackgroundJobClient backgroundJobClient,
+                                string storeId) : base(backgroundJobClient)
+        {
+            if (storeId == null)
+                throw new ArgumentNullException(nameof(storeId));
+            StoreRepository = storeRepository;
+            FallbackSender = fallback;
+            StoreId = storeId;
+        }
+
+        public StoreRepository StoreRepository { get; }
+        public EmailSender FallbackSender { get; }
+        public string StoreId { get; }
+
+        public override async Task<EmailSettings> GetEmailSettings()
+        {
+            var store = await StoreRepository.FindStore(StoreId);
+            var emailSettings = store.GetStoreBlob().EmailSettings;
+            if (emailSettings?.IsComplete() == true)
+            {
+                return emailSettings;
+            }
+            return await FallbackSender.GetEmailSettings();
+        }
+    }
+}

BTCPayServer/Services/Rates/RateProviderFactory.cs

@@ -104,7 +104,8 @@ namespace BTCPayServer.Services.Rates
             Providers.Add("hitbtc", new ExchangeSharpRateProvider("hitbtc", new ExchangeHitbtcAPI(), false));
 
             // Cryptopia is often not available
-            Providers.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
+            // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
+            // Providers.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
 
             // Handmade providers
             Providers.Add(QuadrigacxRateProvider.QuadrigacxName, new QuadrigacxRateProvider());

BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml

@@ -1,4 +1,5 @@
-@using BTCPayServer.Hubs
+@using BTCPayServer.Crowdfund
+@using BTCPayServer.Hubs
 @addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
 @model UpdateCrowdfundViewModel
 @{

BTCPayServer/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml

@@ -1,41 +1,48 @@
 <div class="container p-0" id="app" v-cloak>
     <div class="row h-100 w-100 py-sm-0 py-md-4 mx-0">
         <div class="card w-100 p-0 mx-0">
-            <img class="card-img-top" :src="srvModel.mainImageUrl" v-if="srvModel.mainImageUrl">
-            <div class="d-flex justify-content-between px-2">
+            <img class="card-img-top" :src="srvModel.mainImageUrl" v-if="srvModel.mainImageUrl" id="crowdfund-main-image">
+            <div class="d-flex justify-content-between px-2" id="crowdfund-header-container">
                 <h1>
-                    {{srvModel.title}}
-                    <span class="h6 text-muted" v-if="!started && srvModel.startDate" v-b-tooltip :title="startDate">
+                    {{srvModel.title}} 
+                    <span class="h6 text-muted" v-if="!started && srvModel.startDate" v-b-tooltip :title="startDate" id="crowdfund-header-start-date">
                         Starts {{startDateRelativeTime}}
                     </span>
-                    <span class="h6 text-muted" v-else-if="started && !ended && srvModel.endDate" v-b-tooltip :title="endDate">
+                    <span class="h6 text-muted" v-else-if="started && !ended && srvModel.endDate" v-b-tooltip :title="endDate" id="crowdfund-header-end-date">
                         Ends {{endDateRelativeTime}}
                     </span>
-                    <span class="h6 text-muted" v-else-if="started && !ended && !srvModel.endDate" v-b-tooltip title="No set end date">
+                    <span class="h6 text-muted" v-else-if="started && !ended && !srvModel.endDate" v-b-tooltip title="No set end date" id="crowdfund-header-active">
                         Currently Active!
                     </span>
 
                 </h1>
 
-                <span v-if="srvModel.targetAmount" class="mt-3">
-                    <span class="h5">{{srvModel.targetAmount}} {{targetCurrency}}</span>
-                    <span v-if="srvModel.resetEvery !== 'Never'" v-b-tooltip 
+                <span v-if="srvModel.targetAmount" class="mt-3" id="crowdfund-header-target">
+                    <span class="h5" id="crowdfund-header-target-amount">{{srvModel.targetAmount}} {{targetCurrency}}</span>
+                    <span v-if="srvModel.resetEvery !== 'Never'" 
+                          id="crowdfund-header-target-dynamic"
+                          v-b-tooltip 
                           :title="'Goal resets every ' + srvModel.resetEveryAmount + ' ' + srvModel.resetEvery + ((srvModel.resetEveryAmount>1)?'s': '')"  >Dynamic </span>
-                    <span v-if="srvModel.enforceTargetAmount">Hardcap Goal <span class="fa fa-question-circle" v-b-tooltip title="No contributions allowed after the goal has been reached"></span></span>
-                    <span v-else>Softcap Goal <span class="fa fa-question-circle" v-b-tooltip title="Contributions allowed even after goal is reached"></span> </span>
+                    <span v-if="srvModel.enforceTargetAmount" 
+                          id="crowdfund-header-target-softcap">Hardcap Goal <span class="fa fa-question-circle" v-b-tooltip title="No contributions allowed after the goal has been reached"></span></span>
+                    <span v-else 
+                          id="crowdfund-header-target-hardcap">Softcap Goal <span class="fa fa-question-circle" v-b-tooltip title="Contributions allowed even after goal is reached"></span> </span>
                 </span>
 
 
             </div>
-            <div class="progress w-100 rounded-0 " v-if="srvModel.targetAmount">
+            <div class="progress w-100 rounded-0 " v-if="srvModel.targetAmount" 
+                 id="crowdfund-progress-bar">
                 <div class="progress-bar" role="progressbar"
                      :aria-valuenow="srvModel.info.progressPercentage"
                      v-bind:style="{ width: srvModel.info.progressPercentage + '%' }"
                      aria-valuemin="0"
+                     id="crowdfund-progress-bar-confirmed-bar"
                      v-b-tooltip :title="parseFloat(srvModel.info.progressPercentage).toFixed(2) + '% contributions'"
                      aria-valuemax="100">
                 </div>
                 <div class="progress-bar bg-warning" role="progressbar"
+                     id="crowdfund-progress-bar-pending-bar"
                      :aria-valuenow="srvModel.info.pendingProgressPercentage"
                      v-bind:style="{ width: srvModel.info.pendingProgressPercentage + '%' }"
                      v-b-tooltip :title="parseFloat(srvModel.info.pendingProgressPercentage).toFixed(2) + '% contributions pending confirmation'"
@@ -45,29 +52,27 @@
             </div>
            
             <div class="card-body">
-                
-
                 <div class="row py-2 text-center">
-                    <div class="col-sm border-right" id="raised-amount">
+                    <div class="col-sm border-right" id="crowdfund-body-raised-amount">
                         <h5>{{ raisedAmount }} {{targetCurrency}} </h5>
                         <h5 class="text-muted">Raised</h5>
                     </div>
-                    <div  class="col-sm  border-right" id="goal-raised">
+                    <div  class="col-sm  border-right" id="crowdfund-body-goal-raised">
                         <h5>{{ percentageRaisedAmount }}%</h5>
                         <h5 class="text-muted">Of Goal</h5>
                     </div>
-                    <div  class="col-sm  border-right">
+                    <div  class="col-sm  border-right" id="crowdfund-body-total-contributors">
                         <h5>
                             {{srvModel.info.totalContributors}}
                         </h5>
                         <h5 class="text-muted">Contributors</h5>
                     </div> 
-                    <div  class="col-sm" v-if="endDiff" id="campaign-dates-started">
+                    <div  class="col-sm" v-if="endDiff" id="crowdfund-body-campaign-dates-started">
                         <h5>
                             {{endDiff}}
                         </h5>
                         <h5 class="text-muted">Left</h5>
-                        <b-tooltip target="campaign-dates-started" >
+                        <b-tooltip target="crowdfund-body-campaign-dates-started" >
                             <ul class="p-0">
                                 <li v-if="startDate" class="list-unstyled">
                                     {{started? "Started" : "Starts"}} {{startDate}}
@@ -78,13 +83,13 @@
                             </ul>
                         </b-tooltip>
                     </div>
-                    <div  class="col-sm" v-if="startDiff" id="campaign-dates-not-started">
+                    <div  class="col-sm" v-if="startDiff" id="crowdfund-body-campaign-dates-not-started">
                         <h5>
                             {{startDiff}}
                         </h5>
                         <h5 class="text-muted">Left to start</h5>
                         
-                        <b-tooltip target="campaign-dates-ended" >
+                        <b-tooltip target="crowdfund-body-campaign-dates-not-started" >
                             <ul class="p-0">
                                 <li v-if="startDate" class="list-unstyled">
                                     {{started? "Started" : "Starts"}} {{startDate}}
@@ -95,13 +100,13 @@
                             </ul>
                         </b-tooltip>
                     </div>
-                    <div  class="col-sm" v-if="ended" id="campaign-dates-ended">
+                    <div  class="col-sm" v-if="ended" id="crowdfund-body-campaign-dates-not-active">
                         <h5>
                             Campaign
                         </h5>
                         <h5 >not active</h5>
                         
-                        <b-tooltip target="campaign-dates-not-started" >
+                        <b-tooltip target="crowdfund-body-campaign-dates-not-active" >
                             <ul class="p-0">
                                 <li v-if="startDate" class="list-unstyled">
                                     {{started? "Started" : "Starts"}} {{startDate}}
@@ -111,14 +116,10 @@
                                 </li>
                             </ul>
                         </b-tooltip>
-                        
-                       
-                        
-                     
                     </div>
                 </div>
                 
-                <b-tooltip target="raised-amount" v-if="paymentStats && paymentStats.length > 0">
+                <b-tooltip target="crowdfund-body-raised-amount" v-if="paymentStats && paymentStats.length > 0">
                     <ul class="p-0 text-uppercase">
                         <li v-for="stat of paymentStats" class="list-unstyled">
                             
@@ -126,37 +127,34 @@
                         </li>
                     </ul>
                 </b-tooltip>      
-                <b-tooltip target="goal-raised"  v-if="srvModel.resetEvery !== 'Never'">
+                <b-tooltip target="crowdfund-body-goal-raised"  v-if="srvModel.resetEvery !== 'Never'">
                     Goal resets every {{srvModel.resetEveryAmount}} {{srvModel.resetEvery}} {{srvModel.resetEveryAmount>1?'s': ''}}
                 </b-tooltip>
                 
                
-                <div class="card-title">
+                <div class="card-title" id="crowdfund-body-header">
 
                     <div class="row">
-                        <div class="col-sm-12 col-md-8 col-lg-9">
-
-
-                            <h2 class="text-muted" v-if="srvModel.tagline">{{srvModel.tagline}}</h2>
+                        <div class="col-sm-12 col-md-8 col-lg-9" id="crowdfund-body-header-tagline-container">
+                            <h2 class="text-muted" v-if="srvModel.tagline" id="crowdfund-body-header-tagline">{{srvModel.tagline}}</h2>
                         </div>
-                        <div class="col-sm-12 col-md-4 col-lg-3">
-                            <button v-if="active" class="btn btn-lg btn-primary w-100 font-weight-bold" v-on:click="contributeModalOpen = true">Contribute</button>
-
-
+                        <div class="col-sm-12 col-md-4 col-lg-3" id="crowdfund-body-header-cta-container">
+                            <button v-if="active" id="crowdfund-body-header-cta" class="btn btn-lg btn-primary w-100 font-weight-bold" v-on:click="contributeModalOpen = true">Contribute</button>
                         </div>
                     </div>
                 </div>
                 <template v-if="srvModel.disqusEnabled">
                     <b-tabs>
                         <b-tab title="Details"active>
-                            <div class="row ">
-                                <div class="col-md-8 col-sm-12">
-                                    <div class="card-text overflow-hidden" v-html="srvModel.description"></div>
+                            <div class="row mt-2">
+                                <div class="col-md-8 col-sm-12" id="crowdfund-body-description-container">
+                                    <div class="card-text overflow-hidden" v-html="srvModel.description" id="crowdfund-body-description"></div>
                                 </div>
-                                <div class="col-md-4 col-sm-12">
+                                <div class="col-md-4 col-sm-12" id="crowdfund-body-contribution-container">
                                     <contribute :target-currency="srvModel.targetCurrency"
                                                 :display-perks-ranking="srvModel.displayPerksRanking"
                                                 :active="active"
+                                                :loading="loading"
                                                 :in-modal="false"
                                                 :perks="perks">
     
@@ -173,11 +171,12 @@
                 <template v-else>
                     <hr/>
                     <div class="row mt-2">
-                        <div class="col-md-8 col-sm-12">
-                            <div class="card-text overflow-hidden" v-html="srvModel.description"></div>
+                        <div class="col-md-8 col-sm-12" id="crowdfund-body-description-container">
+                            <div class="card-text overflow-hidden" v-html="srvModel.description" id="crowdfund-body-description"></div>
                         </div>
-                        <div class="col-md-4 col-sm-12">
+                        <div class="col-md-4 col-sm-12" id="crowdfund-body-contribution-container">
                             <contribute :target-currency="srvModel.targetCurrency"
+                                        :loading="loading"
                                         :display-perks-ranking="srvModel.displayPerksRanking"
                                         :active="active"
                                         :in-modal="false"
@@ -207,11 +206,11 @@
         </div>
     </div>
     <b-modal title="Contribute" v-model="contributeModalOpen" size="lg" ok-only="true" ok-variant="secondary" ok-title="Close" ref="modalContribute">
-
         <contribute v-if="contributeModalOpen"
                     :target-currency="srvModel.targetCurrency"
                     :active="active"
                     :perks="srvModel.perks"
+                    :loading="loading"
                     :in-modal="true">
         </contribute>
     </b-modal>
@@ -219,11 +218,20 @@
 </div>
 
 <script type="text/x-template" id="perks-template">
-<div>
-    <perk v-if="!perks || perks.length ===0" :perk="{title: 'Donate Custom Amount', price: { value: null}, custom: true}" :target-currency="targetCurrency" :active="active" 
+<div class="perks-container">
+    <perk v-if="!perks || perks.length ===0" 
+        :perk="{title: 'Donate Custom Amount', price: { value: null}, custom: true}" 
+        :target-currency="targetCurrency" 
+        :active="active" 
+        :loading="loading"
         :in-modal="inModal">
     </perk>
-    <perk v-for="(perk, index) in perks" :perk="perk" :target-currency="targetCurrency" :active="active" :display-perks-ranking="displayPerksRanking" :index="index"
+    <perk v-for="(perk, index) in perks" :perk="perk" :key="perk.id" 
+        :target-currency="targetCurrency" 
+        :active="active" 
+        :display-perks-ranking="displayPerksRanking" 
+        :index="index"
+        :loading="loading"
         :in-modal="inModal">
     </perk>
 </div>
@@ -276,8 +284,12 @@
                     <span class='input-group-text'>{{targetCurrency}}</span>
                     <button 
                         class="btn btn-primary" 
-                        :disabled="!active" 
+                        v-bind:class="{ 'btn-disabled': loading}"
+                        :disabled="!active || loading" 
                         type="submit">
+                         <div v-if="loading"  class="spinner-grow spinner-grow-sm"   role="status">
+                            <span class="sr-only">Loading...</span>
+                        </div>
                         Continue
                     </button>
                 </div>
@@ -297,6 +309,7 @@
     <h3 v-if="!inModal" class="mb-3">Contribute</h3>
     <perks 
         :perks="perks" 
+        :loading="loading"
         :in-modal="inModal"
         :display-perks-ranking="displayPerksRanking"
         :target-currency="targetCurrency" 

BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml

@@ -194,6 +194,7 @@
                 <div class="modal-footer bg-light">
                     <form method="post" asp-antiforgery="false" data-buy>
                         <input id="js-cart-amount" class="form-control" type="hidden" name="amount">
+                        <input id="js-cart-posdata" class="form-control" type="hidden" name="posdata">
                         <button id="js-cart-pay" class="btn btn-primary btn-lg" type="submit"><b>@Model.CustomButtonText</b></button>
                     </form>
                 </div>

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -387,10 +387,10 @@
                 </div>
                 <div class="success-message">{{$t("This invoice has been paid")}}</div>
                 <a class="action-button" :href="srvModel.merchantRefLink" v-show="!isModal">
-                    <span>{{$t("Return to StoreName", srvModel)}}</span>
+                    <span v-html="$t('Return to StoreName', srvModel)"></span>
                 </a>
                 <button class="action-button close-action" v-show="isModal">
-                    <span>{{$t("Return to StoreName", srvModel)}}</span>
+                    <span v-html="$t('Close')">{{$t("Return to StoreName", srvModel)}}</span>
                 </button>
             </div>
         </div>

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -157,6 +157,10 @@
                         <th>Price</th>
                         <td>@Model.ProductInformation.Price @Model.ProductInformation.Currency</td>
                     </tr>
+                    <tr>
+                        <th>Tax included</th>
+                        <td>@Model.ProductInformation.TaxIncluded @Model.ProductInformation.Currency</td>
+                    </tr>
                 </table>
             }
         </div>
@@ -180,28 +184,15 @@
                         <th>Price</th>
                         <td>@Model.ProductInformation.Price @Model.ProductInformation.Currency</td>
                     </tr>
+                    <tr>
+                        <th>Tax included</th>
+                        <td>@Model.ProductInformation.TaxIncluded @Model.ProductInformation.Currency</td>
+                    </tr>
                 </table>
             </div>
             <div class="col-md-6">
                 <h3>Point of Sale Data</h3>
-                <table class="table table-sm table-responsive-md">
-                    @foreach (var posDataItem in Model.PosData)
-                    {
-                        <tr>
-                            @if (!string.IsNullOrEmpty(posDataItem.Key))
-                            {
-
-                                <th>@posDataItem.Key</th>
-                                <td>@posDataItem.Value</td>
-                            }
-                            else
-                            {
-
-                                <td colspan="2">@posDataItem.Value</td>
-                            }
-                        </tr>
-                    }
-                </table>
+                <partial name="PosData" model="@Model.PosData"></partial>
             </div>
         </div>
     }

BTCPayServer/Views/Invoice/ListInvoices.cshtml

@@ -142,23 +142,31 @@
                     }
                 </tbody>
             </table>
-            <span>
-                @if (Model.Skip != 0)
-                {
-                    <a href="@Url.Action("ListInvoices", new
+
+            <nav aria-label="...">
+                <ul class="pagination">
+                    <li class="page-item  @(Model.Skip == 0 ? "disabled" : null)">
+                        <a class="page-link" tabindex="-1" href="@Url.Action("ListInvoices", new
                         {
                             searchTerm = Model.SearchTerm,
                             skip = Math.Max(0, Model.Skip - Model.Count),
                             count = Model.Count,
-                        })"><<</a><span> - </span>
-                }
-                <a href="@Url.Action("ListInvoices", new
-                    {
-                        searchTerm = Model.SearchTerm,
-                        skip = Model.Skip + Model.Count,
-                        count = Model.Count,
-                    })">>></a>
-            </span>
+                        })">Previous</a>
+                    </li>
+                    <li class="page-item disabled">
+                        <span class="page-link">@(Model.Skip + 1) to @(Model.Skip + Model.Invoices.Count) of @Model.Total</span>
+                    </li>
+                    <li class="page-item @(Model.Total > (Model.Skip + Model.Invoices.Count) ? null : "disabled")">
+                        <a class="page-link" href="@Url.Action("ListInvoices", new
+                        {
+                            searchTerm = Model.SearchTerm,
+                            skip = Model.Skip + Model.Count,
+                            count = Model.Count,
+                        })">Next</a>
+                    </li>
+                </ul>
+            </nav>
+
         </div>
 
     </div>

BTCPayServer/Views/Invoice/PosData.cshtml

@@ -0,0 +1,37 @@
+@model Dictionary<string, object>
+
+<table class="table table-sm table-responsive-md">
+    @foreach (var posDataItem in Model)
+    {
+        <tr>
+            @if (!string.IsNullOrEmpty(posDataItem.Key))
+            {
+                <th>@posDataItem.Key</th>
+                <td>
+                    @if (posDataItem.Value is string)
+                    {
+                        @posDataItem.Value
+                    }
+                    else
+                    {
+                        <partial name="PosData" model="@posDataItem.Value"/>
+                    }
+
+                </td>
+            }
+            else
+            {
+                <td colspan="2">
+                    @if (posDataItem.Value is string)
+                    {
+                        @posDataItem.Value
+                    }
+                    else
+                    {
+                        <partial name="PosData" model="@posDataItem.Value"/>
+                    }
+                </td>
+            }
+        </tr>
+    }
+</table>

BTCPayServer/Views/Server/ServerNavPages.cs

@@ -7,6 +7,6 @@ namespace BTCPayServer.Views.Server
 {
     public enum ServerNavPages
     {
-        Index, Users, Rates, Emails, Policies, Theme, Hangfire, Services, Maintenance, Logs
+        Index, Users, Rates, Emails, Policies, Theme, Services, Maintenance, Logs
     }
 }

BTCPayServer/Views/Server/_Nav.cshtml

@@ -7,6 +7,5 @@
     <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Theme)" asp-action="Theme">Theme</a>
     <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Maintenance)" asp-action="Maintenance">Maintenance</a>
     <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Logs)" asp-action="Logs">Logs</a>
-    <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Hangfire)" href="~/hangfire" target="_blank">Hangfire</a>
 </div>
 

BTCPayServer/Views/Stores/AddDerivationScheme.cshtml

@@ -38,12 +38,17 @@
                     </p>
                     <div id="ledger-info" class="form-text text-muted" style="display: none;">
                         <span>A ledger wallet is detected, which account do you want to use? No need to paste manually xpub if your ledger device was detected. Just select derivation scheme from the list bellow and xpub will automatically populate.</span>
-                        <ul>
-                            @for (int i = 0; i < 4; i++)
-                            {
-                                <li><a class="ledger-info-recommended" data-ledgerkeypath="@Model.RootKeyPath.Derive(i, true)" href="#">Account @i (<span>@Model.RootKeyPath.Derive(i, true)</span>)</a></li>
-                            }
-                        </ul>
+                        <div class="dropdown">
+                            <button class="btn btn-primary dropdown-toggle" type="button" id="ledgerAccountsDropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                Select ledger wallet account
+                            </button>
+                            <div class="dropdown-menu" aria-labelledby="ledgerAccountsDropdownMenuButton">
+                                @for (var i = 0; i < 20; i++)
+                                {
+                                    <a class="dropdown-item ledger-info-recommended" data-ledgerkeypath="@Model.RootKeyPath.Derive(i, true)" href="#">Account @i (<span>@Model.RootKeyPath.Derive(i, true)</span>)</a>
+                                }
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="form-group">

BTCPayServer/Views/Stores/Emails.cshtml

@@ -0,0 +1,68 @@
+@model BTCPayServer.Models.ServerViewModels.EmailsViewModel
+@{
+    Layout = "../Shared/_NavLayout.cshtml";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Update Store Email Settings");
+}
+
+
+<h4>@ViewData["Title"]</h4>
+<partial name="_StatusMessage" for="StatusMessage" />
+
+
+<div class="row">
+    <div class="col-md-6">
+        <div asp-validation-summary="All" class="text-danger"></div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        <form method="post">
+            <div class="form-group">
+                <label asp-for="Settings.Server"></label>
+                <input asp-for="Settings.Server" class="form-control" />
+                <span asp-validation-for="Settings.Server" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Settings.Port"></label>
+                <input asp-for="Settings.Port" class="form-control" />
+                <span asp-validation-for="Settings.Port" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.From"></label>
+                <input asp-for="Settings.From" class="form-control" />
+                <span asp-validation-for="Settings.From" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.Login"></label>
+                <input asp-for="Settings.Login" class="form-control" />
+                <span asp-validation-for="Settings.Login" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.Password"></label>
+                <input asp-for="Settings.Password" type="password" class="form-control" />
+                <span asp-validation-for="Settings.Password" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.EnableSSL"></label>
+                <input asp-for="Settings.EnableSSL" type="checkbox" class="form-check-inline" />
+            </div>
+
+            <div class="form-group">
+                <label asp-for="TestEmail"></label>
+                <input asp-for="TestEmail" class="form-control" />
+                <span asp-validation-for="TestEmail" class="text-danger"></span>
+            </div>
+
+            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
+            <button type="submit" class="btn btn-primary" name="command" value="Test">Test</button>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @await Html.PartialAsync("_ValidationScriptsPartial")
+}

BTCPayServer/Views/Stores/ListTokens.cshtml

@@ -5,6 +5,13 @@
 }
 
 <partial name="_StatusMessage" for="StatusMessage" />
+@if (Model.StoreNotConfigured)
+{
+    <div class="alert alert-warning alert-dismissible" role="alert">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <span>Warning: No wallet has been linked to your BTCPay Store. See <a href="https://docs.btcpayserver.org/btcpay-basics/gettingstarted#connecting-btcpay-store-to-your-wallet" target="_blank">this link</a> for more information on how to connect your store and wallet.</span>
+    </div>
+}
 <h4>Access token</h4>
 <div class="row">
     <div class="col-md-8">
@@ -23,7 +30,7 @@
                 </tr>
             </thead>
             <tbody>
-                @foreach(var token in Model.Tokens)
+                @foreach (var token in Model.Tokens)
                 {
                     <tr>
                         <td>@token.Label</td>

BTCPayServer/Views/Stores/UpdateChangellySettings.cshtml

@@ -11,6 +11,9 @@
 <div class="row">
     <div class="col-md-10">
         <form method="post">
+            <div class="alert alert-warning" role="alert">
+                If you are enabling Changelly support, we advise that you configure the invoice expiration to a minimum of 30 minutes as it may take longer than the default 15 minutes to convert the funds.
+            </div>
             <p>
                 You can obtain API keys at
                 <a href="https://changelly.com/?ref_id=804298eb5753" target="_blank">

BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml

@@ -11,8 +11,11 @@
 <div class="row">
     <div class="col-md-10">
         <form method="post">
+            <div class="alert alert-warning" role="alert">
+                If you are enabling CoinSwitch support, we advise that you configure the invoice expiration to a minimum of 30 minutes as it may take longer than the default 15 minutes to convert the funds.
+            </div>
             <p>
-                You can obtain a merchant id at 
+                You can obtain a merchant id at
                 <a href="https://coinswitch.co/switch/setup/btcpay" target="_blank">
                     https://coinswitch.co/switch/setup/btcpay
                 </a>
@@ -24,10 +27,10 @@
             </div>
             <div class="form-group">
                 <label asp-for="Mode"></label>
-                <select asp-for="Mode" asp-items="Model.Modes" class="form-control" >
+                <select asp-for="Mode" asp-items="Model.Modes" class="form-control">
                 </select>
             </div>
-            
+
             <div class="form-group">
                 <label asp-for="Enabled"></label>
                 <input asp-for="Enabled" type="checkbox" class="form-check"/>

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -214,7 +214,29 @@
                     </table>
                 </div>
             </div>
-            
+        <div class="form-group">
+            <div class="form-group">
+                <h5>Services</h5>
+            </div>
+            <div class="form-group">
+                <table class="table table-sm table-responsive-md">
+                    <thead>
+                    <tr>
+                        <th>Service</th>
+                        <th style="text-align:right">Actions</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>
+                            Email
+                        </td>
+                        <td style="text-align:right"><a asp-action="Emails" >Modify</a></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
             @if(Model.CanDelete)
             {
                 <div class="form-group">

BTCPayServer/Views/Wallets/WalletSend.cshtml

@@ -33,7 +33,7 @@
             <div class="form-group">
                 <label asp-for="Amount"></label>
                 <div class="input-group">
-                    <input asp-for="Amount" class="form-control" onkeyup='updateFiatValue();' />
+                    <input asp-for="Amount" asp-format="{0}" class="form-control" onkeyup='updateFiatValue();' />
                     <div class="input-group-prepend">
                         <span class="input-group-text text-muted" style="display:none;" id="fiatValue"></span>
                     </div>
@@ -55,7 +55,23 @@
                 <label asp-for="SubstractFees"></label>
                 <input asp-for="SubstractFees" class="form-check" />
             </div>
-            <button type="submit" class="btn btn-primary">Confirm</button>
+            @if (Model.AdvancedMode)
+            {
+            <div class="form-group">
+                <label asp-for="NoChange"></label>
+                <a href="https://docs.btcpayserver.org/features/wallet#make-sure-no-change-utxo-is-created-expert-mode" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                <input asp-for="NoChange" class="form-check" />
+            </div>
+            }
+            <button name="command" type="submit" class="btn btn-primary">Confirm</button>
+            @if (Model.AdvancedMode)
+            {
+                <button name="command" type="submit" value="noob" class="btn btn-secondary">Use noob mode</button>
+            }
+            else
+            {
+                <button name="command" type="submit" value="expert" class="btn btn-secondary">Use expert mode</button>
+            }
         </form>
     </div>
 </div>

BTCPayServer/Views/Wallets/WalletSendLedger.cshtml

@@ -16,6 +16,7 @@
         <input type="hidden" asp-for="Amount" />
         <input type="hidden" asp-for="FeeSatoshiPerByte" />
         <input type="hidden" asp-for="SubstractFees" />
+        <input type="hidden" asp-for="NoChange" />
         <p>
             You can send money received by this store to an address with the help of your Ledger Wallet. <br />
             If you don't have a Ledger Wallet, use Electrum with your favorite hardware wallet to transfer crypto. <br />

BTCPayServer/Views/Wallets/WalletTransactions.cshtml

@@ -29,7 +29,8 @@
 <h4>@ViewData["Title"]</h4>
 <div class="row">
     <div class="col-md-10">
-        If this wallet got restored, should have received money but nothing is showing up, please <a asp-action="WalletRescan">Rescan it</a>.
+        If BTCPay Server shows you an invalid balance, <a asp-action="WalletRescan">rescan your wallet</a>. <br />
+        If some transactions appear in BTCPay Server, but are missing on Electrum or another wallet, <a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-wallet#missing-payments-in-my-software-or-hardware-wallet">follow those instructions</a>.
     </div>
 </div>
 <div class="row">

BTCPayServer/wwwroot/cart/js/cart.js

@@ -21,6 +21,7 @@ function Cart() {
     
     this.updateItemsCount();
     this.updateAmount();
+    this.updatePosData();
 }
 
 Cart.prototype.setCustomAmount = function(amount) {
@@ -243,6 +244,7 @@ Cart.prototype.updateAll = function() {
     this.updateSummaryTotal();
     this.updateTotal();
     this.updateAmount();
+    this.updatePosData();
 }
 
 // Update number of cart items
@@ -290,6 +292,20 @@ Cart.prototype.updateTip = function(amount) {
 Cart.prototype.updateAmount = function() {
     $('#js-cart-amount').val(this.getTotal(true));
 }
+Cart.prototype.updatePosData = function() {
+
+    var result = {
+      cart: this.content,
+      customAmount: this.fromCents(this.getCustomAmount()),
+      discountPercentage: this.discount? parseFloat(this.discount): 0,
+      subTotal: this.fromCents(this.getTotalProducts()),
+      discountAmount: this.fromCents(this.getDiscountAmount(this.totalAmount)),
+      tip: this.tip? this.tip: 0,
+      total: this.getTotal(true)
+    };
+    console.warn(result);
+    $('#js-cart-posdata').val(JSON.stringify(result));
+}
 
 Cart.prototype.resetDiscount = function() {
     this.setDiscount(0);
@@ -644,6 +660,7 @@ $.fn.inputAmount = function(obj, type) {
 
         obj.updateSummaryTotal();
         obj.updateAmount();
+        obj.updatePosData();
         obj.emptyCartToggle();
     });
 }
@@ -668,4 +685,4 @@ $.fn.removeAmount = function(obj, type) {
         obj.updateSummaryTotal();
         obj.emptyCartToggle();  
     });
-}
+}

BTCPayServer/wwwroot/checkout/js/core.js

@@ -95,9 +95,8 @@ function onDataCallback(jsonData) {
 }
 
 function fetchStatus() {
-    var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/" + srvModel.paymentMethodId + "/status";
     $.ajax({
-        url: path,
+        url: window.location.pathname + "/status?invoiceId=" + srvModel.invoiceId + "&paymentMethodId=" + srvModel.paymentMethodId,
         type: "GET",
         cache: false
     }).done(function (data) {
@@ -164,11 +163,8 @@ $(document).ready(function () {
                 $("#emailAddressForm .input-wrapper bp-loading-button .action-button").addClass("loading");
                 // Push the email to a server, once the reception is confirmed move on
                 srvModel.customerEmail = emailAddress;
-
-                var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/UpdateCustomer";
-
                 $.ajax({
-                    url: path,
+                    url: window.location.pathname + "/UpdateCustomer?invoiceId=" + srvModel.invoiceId,
                     type: "POST",
                     data: JSON.stringify({ Email: srvModel.customerEmail }),
                     contentType: "application/json; charset=utf-8"
@@ -240,14 +236,22 @@ $(document).ready(function () {
 
     var supportsWebSockets = 'WebSocket' in window && window.WebSocket.CLOSING === 2;
     if (supportsWebSockets) {
-        var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/status/ws";
-        path = path.replace("https://", "wss://");
-        path = path.replace("http://", "ws://");
+        var loc = window.location, ws_uri;
+        if (loc.protocol === "https:") {
+            ws_uri = "wss:";
+        } else {
+            ws_uri = "ws:";
+        }
+        ws_uri += "//" + loc.host;
+        ws_uri += loc.pathname + "/status/ws?invoiceId=" + srvModel.invoiceId;
         try {
-            var socket = new WebSocket(path);
+            var socket = new WebSocket(ws_uri);
             socket.onmessage = function (e) {
                 fetchStatus();
             };
+            socket.onerror = function (e) {
+                console.error("Error while connecting to websocket for invoice notifications (callback)");
+            };
         }
         catch (e) {
             console.error("Error while connecting to websocket for invoice notifications");

BTCPayServer/wwwroot/crowdfund/app.js

@@ -18,17 +18,17 @@ addLoadEvent(function (ev) {
     Vue.use(Toasted);
 
     Vue.component('contribute', {
-        props: ["targetCurrency", "active", "perks", "inModal", "displayPerksRanking"],
+        props: ["targetCurrency", "active", "perks", "inModal", "displayPerksRanking", "loading"],
         template: "#contribute-template"
     });
 
     Vue.component('perks', {
-        props: ["perks", "targetCurrency", "active", "inModal","displayPerksRanking"],
+        props: ["perks", "targetCurrency", "active", "inModal","displayPerksRanking", "loading"],
         template: "#perks-template"
     });
 
     Vue.component('perk', {
-        props: ["perk", "targetCurrency", "active", "inModal", "displayPerksRanking", "index"],
+        props: ["perk", "targetCurrency", "active", "inModal", "displayPerksRanking", "index", "loading"],
         template: "#perk-template",
         data: function () {
             return {
@@ -46,24 +46,35 @@ addLoadEvent(function (ev) {
                 if (e) {
                     e.preventDefault();
                 }
-                if(!this.active){
+                if(!this.active || this.loading){
                     return;
                 }
                 
-                eventAggregator.$emit("contribute", {amount: this.amount, choiceKey: this.perk.id});
+                eventAggregator.$emit("contribute", {amount: parseFloat(this.amount), choiceKey: this.perk.id});
             },
             expand: function(){
                 if(this.canExpand){
                     this.expanded = true;
                 }
+            },
+            setAmount: function (amount) {
+                this.amount = (amount || 0).noExponents();
+                this.expanded = false;
             }
 
 
         },
-        mounted: function(){
-            this.amount = this.perk.price.value;
-
+        mounted: function () {
+            this.setAmount(this.perk.price.value);
+        },
+        watch: {
+            perk: function (newValue, oldValue) {
+                if (newValue.price.value != oldValue.price.value) {
+                    this.setAmount(newValue.price.value);
+                }
+            }
         }
+        
     });
     
     app = new Vue({
@@ -84,8 +95,9 @@ addLoadEvent(function (ev) {
                 active: true,
                 animation: true, 
                 sound: true,
-                lastUpdated:""
-                
+                lastUpdated:"",
+                loading: false,
+                timeoutState: 0
             }
         },
         computed: {
@@ -191,9 +203,11 @@ addLoadEvent(function (ev) {
                 this.active = this.started && !this.ended;
                 setTimeout(this.updateComputed, 1000);
             },
-            submitModalContribute: function(e){
-                debugger;
-                this.$refs.modalContribute.onContributeFormSubmit(e);
+            setLoading: function(val){
+                this.loading = val;
+                if(this.timeoutState){
+                    clearTimeout(this.timeoutState);
+                }
             }
         },
         mounted: function () {
@@ -207,8 +221,19 @@ addLoadEvent(function (ev) {
                 btcpay.showFrame();
 
                 self.contributeModalOpen = false;
+                self.setLoading(false);
+            });
+
+            eventAggregator.$on("contribute", function () {
+                self.setLoading(true);
+                
+                self.timeoutState = setTimeout(function(){
+                    self.setLoading(false);
+                },5000);
             });
             eventAggregator.$on("invoice-error", function(error){
+
+                self.setLoading(false);
                 var msg = "";
                 if(typeof error === "string"){
                     msg = error;

BTCPayServer/wwwroot/crowdfund/styles/main.css

@@ -52,4 +52,5 @@ canvas#fireworks {
     left: -15px;
     top: -15px;
     padding-top: 5px;
+    z-index: 1
 }

BTCPayServer/wwwroot/js/WalletSendLedger.js

@@ -3,6 +3,7 @@
     var amount = $("#Amount").val();
     var fee = $("#FeeSatoshiPerByte").val();
     var substractFee = $("#SubstractFees").val();
+    var noChange = $("#NoChange").val();
 
     var loc = window.location, ws_uri;
     if (loc.protocol === "https:") {
@@ -48,8 +49,14 @@
         args += "&amount=" + amount;
         args += "&feeRate=" + fee;
         args += "&substractFees=" + substractFee;
+        args += "&noChange=" + noChange;
 
-        WriteAlert("warning", 'Please validate the transaction on your ledger');
+        if (noChange === "True") {
+            WriteAlert("warning", 'WARNING: Because you want to make sure no change UTXO is created, you will end up sending more than the chosen amount to your destination. Please validate the transaction on your ledger');
+        }
+        else {
+            WriteAlert("warning", 'Please validate the transaction on your ledger');
+        }        
 
         var confirmButton = $("#confirm-button");
         confirmButton.prop("disabled", true);

BTCPayServer/wwwroot/locales/es-ES.json

@@ -26,7 +26,7 @@
   "ConversionTab_BodyDesc": "Este servicio es provisto por terceros. Ten en cuenta que no tenemos control sobre cómo estos terceros re-enviarán tus fondos. La factura solo se marcará como pagada una vez se reciban los fondos en la cadena de bloques de {{cryptoCode}} .",
   "ConversionTab_CalculateAmount_Error": "Reintentar",
   "ConversionTab_LoadCurrencies_Error": "Reintentar",
-  "ConversionTab_Lightning": "No hay proveedores de conversión disponibles para los pagos de Lightning Network.",
+  "ConversionTab_Lightning": "No hay proveedores de conversión disponibles para los pagos con Lightning Network.",
   "ConversionTab_CurrencyList_Select_Option": "Selecciona la moneda a convertir",
   "Invoice expiring soon...": "La factura expira pronto...",
   "Invoice expired": "La factura expiró",

BTCPayServer/wwwroot/locales/ja-JP.json

@@ -44,6 +44,6 @@
   "Node Info": "接続情報",
   "txCount": "取引 {{count}} 個",
   "txCount_plural": "取引 {{count}} 個",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "CoinSwitchでのお支払い",
+  "Pay with Changelly": "Changellyでのお支払い"
 }

BTCPayServer/wwwroot/locales/nl-NL.json

@@ -18,22 +18,22 @@
   "Copy": "Kopiëren",
   "Conversion": "Omzetting",
   "Open in wallet": "Wallet openen",
-  "CompletePay_Body": "Om de betaling te vervoledigen, bedankt om {{btcDue}} {{cryptoCode}} naar het hieronder vemelde adres op te sturen.",
+  "CompletePay_Body": "Om de betaling af te ronden, stuur alstublieft {{btcDue}} {{cryptoCode}} naar het hieronder vemelde adres.",
   "Amount": "Bedrag",
   "Address": "Adres",
   "Copied": "Gekopieerd",
   "ConversionTab_BodyTop": "Je kan altcoins gebruiken die niet ondersteund zijn door de verkoper, om {{btcDue}} {{cryptoCode}} te betalen.",
   "ConversionTab_BodyDesc": "Deze dienst wordt door een externe partij geleverd. Bijgevolg, hebben we geen zicht over jouw fondsen. De factuur wordt pas als betaald beschouwd, wanneer de fondsen door de blockchain aanvaard zijn {{ cryptoCode }}.",
-  "ConversionTab_CalculateAmount_Error": "Retry",
-  "ConversionTab_LoadCurrencies_Error": "Retry",
+  "ConversionTab_CalculateAmount_Error": "Opnieuw proberen",
+  "ConversionTab_LoadCurrencies_Error": "Opnieuw proberen",
   "ConversionTab_Lightning": "Geen leverancier beschikbaar voor de betalingen op het Lightning Network",
-  "ConversionTab_CurrencyList_Select_Option": "Please select a currency to convert from",
+  "ConversionTab_CurrencyList_Select_Option": "Selecteer een valuta om te converteren",
   "Invoice expiring soon...": "De factuur verloopt binnenkort...",
   "Invoice expired": "Vervallen factuur",
   "What happened?": "Wat gebeurde er?",
   "InvoiceExpired_Body_1": "De factuur is vervallen. Een factuur is alleen geldig voor {{maxTimeMinutes}} minuten. \nJe kan terug komen naar {{storeName}} als je de betaling opnieuw wilt proberen",
   "InvoiceExpired_Body_2": "Als je een betaling uitvoerde, dan werd dit nog niet bevestigd door het netwerk. We hebben je fondsen nog niet ontvangen.",
-  "InvoiceExpired_Body_3": "",
+  "InvoiceExpired_Body_3": "Indien we het later ontvangen, zullen we uw order verwerken of nemen we contact op om een terugbetaling te regelen...",
   "Invoice ID": "Factuurnummer",
   "Order ID": "Bestllingsnummer",
   "Return to StoreName": "Terug naar {{storeName}}",
@@ -44,6 +44,6 @@
   "Node Info": "Node Info",
   "txCount": "{{count}} transactie",
   "txCount_plural": "{{count}} transacties",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "Betalen met CoinSwitch",
+  "Pay with Changelly": "Betalen met Changelly"
 }

BTCPayServer/wwwroot/locales/sl-SI.json

@@ -0,0 +1,49 @@
+{
+  "NOTICE_WARN": "THIS CODE HAS BEEN AUTOMATICALLY GENERATED FROM TRANSIFEX, IF YOU WISH TO HELP TRANSLATION COME ON THE SLACK http://slack.btcpayserver.org TO REQUEST PERMISSION TO https://www.transifex.com/btcpayserver/btcpayserver/",
+  "code": "sl-SI",
+  "currentLanguage": "Slovenščina",
+  "lang": "Jezik",
+  "Awaiting Payment...": "Čakam na plačilo...",
+  "Pay with": "Plačaj z",
+  "Contact and Refund Email": "E-pošta za kontakt in vračilo",
+  "Contact_Body": "Prosimo, vpišite vaš e-poštni naslov. Kontaktirali vas bomo v primeru težav ali vračila.",
+  "Your email": "E-poštni naslov",
+  "Continue": "Nadaljuj",
+  "Please enter a valid email address": "Prosimo, vnesite veljaven e-poštni naslov",
+  "Order Amount": "Znesek",
+  "Network Cost": "Strošek omrežja",
+  "Already Paid": "Že plačano",
+  "Due": "Ostane za plačilo",
+  "Scan": "Skeniraj",
+  "Copy": "Kopiraj",
+  "Conversion": "Menjava",
+  "Open in wallet": "Odpri v denarnici",
+  "CompletePay_Body": "Za dokončanje plačila, prosimo pošljite {{btcDue}} {{cryptoCode}} na spodnji naslov.",
+  "Amount": "Znesek",
+  "Address": "Naslov",
+  "Copied": "Kopirano",
+  "ConversionTab_BodyTop": "Plačilo {{btcDue}} {{cryptoCode}} lahko izvedete z uporabo altcoina, ki ga prodajalec neposredno ne podpira.",
+  "ConversionTab_BodyDesc": "To storitev ponuja tretja oseba. Ne pozabite, da nimamo nadzora nad tem, kako bodo ponudniki posredovali vaša sredstva. Račun bo označen kot plačan šele po prejemu sredstev na {{cryptoCode}} Blockchain.",
+  "ConversionTab_CalculateAmount_Error": "Poskusite znova",
+  "ConversionTab_LoadCurrencies_Error": "Poskusite znova",
+  "ConversionTab_Lightning": "Ne obstaja ponudnik za menjavo valut pri plačilih v Lightning omrežju.",
+  "ConversionTab_CurrencyList_Select_Option": "Prosimo, izberite valuto iz katere želite menjavo",
+  "Invoice expiring soon...": "Račun bo kmalu potekel...",
+  "Invoice expired": "Račun je potekel",
+  "What happened?": "Kaj se je zgodilo?",
+  "InvoiceExpired_Body_1": "Račun je potekel in ni več veljaven. Račun je veljaven samo {{maxTimeMinutes}} minut. \nVrnete se lahko na {{storeName}}, kjer lahko ponovno izvedete plačilo.",
+  "InvoiceExpired_Body_2": "Če ste poskušali poslati plačilo, to še ni bilo sprejeto v omrežju. Plačila še nismo prejeli.",
+  "InvoiceExpired_Body_3": "Če ga bomo prejeli kasneje, bomo obdelali naročilo ali vas kontaktirali glede vračila...",
+  "Invoice ID": "Račun št.",
+  "Order ID": "Naročilo št.",
+  "Return to StoreName": "Vrni se na {{storeName}}",
+  "This invoice has been paid": "Račun je plačan.",
+  "This invoice has been archived": "Račun je arhiviran.",
+  "Archived_Body": "Prosimo, kontaktirajte trgovino za informacije o naročilu ali pomoč.",
+  "BOLT 11 Invoice": "BOLT 11 Invoice",
+  "Node Info": "Node Info",
+  "txCount": "{{count}} transakcija",
+  "txCount_plural": "{{count}} transakcij/e",
+  "Pay with CoinSwitch": "Plačilo z CoinSwitch",
+  "Pay with Changelly": "Plačilo z Changelly"
+}

README.md

@@ -53,6 +53,7 @@ In addition to Bitcoin, BTCPay supports the following cryptocurrencies:
 * Polis
 * UFO
 * Viacoin
+* Bitcoinplus
 
 ## Documentation
 
@@ -64,7 +65,7 @@ You can also read the [BTCPay Merchants Guide](https://www.reddit.com/r/Bitcoin/
 
 While the documentation advises to use docker-compose, you may want to build BTCPay yourself.
 
-First install .NET Core SDK v2.1.4 (with patch version >= 403) as specified by [Microsoft website](https://www.microsoft.com/net/download/dotnet-core/2.1).
+First install .NET Core SDK v2.1.6 as specified by [Microsoft website](https://www.microsoft.com/net/download/dotnet-core/2.1).
 
 On Powershell:
 ```