Fix invoice page not showing tor link (Fix https://github.com/btcpayserver/btcpayserver/issues/915)

Bug fix #902

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
-    <PackageReference Include="NBitcoin" Version="4.1.2.35" />
+    <PackageReference Include="NBitcoin" Version="4.1.2.37" />
     <PackageReference Include="NBXplorer.Client" Version="2.0.0.17" />
   </ItemGroup>
 </Project>

BTCPayServer.Rating/Providers/CoinAverageSettings.cs

@@ -70,61 +70,73 @@ namespace BTCPayServer.Services.Rates
             //}
             //b.AppendLine("}.ToArray()");
             AvailableExchanges = new CoinAverageExchanges();
-            foreach(var item in
+            foreach (var item in
              new[] {
-                (DisplayName: "BitBargain", Name: "bitbargain"),
-                (DisplayName: "Tidex", Name: "tidex"),
-                (DisplayName: "LocalBitcoins", Name: "localbitcoins"),
-                (DisplayName: "EtherDelta", Name: "etherdelta"),
-                (DisplayName: "Kraken", Name: "kraken"),
-                (DisplayName: "BitBay", Name: "bitbay"),
-                (DisplayName: "Independent Reserve", Name: "independentreserve"),
-                (DisplayName: "Exmoney", Name: "exmoney"),
-                (DisplayName: "Bitcoin.co.id", Name: "bitcoin_co_id"),
-                (DisplayName: "Huobi", Name: "huobi"),
-                (DisplayName: "GDAX", Name: "gdax"),
-                (DisplayName: "Coincheck", Name: "coincheck"),
-                (DisplayName: "Bittylicious", Name: "bittylicious"),
-                (DisplayName: "Gemini", Name: "gemini"),
-                (DisplayName: "Bit2C", Name: "bit2c"),
-                (DisplayName: "Luno", Name: "luno"),
-                (DisplayName: "Negocie Coins", Name: "negociecoins"),
-                (DisplayName: "FYB-SE", Name: "fybse"),
-                (DisplayName: "Hitbtc", Name: "hitbtc"),
-                (DisplayName: "Bitex.la", Name: "bitex"),
-                (DisplayName: "Korbit", Name: "korbit"),
-                (DisplayName: "itBit", Name: "itbit"),
-                (DisplayName: "Okex", Name: "okex"),
-                (DisplayName: "Bitsquare", Name: "bitsquare"),
-                (DisplayName: "Bitfinex", Name: "bitfinex"),
-                (DisplayName: "CoinMate", Name: "coinmate"),
-                (DisplayName: "Bitstamp", Name: "bitstamp"),
-                (DisplayName: "Cryptonit", Name: "cryptonit"),
-                (DisplayName: "Foxbit", Name: "foxbit"),
-                (DisplayName: "QuickBitcoin", Name: "quickbitcoin"),
-                (DisplayName: "Poloniex", Name: "poloniex"),
-                (DisplayName: "Bit-Z", Name: "bitz"),
-                (DisplayName: "Liqui", Name: "liqui"),
-                (DisplayName: "BitKonan", Name: "bitkonan"),
-                (DisplayName: "Kucoin", Name: "kucoin"),
-                (DisplayName: "Binance", Name: "binance"),
-                (DisplayName: "Rock Trading", Name: "rocktrading"),
-                (DisplayName: "Mercado Bitcoin", Name: "mercado"),
-                (DisplayName: "Coinsecure", Name: "coinsecure"),
+                (DisplayName: "Idex", Name: "idex"),
                 (DisplayName: "Coinfloor", Name: "coinfloor"),
-                (DisplayName: "bitFlyer", Name: "bitflyer"),
-                (DisplayName: "BTCTurk", Name: "btcturk"),
-                (DisplayName: "Bittrex", Name: "bittrex"),
-                (DisplayName: "CampBX", Name: "campbx"),
-                (DisplayName: "Zaif", Name: "zaif"),
-                (DisplayName: "FYB-SG", Name: "fybsg"),
-                (DisplayName: "Quoine", Name: "quoine"),
+                (DisplayName: "Okex", Name: "okex"),
+                (DisplayName: "Bitfinex", Name: "bitfinex"),
+                (DisplayName: "Bittylicious", Name: "bittylicious"),
                 (DisplayName: "BTC Markets", Name: "btcmarkets"),
+                (DisplayName: "Kucoin", Name: "kucoin"),
+                (DisplayName: "IDAX", Name: "idax"),
+                (DisplayName: "Kraken", Name: "kraken"),
+                (DisplayName: "Bit2C", Name: "bit2c"),
+                (DisplayName: "Mercado Bitcoin", Name: "mercado"),
+                (DisplayName: "CEX.IO", Name: "cex"),
+                (DisplayName: "Bitex.la", Name: "bitex"),
+                (DisplayName: "Quoine", Name: "quoine"),
+                (DisplayName: "Stex", Name: "stex"),
+                (DisplayName: "CoinTiger", Name: "cointiger"),
+                (DisplayName: "Poloniex", Name: "poloniex"),
+                (DisplayName: "Zaif", Name: "zaif"),
+                (DisplayName: "Huobi", Name: "huobi"),
+                (DisplayName: "QuickBitcoin", Name: "quickbitcoin"),
+                (DisplayName: "Tidex", Name: "tidex"),
+                (DisplayName: "Tokenomy", Name: "tokenomy"),
+                (DisplayName: "Bitcoin.co.id", Name: "bitcoin_co_id"),
+                (DisplayName: "Kryptono", Name: "kryptono"),
                 (DisplayName: "Bitso", Name: "bitso"),
+                (DisplayName: "Korbit", Name: "korbit"),
+                (DisplayName: "Yobit", Name: "yobit"),
+                (DisplayName: "BitBargain", Name: "bitbargain"),
+                (DisplayName: "Livecoin", Name: "livecoin"),
+                (DisplayName: "Hotbit", Name: "hotbit"),
+                (DisplayName: "Coincheck", Name: "coincheck"),
+                (DisplayName: "Binance", Name: "binance"),
+                (DisplayName: "Bit-Z", Name: "bitz"),
+                (DisplayName: "Coinbase Pro", Name: "coinbasepro"),
+                (DisplayName: "Rock Trading", Name: "rocktrading"),
+                (DisplayName: "Bittrex", Name: "bittrex"),
+                (DisplayName: "BitBay", Name: "bitbay"),
+                (DisplayName: "Tokenize", Name: "tokenize"),
+                (DisplayName: "Hitbtc", Name: "hitbtc"),
+                (DisplayName: "Upbit", Name: "upbit"),
+                (DisplayName: "Bitstamp", Name: "bitstamp"),
+                (DisplayName: "Luno", Name: "luno"),
+                (DisplayName: "Trade.io", Name: "tradeio"),
+                (DisplayName: "LocalBitcoins", Name: "localbitcoins"),
+                (DisplayName: "Independent Reserve", Name: "independentreserve"),
+                (DisplayName: "Coinsquare", Name: "coinsquare"),
+                (DisplayName: "Exmoney", Name: "exmoney"),
+                (DisplayName: "Coinegg", Name: "coinegg"),
+                (DisplayName: "FYB-SG", Name: "fybsg"),
+                (DisplayName: "Cryptonit", Name: "cryptonit"),
+                (DisplayName: "BTCTurk", Name: "btcturk"),
+                (DisplayName: "bitFlyer", Name: "bitflyer"),
+                (DisplayName: "Negocie Coins", Name: "negociecoins"),
+                (DisplayName: "OasisDEX", Name: "oasisdex"),
+                (DisplayName: "CoinMate", Name: "coinmate"),
+                (DisplayName: "BitForex", Name: "bitforex"),
+                (DisplayName: "Bitsquare", Name: "bitsquare"),
+                (DisplayName: "FYB-SE", Name: "fybse"),
+                (DisplayName: "itBit", Name: "itbit"),
                 })
             {
                 AvailableExchanges.TryAdd(item.Name, new CoinAverageExchange(item.Name, item.DisplayName, $"https://apiv2.bitcoinaverage.com/exchanges/{item.Name}"));
             }
+            // Keep back-compat
+            AvailableExchanges.Add(new CoinAverageExchange("gdax", string.Empty, $"https://apiv2.bitcoinaverage.com/exchanges/coinbasepro"));
         }
 
         public Task AddHeader(HttpRequestMessage message)

BTCPayServer.Rating/Services/RateProviderFactory.cs

@@ -116,7 +116,6 @@ namespace BTCPayServer.Services.Rates
             Providers.Add("bitbank", new BitbankRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BITBANK")));
 
             // Those exchanges make multiple requests when calling GetTickers so we remove them
-            //DirectProviders.Add("gdax", new ExchangeSharpRateProvider("gdax", new ExchangeGdaxAPI()));
             //DirectProviders.Add("gemini", new ExchangeSharpRateProvider("gemini", new ExchangeGeminiAPI()));
             //DirectProviders.Add("bitfinex", new ExchangeSharpRateProvider("bitfinex", new ExchangeBitfinexAPI()));
             //DirectProviders.Add("okex", new ExchangeSharpRateProvider("okex", new ExchangeOkexAPI()));

BTCPayServer.Tests/AuthenticationTests.cs

@@ -127,11 +127,11 @@ namespace BTCPayServer.Tests
                 results = url.Split("#").Last().Split("&").ToDictionary(s1 => s1.Split("=")[0], s1 => s1.Split("=")[1]);
                 await TestApiAgainstAccessToken(results["access_token"], tester, user);
 
-                await LogoutFlow(tester, id, s);
+                LogoutFlow(tester, id, s);
             }
         }
 
-        private async Task LogoutFlow(ServerTester tester, string clientId, SeleniumTester seleniumTester )
+        void LogoutFlow(ServerTester tester, string clientId, SeleniumTester seleniumTester)
         {
             var logoutUrl = new Uri(tester.PayTester.ServerUri,
                 $"connect/logout?response_type=token&client_id={clientId}");
@@ -314,7 +314,7 @@ namespace BTCPayServer.Tests
             return result.AccessToken;
         }
 
-        public async Task TestApiAgainstAccessToken(string accessToken, ServerTester tester, TestAccount testAccount)
+        async Task TestApiAgainstAccessToken(string accessToken, ServerTester tester, TestAccount testAccount)
         {
             var resultUser =
                 await TestApiAgainstAccessToken<string>(accessToken, "api/test/me/id",

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -148,7 +148,7 @@ namespace BTCPayServer.Tests
                     .UseKestrel()
                     .UseStartup<Startup>()
                     .Build();
-            _Host.Start();
+            _Host.StartWithTasksAsync().GetAwaiter().GetResult();
 
             var urls = _Host.ServerFeatures.Get<IServerAddressesFeature>().Addresses;
             foreach (var url in urls)

BTCPayServer.Tests/RateRulesTest.cs

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

BTCPayServer.Tests/SeleniumTests.cs

@@ -86,7 +86,7 @@ namespace BTCPayServer.Tests
             }
         }
 
-        public static void LogIn(SeleniumTester s, string email)
+        static void LogIn(SeleniumTester s, string email)
         {
             s.Driver.FindElement(By.Id("Login")).Click();
             s.Driver.FindElement(By.Id("Email")).SendKeys(email);
@@ -166,7 +166,7 @@ namespace BTCPayServer.Tests
             }
         }
 
-        public static void CreateInvoice(SeleniumTester s, string store)
+        static void CreateInvoice(SeleniumTester s, string store)
         {
             s.Driver.FindElement(By.Id("Invoices")).Click();
             s.Driver.FindElement(By.Id("CreateNewInvoice")).Click();

BTCPayServer.Tests/UtilitiesTests.cs

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

BTCPayServer.Tests/docker-compose.yml

@@ -227,7 +227,7 @@ services:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.6-beta
+    image: btcpayserver/lnd:v0.7.0-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -258,7 +258,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.6-beta
+    image: btcpayserver/lnd:v0.7.0-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"

BTCPayServer/BTCPayServer.csproj

@@ -30,7 +30,7 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.19" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.23" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
     <PackageReference Include="BundlerMinifier.Core" Version="2.9.406" />
     <PackageReference Include="BundlerMinifier.TagHelpers" Version="2.9.406" />

BTCPayServer/Controllers/InvoiceController.cs

@@ -257,7 +257,7 @@ namespace BTCPayServer.Controllers
                 paymentMethod.Network = network;
                 paymentMethod.SetId(supportedPaymentMethod.PaymentId);
                 paymentMethod.Rate = rate.BidAsk.Bid;
-                paymentMethod.PreferOnion = this.Request.IsOnion();
+                paymentMethod.PreferOnion = Uri.TryCreate(entity.ServerUrl, UriKind.Absolute, out var u) && u.DnsSafeHost.EndsWith(".onion");
 
                 using (logs.Measure($"{logPrefix} Payment method details creation"))
                 {

BTCPayServer/Controllers/StoresController.cs

@@ -590,6 +590,7 @@ namespace BTCPayServer.Controllers
         private CoinAverageExchange[] GetSupportedExchanges()
         {
             return _RateFactory.RateProviderFactory.GetSupportedExchanges()
+                    .Where(r => !string.IsNullOrWhiteSpace(r.Value.Display))
                     .Select(c => c.Value)
                     .OrderBy(s => s.Name, StringComparer.OrdinalIgnoreCase)
                     .ToArray();

BTCPayServer/Controllers/WalletsController.PSBT.cs

@@ -141,7 +141,11 @@ namespace BTCPayServer.Controllers
             var derivationSchemeSettings = await GetDerivationSchemeSettings(walletId);
             if (derivationSchemeSettings == null)
                 return NotFound();
-            await FetchTransactionDetails(derivationSchemeSettings, vm, network);
+            try
+            {
+                await FetchTransactionDetails(derivationSchemeSettings, vm, network);
+            }
+            catch { return BadRequest(); }
             return View(nameof(WalletPSBTReady), vm);
         }
 

BTCPayServer/Extensions.cs

@@ -34,11 +34,29 @@ using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using NBXplorer.DerivationStrategy;
 using System.Net;
+using Microsoft.AspNetCore.Hosting;
 
 namespace BTCPayServer
 {
     public static class Extensions
     {
+        public static IServiceCollection AddStartupTask<T>(this IServiceCollection services)
+            where T : class, IStartupTask
+            => services.AddTransient<IStartupTask, T>();
+        public static async Task StartWithTasksAsync(this IWebHost webHost, CancellationToken cancellationToken = default)
+        {
+            // Load all tasks from DI
+            var startupTasks = webHost.Services.GetServices<IStartupTask>();
+
+            // Execute all the tasks
+            foreach (var startupTask in startupTasks)
+            {
+                await startupTask.ExecuteAsync(cancellationToken).ConfigureAwait(false);
+            }
+
+            // Start the tasks as normal
+            await webHost.StartAsync(cancellationToken).ConfigureAwait(false);
+        }
         public static string PrettyPrint(this TimeSpan expiration)
         {
             StringBuilder builder = new StringBuilder();

BTCPayServer/Extensions/OpenIddictExtensions.cs

@@ -20,7 +20,6 @@ namespace BTCPayServer
             var file = Path.Combine(configuration.GetDataDir(), "rsaparams");
 
             RSACryptoServiceProvider RSA = new RSACryptoServiceProvider(2048);
-            RsaSecurityKey key = null;
 
             if (File.Exists(file))
             {

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -78,6 +78,7 @@ namespace BTCPayServer.Hosting
             services.TryAddSingleton<InvoicePaymentNotification>();
             services.TryAddSingleton<BTCPayServerOptions>(o =>
                 o.GetRequiredService<IOptions<BTCPayServerOptions>>().Value);
+            services.AddStartupTask<MigrationStartupTask>();
             services.TryAddSingleton<InvoiceRepository>(o =>
             {
                 var opts = o.GetRequiredService<BTCPayServerOptions>();
@@ -184,7 +185,6 @@ namespace BTCPayServer.Hosting
                 o.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(DerivationStrategyBase)));
             });
             services.AddSingleton<IHostedService, CssThemeManagerHostedService>();
-            services.AddSingleton<IHostedService, MigratorHostedService>();
 
             services.AddSingleton<IHostedService, HostedServices.CheckConfigurationHostedService>();
             
@@ -316,37 +316,9 @@ namespace BTCPayServer.Hosting
 
         public static IApplicationBuilder UsePayServer(this IApplicationBuilder app)
         {
-            using (var scope = app.ApplicationServices.GetService<IServiceScopeFactory>().CreateScope())
-            {
-                //Wait the DB is ready
-                Retry(() =>
-                {
-                    scope.ServiceProvider.GetRequiredService<ApplicationDbContext>().Database.Migrate();
-                });
-            }
-
             app.UseMiddleware<BTCPayMiddleware>();
             return app; 
         }
-
-        static void Retry(Action act)
-        {
-            CancellationTokenSource cts = new CancellationTokenSource(1000);
-            while (true)
-            {
-                try
-                {
-                    act();
-                    return;
-                }
-                // Starting up
-                catch (PostgresException ex) when (ex.SqlState == "57P03") { Thread.Sleep(1000); }
-                catch when (!cts.IsCancellationRequested)
-                {
-                    Thread.Sleep(100);
-                }
-            }
-        }
     }
 
 

BTCPayServer/Hosting/Startup.cs

@@ -95,6 +95,10 @@ namespace BTCPayServer.Hosting
             string httpsCertificateFilePath = Configuration.GetOrDefault<string>("HttpsCertificateFilePath", null);
             bool useDefaultCertificate = Configuration.GetOrDefault<bool>("HttpsUseDefaultCertificate", false);
             bool hasCertPath = !String.IsNullOrEmpty(httpsCertificateFilePath);
+            services.Configure<KestrelServerOptions>(kestrel =>
+            {
+                kestrel.Limits.MaxRequestLineSize = 8_192 * 10 * 5; // Around 500K, transactions passed in URI should not be bigger than this
+            });
             if (hasCertPath || useDefaultCertificate)
             {
                 var bindAddress = Configuration.GetOrDefault<IPAddress>("bind", IPAddress.Any);

BTCPayServer/IStartupTask.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BTCPayServer
+{
+    public interface IStartupTask
+    {
+        Task ExecuteAsync(CancellationToken cancellationToken = default);
+    }
+}

BTCPayServer/MigrationStartupTask.cs

@@ -8,16 +8,18 @@ using BTCPayServer.Data;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Stores;
 using BTCPayServer.Logging;
+using System.Threading;
+using Npgsql;
 
-namespace BTCPayServer.HostedServices
+namespace BTCPayServer
 {
-    public class MigratorHostedService : BaseAsyncService
+    public class MigrationStartupTask : IStartupTask
     {
         private ApplicationDbContextFactory _DBContextFactory;
         private StoreRepository _StoreRepository;
         private BTCPayNetworkProvider _NetworkProvider;
         private SettingsRepository _Settings;
-        public MigratorHostedService(
+        public MigrationStartupTask(
             BTCPayNetworkProvider networkProvider,
             StoreRepository storeRepository,
             ApplicationDbContextFactory dbContextFactory,
@@ -28,18 +30,11 @@ namespace BTCPayServer.HostedServices
             _NetworkProvider = networkProvider;
             _Settings = settingsRepository;
         }
-        internal override Task[] InitializeTasks()
-        {
-            return new[]
-            {
-                Update()
-            };
-        }
-
-        private async Task Update()
+        public async Task ExecuteAsync(CancellationToken cancellationToken = default)
         {
             try
             {
+                await Migrate(cancellationToken);
                 var settings = (await _Settings.GetSettingAsync<MigrationSettings>()) ?? new MigrationSettings();
                 if (!settings.DeprecatedLightningConnectionStringCheck)
                 {
@@ -80,11 +75,34 @@ namespace BTCPayServer.HostedServices
             }
             catch (Exception ex)
             {
-                Logs.PayServer.LogError(ex, "Error on the MigratorHostedService");
+                Logs.PayServer.LogError(ex, "Error on the MigrationStartupTask");
                 throw;
             }
         }
 
+        private async Task Migrate(CancellationToken cancellationToken)
+        {
+            using (CancellationTokenSource timeout = new CancellationTokenSource(10_000))
+            using (CancellationTokenSource cts = CancellationTokenSource.CreateLinkedTokenSource(timeout.Token, cancellationToken))
+            {
+            retry:
+                try
+                {
+                    await _DBContextFactory.CreateContext().Database.MigrateAsync();
+                }
+                // Starting up
+                catch when (!cts.Token.IsCancellationRequested)
+                {
+                    try
+                    {
+                        await Task.Delay(1000, cts.Token);
+                    }
+                    catch { }
+                    goto retry;
+                }
+            }
+        }
+
         private async Task ConvertConvertWalletKeyPathRoots()
         {
             bool save = false;

BTCPayServer/Program.cs

@@ -53,6 +53,7 @@ namespace BTCPayServer
                         l.AddFilter("Microsoft", LogLevel.Error);
                         l.AddFilter("System.Net.Http.HttpClient", LogLevel.Critical);
                         l.AddFilter("Microsoft.AspNetCore.Antiforgery.Internal", LogLevel.Critical);
+                        l.AddFilter("AspNet.Security.OpenIdConnect.Server.OpenIdConnectServerHandler", LogLevel.Error);
                         l.AddProvider(new CustomConsoleLogProvider(processor));
 
                         // Use Serilog for debug log file.
@@ -68,7 +69,7 @@ namespace BTCPayServer
                     })
                     .UseStartup<Startup>()
                     .Build();
-                host.StartAsync().GetAwaiter().GetResult();
+                host.StartWithTasksAsync().GetAwaiter().GetResult();
                 var urls = host.ServerFeatures.Get<IServerAddressesFeature>().Addresses;
                 foreach (var url in urls)
                 {

BTCPayServer/Services/Apps/AppHubStreamer.cs

@@ -56,8 +56,7 @@ namespace BTCPayServer.Services.Apps
                             {
                         data.GetValue(),
                         invoiceEvent.Payment.GetCryptoCode(),
-                        Enum.GetName(typeof(PaymentTypes),
-                            invoiceEvent.Payment.GetPaymentMethodId().PaymentType)
+                        invoiceEvent.Payment.GetPaymentMethodId().PaymentType.ToString()
                             }, cancellationToken);
                     }
                     await InfoUpdated(appId);

BTCPayServer/Services/Apps/AppService.cs

@@ -96,6 +96,7 @@ namespace BTCPayServer.Services.Apps
             var invoices = await GetInvoicesForApp(appData, lastResetDate);
             var completeInvoices = invoices.Where(entity => entity.Status == InvoiceStatus.Complete || entity.Status == InvoiceStatus.Confirmed).ToArray();
             var pendingInvoices = invoices.Where(entity => !(entity.Status == InvoiceStatus.Complete || entity.Status == InvoiceStatus.Confirmed)).ToArray();
+            var paidInvoices = invoices.Where(entity => entity.Status == InvoiceStatus.Complete || entity.Status == InvoiceStatus.Confirmed || entity.Status == InvoiceStatus.Paid).ToArray();
 
             var pendingPayments = GetContributionsByPaymentMethodId(settings.TargetCurrency, pendingInvoices, !settings.EnforceTargetAmount);
             var currentPayments = GetContributionsByPaymentMethodId(settings.TargetCurrency, completeInvoices, !settings.EnforceTargetAmount);
@@ -149,7 +150,7 @@ namespace BTCPayServer.Services.Apps
                 CurrencyData = _Currencies.GetCurrencyData(settings.TargetCurrency, true),
                 Info = new ViewCrowdfundViewModel.CrowdfundInfo()
                 {
-                    TotalContributors = invoices.Length,
+                    TotalContributors = paidInvoices.Length,
                     ProgressPercentage = (currentPayments.TotalCurrency / settings.TargetAmount) * 100,
                     PendingProgressPercentage = (pendingPayments.TotalCurrency / settings.TargetAmount) * 100,
                     LastUpdated = DateTime.Now,

BTCPayServer/Services/HardwareWalletService.cs

@@ -38,10 +38,10 @@ namespace BTCPayServer.Services
             List<KeyPath> derivations = new List<KeyPath>();
             if (network.NBitcoinNetwork.Consensus.SupportSegwit)
             {
-                if (derivation.Redeem?.IsWitness is true ||
-                    derivation.ScriptPubKey.IsWitness) // Native or p2sh segwit
+                if (derivation.Redeem?.IsScriptType(ScriptType.Witness) is true ||
+                    derivation.ScriptPubKey.IsScriptType(ScriptType.Witness)) // Native or p2sh segwit
                     derivations.Add(new KeyPath("49'"));
-                if (derivation.Redeem == null && derivation.ScriptPubKey.IsWitness) // Native segwit
+                if (derivation.Redeem == null && derivation.ScriptPubKey.IsScriptType(ScriptType.Witness)) // Native segwit
                     derivations.Add(new KeyPath("84'"));
             }
             derivations.Add(new KeyPath("44'"));

BTCPayServer/Views/Stores/Rates.cshtml

@@ -58,25 +58,25 @@
                 <div id="help" class="collapse text-left">
                     <p>
                         The script language is composed of several rules composed of a currency pair and a mathematic expression.
-                        The example below will use <code>gdax</code> for both <code>LTC_USD</code> and <code>BTC_USD</code> pairs.
+                        The example below will use <code>kraken</code> for both <code>LTC_USD</code> and <code>BTC_USD</code> pairs.
                     </p>
                     <pre>
                     <code>
-                            LTC_USD = gdax(LTC_USD);
-                            BTC_USD = gdax(BTC_USD);
+                            LTC_USD = kraken(LTC_USD);
+                            BTC_USD = kraken(BTC_USD);
                         </code>
                     </pre>
-                    <p>However, explicitely setting specific pairs like this can be a bit difficult. Instead, you can define a rule <code>X_X</code> which will match any currency pair. The following example will use <code>gdax</code> for getting the rate of any currency pair.</p>
+                    <p>However, explicitely setting specific pairs like this can be a bit difficult. Instead, you can define a rule <code>X_X</code> which will match any currency pair. The following example will use <code>kraken</code> for getting the rate of any currency pair.</p>
                     <pre>
                     <code>
-                            X_X = gdax(X_X);
+                            X_X = kraken(X_X);
                         </code>
                     </pre>
-                    <p>However, <code>gdax</code> does not support the <code>BTC_CAD</code> pair. For this reason you can add a rule mapping all <code>X_CAD</code> to <code>quadrigacx</code>, a Canadian exchange.</p>
+                    <p>However, <code>kraken</code> does not support the <code>BTC_CAD</code> pair. For this reason you can add a rule mapping all <code>X_CAD</code> to <code>quadrigacx</code>, a Canadian exchange.</p>
                     <pre>
                     <code>
                             X_CAD = quadrigacx(X_CAD);
-                            X_X = gdax(X_X);
+                            X_X = kraken(X_X);
                         </code>
                     </pre>
                     <p>A given currency pair match the most specific rule. If two rules are matching and are as specific, the first rule will be chosen.</p>
@@ -88,11 +88,11 @@
                     <code>
                             DOGE_X = bittrex(DOGE_BTC) * BTC_X
                             X_CAD = quadrigacx(X_CAD);
-                            X_X = gdax(X_X);
+                            X_X = kraken(X_X);
                         </code>
                     </pre>
                     <p>
-                        With <code>DOGE_USD</code> will be expanded to <code>bittrex(DOGE_BTC) * gdax(BTC_USD)</code>. And <code>DOGE_CAD</code> will be expanded to <code>bittrex(DOGE_BTC) * quadrigacx(BTC_CAD)</code>. <br />
+                        With <code>DOGE_USD</code> will be expanded to <code>bittrex(DOGE_BTC) * kraken(BTC_USD)</code>. And <code>DOGE_CAD</code> will be expanded to <code>bittrex(DOGE_BTC) * quadrigacx(BTC_CAD)</code>. <br />
                         However, we advise you to write it that way to increase coverage so that <code>DOGE_BTC</code> is also supported:
                     </p>
                     <pre>
@@ -100,7 +100,7 @@
                             DOGE_X = DOGE_BTC * BTC_X
                             DOGE_BTC = bittrex(DOGE_BTC)
                             X_CAD = quadrigacx(X_CAD);
-                            X_X = gdax(X_X);
+                            X_X = kraken(X_X);
                         </code>
                     </pre>
                     <p>

BTCPayServer/Views/Wallets/WalletSendLedger.cshtml

@@ -25,6 +25,7 @@
             <li>Make sure you are running the Ledger app with version superior or equal to <b>1.3.9</b></li>
             <li>Use Google Chrome browser and open the coin app on your Ledger</li>
         </ul>
+        <p>If you are on Windows and seeing an annoying popup opening and closing, while it is signing, ignore it. The bigger the transaction, the more this popup will show up.</p>
         <p id="hw-loading"><span class="fa fa-question-circle" style="color:orange"></span> <span>Detecting hardware wallet...</span></p>
         <p id="hw-error" style="display:none;"><span class="fa fa-times-circle" style="color:red;"></span> <span class="hw-label">An error happened</span></p>
         <p id="hw-success" style="display:none;"><span class="fa fa-check-circle" style="color:green;"></span> <span class="hw-label">Detecting hardware wallet...</span></p>

BTCPayServer/wwwroot/locales/pl.json

@@ -47,5 +47,5 @@
   "Pay with CoinSwitch": "Zapłać z CoinSwitch",
   "Pay with Changelly": "Zapłać z Changelly",
   "Close": "Zamknij",
-  "NotPaid_ExtraTransaction": "The invoice hasn't been paid in full. Please send another transaction to cover amount Due."
+  "NotPaid_ExtraTransaction": "Faktura nie została w pełni opłacona. Proszę wyślij dodatkową transakcje z resztą brakujących środków."
 }

Build/Version.csproj

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-		<Version>1.0.3.119</Version>
+		<Version>1.0.3.123</Version>
   </PropertyGroup>
 </Project>