bump

This reverts commit 06df63b2835d77a83c8897368f91491e008f57b5.

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -120,30 +120,67 @@ namespace BTCPayServer.Tests
                     .Build();
             _Host.Start();
             InvoiceRepository = (InvoiceRepository)_Host.Services.GetService(typeof(InvoiceRepository));
-            StoreRepository = (StoreRepository)_Host.Services.GetService(typeof(StoreRepository)); 
-            var rateProvider = (BTCPayRateProviderFactory)_Host.Services.GetService(typeof(BTCPayRateProviderFactory));
-            rateProvider.DirectProviders.Clear();
+            StoreRepository = (StoreRepository)_Host.Services.GetService(typeof(StoreRepository));
 
-            var coinAverageMock = new MockRateProvider();
-            coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
+            if (MockRates)
             {
-                Exchange = "coinaverage",
-                CurrencyPair = CurrencyPair.Parse("BTC_USD"),
-                BidAsk = new BidAsk(5000m)
-            });
-            coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
-            {
-                Exchange = "coinaverage",
-                CurrencyPair = CurrencyPair.Parse("BTC_CAD"),
-                BidAsk = new BidAsk(4500m)
-            });
-            coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
-            {
-                Exchange = "coinaverage",
-                CurrencyPair = CurrencyPair.Parse("LTC_USD"),
-                BidAsk = new BidAsk(500m)
-            });
-            rateProvider.DirectProviders.Add("coinaverage", coinAverageMock);
+                var rateProvider = (RateProviderFactory)_Host.Services.GetService(typeof(RateProviderFactory));
+                rateProvider.Providers.Clear();
+
+                var coinAverageMock = new MockRateProvider();
+                coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
+                {
+                    Exchange = "coinaverage",
+                    CurrencyPair = CurrencyPair.Parse("BTC_USD"),
+                    BidAsk = new BidAsk(5000m)
+                });
+                coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
+                {
+                    Exchange = "coinaverage",
+                    CurrencyPair = CurrencyPair.Parse("BTC_CAD"),
+                    BidAsk = new BidAsk(4500m)
+                });
+                coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
+                {
+                    Exchange = "coinaverage",
+                    CurrencyPair = CurrencyPair.Parse("LTC_BTC"),
+                    BidAsk = new BidAsk(0.001m)
+                });
+                coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
+                {
+                    Exchange = "coinaverage",
+                    CurrencyPair = CurrencyPair.Parse("LTC_USD"),
+                    BidAsk = new BidAsk(500m)
+                });
+                rateProvider.Providers.Add("coinaverage", coinAverageMock);
+
+                var bitflyerMock = new MockRateProvider();
+                bitflyerMock.ExchangeRates.Add(new Rating.ExchangeRate()
+                {
+                    Exchange = "bitflyer",
+                    CurrencyPair = CurrencyPair.Parse("BTC_JPY"),
+                    BidAsk = new BidAsk(700000m)
+                });
+                rateProvider.Providers.Add("bitflyer", bitflyerMock);
+
+                var quadrigacx = new MockRateProvider();
+                quadrigacx.ExchangeRates.Add(new Rating.ExchangeRate()
+                {
+                    Exchange = "quadrigacx",
+                    CurrencyPair = CurrencyPair.Parse("BTC_CAD"),
+                    BidAsk = new BidAsk(6000m)
+                });
+                rateProvider.Providers.Add("quadrigacx", quadrigacx);
+
+                var bittrex = new MockRateProvider();
+                bittrex.ExchangeRates.Add(new Rating.ExchangeRate()
+                {
+                    Exchange = "bittrex",
+                    CurrencyPair = CurrencyPair.Parse("DOGE_BTC"),
+                    BidAsk = new BidAsk(0.004m)
+                });
+                rateProvider.Providers.Add("bittrex", bittrex);
+            }
         }
 
         public string HostName
@@ -171,7 +208,7 @@ namespace BTCPayServer.Tests
             {
                 context.User = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, userId) }, Policies.CookieAuthentication));
             }
-            if(storeId != null)
+            if (storeId != null)
             {
                 context.SetStoreData(GetService<StoreRepository>().FindStore(storeId, userId).GetAwaiter().GetResult());
             }

BTCPayServer.Tests/RateRulesTest.cs

@@ -46,8 +46,8 @@ namespace BTCPayServer.Tests
             {
                 Assert.Equal(test.Expected, rules.GetRuleFor(CurrencyPair.Parse(test.Pair)).ToString());
             }
-            rules.GlobalMultiplier = 2.32m;
-            Assert.Equal("(bittrex(DOGE_BTC) * gdax(BTC_USD) * 1.1) * 2.32", rules.GetRuleFor(CurrencyPair.Parse("DOGE_USD")).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());
             ////////////////
 
             // Check errors conditions
@@ -104,7 +104,7 @@ namespace BTCPayServer.Tests
             rule2.Reevaluate();
             Assert.False(rule2.HasError);
             Assert.Equal("5000 * 2000.4 * 1.1", rule2.ToString(true));
-            Assert.Equal(rule2.Value, 5000m * 2000.4m * 1.1m);
+            Assert.Equal(rule2.BidAsk.Bid, 5000m * 2000.4m * 1.1m);
             ////////
 
             // Make sure parenthesis are correctly calculated
@@ -113,22 +113,22 @@ namespace BTCPayServer.Tests
             builder.AppendLine("BTC_USD = -3 + coinbase(BTC_CAD) + 50 - 5");
             builder.AppendLine("DOGE_BTC = 2000");
             Assert.True(RateRules.TryParse(builder.ToString(), out rules));
-            rules.GlobalMultiplier = 1.1m;
+            rules.Spread = 0.1m;
 
             rule2 = rules.GetRuleFor(CurrencyPair.Parse("DOGE_USD"));
-            Assert.Equal("(2000 * (-3 + coinbase(BTC_CAD) + 50 - 5)) * 1.1", rule2.ToString());
+            Assert.Equal("(2000 * (-3 + coinbase(BTC_CAD) + 50 - 5)) * (0.9, 1.1)", rule2.ToString());
             rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(1000m));
             Assert.True(rule2.Reevaluate());
-            Assert.Equal("(2000 * (-3 + 1000 + 50 - 5)) * 1.1", rule2.ToString(true));
-            Assert.Equal((2000m * (-3m + 1000m + 50m - 5m)) * 1.1m, rule2.Value.Value);
+            Assert.Equal("(2000 * (-3 + 1000 + 50 - 5)) * (0.9, 1.1)", rule2.ToString(true));
+            Assert.Equal((2000m * (-3m + 1000m + 50m - 5m)) * 0.9m, rule2.BidAsk.Bid);
 
             // Test inverse
             rule2 = rules.GetRuleFor(CurrencyPair.Parse("USD_DOGE"));
-            Assert.Equal("(1 / (2000 * (-3 + coinbase(BTC_CAD) + 50 - 5))) * 1.1", rule2.ToString());
+            Assert.Equal("(1 / (2000 * (-3 + coinbase(BTC_CAD) + 50 - 5))) * (0.9, 1.1)", rule2.ToString());
             rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(1000m));
             Assert.True(rule2.Reevaluate());
-            Assert.Equal("(1 / (2000 * (-3 + 1000 + 50 - 5))) * 1.1", rule2.ToString(true));
-            Assert.Equal((1.0m / (2000m * (-3m + 1000m + 50m - 5m))) * 1.1m, rule2.Value.Value);
+            Assert.Equal("(1 / (2000 * (-3 + 1000 + 50 - 5))) * (0.9, 1.1)", rule2.ToString(true));
+            Assert.Equal((1.0m / (2000m * (-3m + 1000m + 50m - 5m))) * 0.9m, rule2.BidAsk.Bid);
             ////////
 
             // Make sure kraken is not converted to CurrencyPair
@@ -147,12 +147,12 @@ namespace BTCPayServer.Tests
             rule2.ExchangeRates.SetRate("kraken", CurrencyPair.Parse("BTC_USD"), new BidAsk(6000m, 6100m));
             Assert.True(rule2.Reevaluate());
             Assert.Equal("(6000, 6100)", rule2.ToString(true));
-            Assert.Equal(6000m, rule2.Value.Value);
+            Assert.Equal(6000m, rule2.BidAsk.Bid);
             rule2 = rules.GetRuleFor(CurrencyPair.Parse("USD_BTC"));
             rule2.ExchangeRates.SetRate("kraken", CurrencyPair.Parse("BTC_USD"), new BidAsk(6000m, 6100m));
             Assert.True(rule2.Reevaluate());
             Assert.Equal("1 / (6000, 6100)", rule2.ToString(true));
-            Assert.Equal(1m / 6100m, rule2.Value.Value);
+            Assert.Equal(1m / 6100m, rule2.BidAsk.Bid);
 
             // Make sure the inverse has more priority than X_X or CDNT_X
             builder = new StringBuilder();

BTCPayServer.Tests/TestAccount.cs

@@ -14,6 +14,7 @@ using Xunit;
 using NBXplorer.DerivationStrategy;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
+using BTCPayServer.Tests.Logging;
 
 namespace BTCPayServer.Tests
 {

BTCPayServer.Tests/UnitTest1.cs

@@ -35,6 +35,7 @@ using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Stores;
 using System.Net.Http;
 using System.Text;
+using BTCPayServer.Models;
 using BTCPayServer.Rating;
 using BTCPayServer.Validation;
 using ExchangeSharp;
@@ -397,6 +398,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Flaky", "Flaky")]
         public void CanSetLightningServer()
         {
             using (var tester = ServerTester.Create())
@@ -521,14 +523,14 @@ namespace BTCPayServer.Tests
 
             // We get this format from "openssl x509 -noout -fingerprint -sha256 -inform pem -in <certificate>"
             var certthumbprint2 = "C5:1B:B1:D4:02:30:6D:0D:A0:0E:85:58:1B:32:AA:56:16:6B:CB:AB:7E:B8:88:FF:92:5D:71:67:EB:43:6D:06";
-            
+
             var lndUri = $"type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;macaroon={macaroon};certthumbprint={certthumbprint}";
             var lndUri2 = $"type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;macaroon={macaroon};certthumbprint={certthumbprint2}";
 
             var certificateHash = new X509Certificate2(Encoders.Hex.DecodeData("2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d494942396a4343415a7967417749424167495156397a62474252724e54716b4e4b55676d72524d377a414b42676771686b6a4f50515144416a41784d5238770a485159445651514b45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d51347744415944565151444577564754304e56557a41650a467730784f4441304d6a55794d7a517a4d6a4261467730784f5441324d6a41794d7a517a4d6a42614d444578487a416442674e5642416f54466d78755a4342680a645852765a3256755a584a686447566b49474e6c636e5178446a414d42674e5642414d5442555a50513156544d466b77457759484b6f5a497a6a3043415159490a4b6f5a497a6a304441516344516741454b7557424568564f75707965434157476130766e713262712f59396b41755a78616865646d454553482b753936436d450a397577486b4b2b4a7667547a66385141783550513741357254637155374b57595170303175364f426c5443426b6a414f42674e56485138424166384542414d430a4171517744775944565230544151482f42415577417745422f7a427642674e56485245456144426d6767564754304e565534494a6247396a5957786f62334e300a6877522f4141414268784141414141414141414141414141414141414141414268775373474f69786877514b41457342687753702f717473687754417141724c0a687753702f6d4a72687753702f754f77687753702f714e59687753702f6874436877514b70514157687753702f6c42514d416f4743437147534d343942414d430a413067414d45554349464866716d595a5043647a4a5178386b47586859473834394c31766541364c784d6f7a4f5774356d726835416945413662756e51556c710a6558553070474168776c3041654d726a4d4974394c7652736179756162565a593278343d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a"))
                             .GetCertHash(System.Security.Cryptography.HashAlgorithmName.SHA256);
 
-            
+
             Assert.True(LightningConnectionString.TryParse(lndUri, false, out conn));
             Assert.True(LightningConnectionString.TryParse(lndUri2, false, out var conn2));
             Assert.Equal(conn2.ToString(), conn.ToString());
@@ -545,18 +547,21 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Flaky", "Flaky")]
         public void CanSendLightningPaymentCLightning()
         {
             ProcessLightningPayment(LightningConnectionType.CLightning);
         }
 
         [Fact]
+        [Trait("Flaky", "Flaky")]
         public void CanSendLightningPaymentCharge()
         {
             ProcessLightningPayment(LightningConnectionType.Charge);
         }
 
         [Fact]
+        [Trait("Flaky", "Flaky")]
         public void CanSendLightningPaymentLnd()
         {
             ProcessLightningPayment(LightningConnectionType.LndREST);
@@ -574,7 +579,7 @@ namespace BTCPayServer.Tests
                 user.GrantAccess();
                 user.RegisterLightningNode("BTC", type);
                 user.RegisterDerivationScheme("BTC");
-                
+
                 tester.PrepareLightning(type);
 
                 Task.WaitAll(CanSendLightningPaymentCore(tester, user));
@@ -731,6 +736,40 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        public void CanGetRates()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var acc = tester.NewAccount();
+                acc.GrantAccess();
+                acc.RegisterDerivationScheme("BTC");
+                acc.RegisterDerivationScheme("LTC");
+
+                var rateController = acc.GetController<RateController>();
+                var GetBaseCurrencyRatesResult = JObject.Parse(((JsonResult)rateController.GetBaseCurrencyRates("BTC", acc.StoreId)
+                    .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
+                Assert.NotNull(GetBaseCurrencyRatesResult);
+                Assert.NotNull(GetBaseCurrencyRatesResult.Data);
+                Assert.Equal(2, GetBaseCurrencyRatesResult.Data.Length);
+                Assert.Single(GetBaseCurrencyRatesResult.Data.Where(o => o.Code == "LTC"));
+
+                var GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, acc.StoreId)
+                    .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
+                Assert.NotNull(GetRatesResult);
+                Assert.NotNull(GetRatesResult.Data);
+                Assert.Equal(2, GetRatesResult.Data.Length);
+
+                var GetCurrencyPairRateResult = JObject.Parse(((JsonResult)rateController.GetCurrencyPairRate("BTC", "LTC", acc.StoreId)
+                    .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate>>();
+
+                Assert.NotNull(GetCurrencyPairRateResult);
+                Assert.NotNull(GetCurrencyPairRateResult.Data);
+                Assert.Equal("LTC", GetCurrencyPairRateResult.Data.Code);
+            }
+        }
+
         private void AssertSearchInvoice(TestAccount acc, bool expected, string invoiceId, string filter)
         {
             var result = (Models.InvoicingModels.InvoicesModel)((ViewResult)acc.GetController<InvoiceController>().ListInvoices(filter).Result).Model;
@@ -814,6 +853,22 @@ namespace BTCPayServer.Tests
             Assert.Equal("abed2", search.Filters["status"].Skip(1).First());
         }
 
+        [Fact]
+        public void CanParseFingerprint()
+        {
+            Assert.True(SSH.SSHFingerprint.TryParse("4e343c6fc6cfbf9339c02d06a151e1dd", out var unused));
+            Assert.Equal("4e:34:3c:6f:c6:cf:bf:93:39:c0:2d:06:a1:51:e1:dd", unused.ToString());
+            Assert.True(SSH.SSHFingerprint.TryParse("4e:34:3c:6f:c6:cf:bf:93:39:c0:2d:06:a1:51:e1:dd", out unused));
+            Assert.True(SSH.SSHFingerprint.TryParse("SHA256:Wl7CdRgT4u5T7yPMsxSrlFP+HIJJWwidGkzphJ8di5w", out unused));
+            Assert.True(SSH.SSHFingerprint.TryParse("SHA256:Wl7CdRgT4u5T7yPMsxSrlFP+HIJJWwidGkzphJ8di5w=", out unused));
+            Assert.True(SSH.SSHFingerprint.TryParse("Wl7CdRgT4u5T7yPMsxSrlFP+HIJJWwidGkzphJ8di5w=", out unused));
+            Assert.Equal("SHA256:Wl7CdRgT4u5T7yPMsxSrlFP+HIJJWwidGkzphJ8di5w", unused.ToString());
+
+            Assert.True(SSH.SSHFingerprint.TryParse("Wl7CdRgT4u5T7yPMsxSrlFP+HIJJWwidGkzphJ8di5w=", out var f1));
+            Assert.True(SSH.SSHFingerprint.TryParse("SHA256:Wl7CdRgT4u5T7yPMsxSrlFP+HIJJWwidGkzphJ8di5w", out var f2));
+            Assert.Equal(f1.ToString(), f2.ToString());
+        }
+
         [Fact]
         public void TestAccessBitpayAPI()
         {
@@ -892,8 +947,8 @@ namespace BTCPayServer.Tests
                 user.RegisterDerivationScheme("BTC");
                 List<decimal> rates = new List<decimal>();
                 rates.Add(CreateInvoice(tester, user, "coinaverage"));
-                var bitflyer = CreateInvoice(tester, user, "bitflyer");
-                var bitflyer2 = CreateInvoice(tester, user, "bitflyer");
+                var bitflyer = CreateInvoice(tester, user, "bitflyer", "JPY");
+                var bitflyer2 = CreateInvoice(tester, user, "bitflyer", "JPY");
                 Assert.Equal(bitflyer, bitflyer2); // Should be equal because cache
                 rates.Add(bitflyer);
 
@@ -904,7 +959,7 @@ namespace BTCPayServer.Tests
             }
         }
 
-        private static decimal CreateInvoice(ServerTester tester, TestAccount user, string exchange)
+        private static decimal CreateInvoice(ServerTester tester, TestAccount user, string exchange, string currency = "USD")
         {
             var storeController = user.GetController<StoresController>();
             var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model;
@@ -913,7 +968,7 @@ namespace BTCPayServer.Tests
             var invoice2 = user.BitPay.CreateInvoice(new Invoice()
             {
                 Price = 5000.0m,
-                Currency = "USD",
+                Currency = currency,
                 PosData = "posData",
                 OrderId = "orderId",
                 ItemDesc = "Some description",
@@ -927,12 +982,10 @@ namespace BTCPayServer.Tests
         {
             using (var tester = ServerTester.Create())
             {
-                tester.PayTester.MockRates = false;
                 tester.Start();
                 var user = tester.NewAccount();
                 user.GrantAccess();
                 user.RegisterDerivationScheme("BTC");
-
                 // First we try payment with a merchant having only BTC
                 var invoice1 = user.BitPay.CreateInvoice(new Invoice()
                 {
@@ -943,12 +996,12 @@ namespace BTCPayServer.Tests
                     ItemDesc = "Some description",
                     FullNotifications = true
                 }, Facade.Merchant);
-
+                Assert.Equal(Money.Coins(1.0m), invoice1.BtcPrice);
 
                 var storeController = user.GetController<StoresController>();
                 var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model;
-                Assert.Equal(1.0, vm.RateMultiplier);
-                vm.RateMultiplier = 0.5;
+                Assert.Equal(0.0, vm.Spread);
+                vm.Spread = 40;
                 storeController.Rates(vm).Wait();
 
 
@@ -962,7 +1015,9 @@ namespace BTCPayServer.Tests
                     FullNotifications = true
                 }, Facade.Merchant);
 
-                Assert.True(invoice2.BtcPrice.Almost(invoice1.BtcPrice * 2, 0.00001m));
+                var expectedRate = 5000.0m * 0.6m;
+                var expectedCoins = invoice2.Price / expectedRate;
+                Assert.True(invoice2.BtcPrice.Almost(Money.Coins(expectedCoins), 0.00001m));
             }
         }
 
@@ -1044,7 +1099,7 @@ namespace BTCPayServer.Tests
                 var rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
                 Assert.False(rateVm.ShowScripting);
                 Assert.Equal("coinaverage", rateVm.PreferredExchange);
-                Assert.Equal(1.0, rateVm.RateMultiplier);
+                Assert.Equal(0.0, rateVm.Spread);
                 Assert.Null(rateVm.TestRateRules);
 
                 rateVm.PreferredExchange = "bitflyer";
@@ -1053,13 +1108,13 @@ namespace BTCPayServer.Tests
                 Assert.Equal("bitflyer", rateVm.PreferredExchange);
 
                 rateVm.ScriptTest = "BTC_JPY,BTC_CAD";
-                rateVm.RateMultiplier = 1.1;
+                rateVm.Spread = 10;
                 store = user.GetController<StoresController>();
                 rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(rateVm, "Test").Result).Model);
                 Assert.NotNull(rateVm.TestRateRules);
                 Assert.Equal(2, rateVm.TestRateRules.Count);
                 Assert.False(rateVm.TestRateRules[0].Error);
-                Assert.StartsWith("(bitflyer(BTC_JPY)) * 1.10 =", rateVm.TestRateRules[0].Rule, StringComparison.OrdinalIgnoreCase);
+                Assert.StartsWith("(bitflyer(BTC_JPY)) * (0.9, 1.1) =", rateVm.TestRateRules[0].Rule, StringComparison.OrdinalIgnoreCase);
                 Assert.True(rateVm.TestRateRules[1].Error);
                 Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
 
@@ -1072,19 +1127,19 @@ namespace BTCPayServer.Tests
                 rateVm.ScriptTest = "BTC_JPY";
                 rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(rateVm, "Test").Result).Model);
                 Assert.True(rateVm.ShowScripting);
-                Assert.Contains("(bitflyer(BTC_JPY)) * 1.10 = ", rateVm.TestRateRules[0].Rule, StringComparison.OrdinalIgnoreCase);
+                Assert.Contains("(bitflyer(BTC_JPY)) * (0.9, 1.1) = ", rateVm.TestRateRules[0].Rule, StringComparison.OrdinalIgnoreCase);
 
                 rateVm.ScriptTest = "BTC_USD,BTC_CAD,DOGE_USD,DOGE_CAD";
                 rateVm.Script = "DOGE_X = bittrex(DOGE_BTC) * BTC_X;\n" +
                                 "X_CAD = quadrigacx(X_CAD);\n" +
-                                 "X_X = gdax(X_X);";
-                rateVm.RateMultiplier = 0.5;
+                                 "X_X = coinaverage(X_X);";
+                rateVm.Spread = 50;
                 rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(rateVm, "Test").Result).Model);
                 Assert.True(rateVm.TestRateRules.All(t => !t.Error));
                 Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
                 store = user.GetController<StoresController>();
                 rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
-                Assert.Equal(0.5, rateVm.RateMultiplier);
+                Assert.Equal(50, rateVm.Spread);
                 Assert.True(rateVm.ShowScripting);
                 Assert.Contains("DOGE_X", rateVm.Script, StringComparison.OrdinalIgnoreCase);
             }
@@ -1261,6 +1316,64 @@ namespace BTCPayServer.Tests
             Assert.Equal($"{tpub}-[p2sh]", result.ToString());
         }
 
+        [Fact]
+        public void CanDisablePaymentMethods()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                user.RegisterDerivationScheme("BTC");
+                user.RegisterDerivationScheme("LTC");
+                user.RegisterLightningNode("BTC", LightningConnectionType.CLightning);
+
+                var invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 1.5m,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+                Assert.Equal(3, invoice.CryptoInfo.Length);
+
+                var controller = user.GetController<StoresController>();
+                var lightningVM = (LightningNodeViewModel)Assert.IsType<ViewResult>(controller.AddLightningNode(user.StoreId, "BTC")).Model;
+                Assert.True(lightningVM.Enabled);
+                lightningVM.Enabled = false;
+                controller.AddLightningNode(user.StoreId, lightningVM, "save", "BTC").GetAwaiter().GetResult();
+                lightningVM = (LightningNodeViewModel)Assert.IsType<ViewResult>(controller.AddLightningNode(user.StoreId, "BTC")).Model;
+                Assert.False(lightningVM.Enabled);
+
+                var derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                Assert.True(derivationVM.Enabled);
+                derivationVM.Enabled = false;
+                Assert.IsType<RedirectToActionResult>(controller.AddDerivationScheme(user.StoreId, derivationVM, "BTC").GetAwaiter().GetResult());
+                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                // Confirmation
+                controller.AddDerivationScheme(user.StoreId, derivationVM, "BTC").GetAwaiter().GetResult();
+                Assert.False(derivationVM.Enabled);
+                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                Assert.False(derivationVM.Enabled);
+
+                invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 1.5m,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+                Assert.Single(invoice.CryptoInfo);
+                Assert.Equal("LTC", invoice.CryptoInfo[0].CryptoCode);
+            }
+        }
+
         [Fact]
         public void CanSetPaymentMethodLimits()
         {
@@ -1553,15 +1666,17 @@ namespace BTCPayServer.Tests
         [Fact]
         public void CanQueryDirectProviders()
         {
-            var provider = new BTCPayNetworkProvider(NetworkType.Mainnet);
-            var factory = CreateBTCPayRateFactory(provider);
+            var factory = CreateBTCPayRateFactory();
 
             foreach (var result in factory
-                .DirectProviders
-                .Select(p => (ExpectedName: p.Key, ResultAsync: p.Value.GetRatesAsync()))
+                .Providers
+                .Where(p => p.Value is BackgroundFetcherRateProvider)
+                .Select(p => (ExpectedName: p.Key, ResultAsync: p.Value.GetRatesAsync(), Fetcher: (BackgroundFetcherRateProvider)p.Value))
                 .ToList())
             {
+                result.Fetcher.InvalidateCache();
                 var exchangeRates = result.ResultAsync.Result;
+                result.Fetcher.InvalidateCache();
                 Assert.NotNull(exchangeRates);
                 Assert.NotEmpty(exchangeRates);
                 Assert.NotEmpty(exchangeRates.ByExchange[result.ExpectedName]);
@@ -1574,68 +1689,118 @@ namespace BTCPayServer.Tests
                                && e.BidAsk.Bid > 1.0m // 1BTC will always be more than 1USD
                                );
             }
+            // Kraken emit one request only after first GetRates
+            factory.Providers["kraken"].GetRatesAsync().GetAwaiter().GetResult();
         }
 
         [Fact]
         public void CanGetRateCryptoCurrenciesByDefault()
         {
             var provider = new BTCPayNetworkProvider(NetworkType.Mainnet);
-            var factory = CreateBTCPayRateFactory(provider);
-
+            var factory = CreateBTCPayRateFactory();
+            var fetcher = new RateFetcher(factory);
             var pairs =
                     provider.GetAll()
                     .Select(c => new CurrencyPair(c.CryptoCode, "USD"))
                     .ToHashSet();
 
             var rules = new StoreBlob().GetDefaultRateRules(provider);
-            var result = factory.FetchRates(pairs, rules);
+            var result = fetcher.FetchRates(pairs, rules);
             foreach (var value in result)
             {
                 var rateResult = value.Value.GetAwaiter().GetResult();
-                Assert.NotNull(rateResult.Value);
+                Assert.NotNull(rateResult.BidAsk);
             }
         }
 
-        private static BTCPayRateProviderFactory CreateBTCPayRateFactory(BTCPayNetworkProvider provider)
+        private static RateProviderFactory CreateBTCPayRateFactory()
         {
-            return new BTCPayRateProviderFactory(new MemoryCacheOptions() { ExpirationScanFrequency = TimeSpan.FromSeconds(1.0) }, provider, new CoinAverageSettings());
+            return new RateProviderFactory(CreateMemoryCache(), null, new CoinAverageSettings());
+        }
+
+        private static MemoryCacheOptions CreateMemoryCache()
+        {
+            return new MemoryCacheOptions() { ExpirationScanFrequency = TimeSpan.FromSeconds(1.0) };
+        }
+
+        class SpyRateProvider : IRateProvider
+        {
+            public bool Hit { get; set; }
+            public Task<ExchangeRates> GetRatesAsync()
+            {
+                Hit = true;
+                var rates = new ExchangeRates();
+                rates.Add(new ExchangeRate("coinaverage", CurrencyPair.Parse("BTC_USD"), new BidAsk(5000)));
+                return Task.FromResult(rates);
+            }
+
+            public void AssertHit()
+            {
+                Assert.True(Hit, "Should have hit the provider");
+                Hit = false;
+            }
+            public void AssertNotHit()
+            {
+                Assert.False(Hit, "Should have not hit the provider");
+                Hit = false;
+            }
         }
 
         [Fact]
         public void CheckRatesProvider()
         {
-            var provider = new BTCPayNetworkProvider(NetworkType.Mainnet);
-            var coinAverage = new CoinAverageRateProvider();
-            var rates = coinAverage.GetRatesAsync().GetAwaiter().GetResult();
-            Assert.NotNull(rates.GetRate("coinaverage", new CurrencyPair("BTC", "JPY")));
-            var ratesBitpay = new BitpayRateProvider(new Bitpay(new Key(), new Uri("https://bitpay.com/"))).GetRatesAsync().GetAwaiter().GetResult();
-            Assert.NotNull(ratesBitpay.GetRate("bitpay", new CurrencyPair("BTC", "JPY")));
-
+            var spy = new SpyRateProvider();
             RateRules.TryParse("X_X = coinaverage(X_X);", out var rateRules);
 
-            var factory = CreateBTCPayRateFactory(provider);
-            factory.CacheSpan = TimeSpan.FromSeconds(10);
+            var factory = CreateBTCPayRateFactory();
+            factory.Providers.Clear();
+            factory.Providers.Add("coinaverage", new CachedRateProvider("coinaverage", spy, new MemoryCache(CreateMemoryCache())));
+            factory.Providers.Add("bittrex", new CachedRateProvider("bittrex", spy, new MemoryCache(CreateMemoryCache())));
+            factory.CacheSpan = TimeSpan.FromSeconds(1);
 
-            var fetchedRate = factory.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
-            Assert.False(fetchedRate.Cached);
-            fetchedRate = factory.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
-            Assert.True(fetchedRate.Cached);
+            var fetcher = new RateFetcher(factory);
 
-            Thread.Sleep(11000);
-            fetchedRate = factory.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
-            Assert.False(fetchedRate.Cached);
-            fetchedRate = factory.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
-            Assert.True(fetchedRate.Cached);
+            var fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            spy.AssertHit();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            spy.AssertNotHit();
+
+            Thread.Sleep(3000);
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            spy.AssertHit();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            spy.AssertNotHit();
             // Should cache at exchange level so this should hit the cache
-            var fetchedRate2 = factory.FetchRate(CurrencyPair.Parse("LTC_USD"), rateRules).GetAwaiter().GetResult();
-            Assert.True(fetchedRate.Cached);
-            Assert.NotEqual(fetchedRate.Value.Value, fetchedRate2.Value.Value);
+            var fetchedRate2 = fetcher.FetchRate(CurrencyPair.Parse("LTC_USD"), rateRules).GetAwaiter().GetResult();
+            spy.AssertNotHit();
+            Assert.Null(fetchedRate2.BidAsk);
+            Assert.Equal(RateRulesErrors.RateUnavailable, fetchedRate2.Errors.First());
 
             // Should cache at exchange level this should not hit the cache as it is different exchange
             RateRules.TryParse("X_X = bittrex(X_X);", out rateRules);
-            fetchedRate = factory.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
-            Assert.False(fetchedRate.Cached);
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            spy.AssertHit();
 
+            factory.Providers.Clear();
+            var fetch = new BackgroundFetcherRateProvider(spy);
+            fetch.DoNotAutoFetchIfExpired = true;
+            factory.Providers.Add("bittrex", fetch);
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            spy.AssertHit();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            spy.AssertNotHit();
+            fetch.UpdateIfNecessary().GetAwaiter().GetResult();
+            spy.AssertNotHit();
+            fetch.RefreshRate = TimeSpan.FromSeconds(1.0);
+            Thread.Sleep(1020);
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            spy.AssertNotHit();
+            fetch.ValidatyTime = TimeSpan.FromSeconds(1.0);
+            fetch.UpdateIfNecessary().GetAwaiter().GetResult();
+            spy.AssertHit();
+            fetch.GetRatesAsync().GetAwaiter().GetResult();
+            Thread.Sleep(1000);
+            Assert.Throws<InvalidOperationException>(() => fetch.GetRatesAsync().GetAwaiter().GetResult());
         }
 
         private static bool IsMapped(Invoice invoice, ApplicationDbContext ctx)

BTCPayServer.Tests/docker-compose.yml

@@ -63,7 +63,7 @@ services:
 
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.2.14
+    image: nicolasdorier/nbxplorer:1.0.2.31
     ports:
       - "32838:32838"
     expose: 
@@ -122,6 +122,7 @@ services:
         announce-addr=customer_lightningd
         log-level=debug
         dev-broadcast-interval=1000
+        dev-bitcoind-poll=1
     ports:
       - "30992:9835" # api port
     expose:
@@ -213,6 +214,7 @@ services:
         no-macaroons=1
         debuglevel=debug
         noencryptwallet=1
+        trickledelay=1000
     ports:
       - "53280:8080"
     expose:
@@ -237,6 +239,7 @@ services:
         no-macaroons=1
         debuglevel=debug
         noencryptwallet=1
+        trickledelay=1000
     ports:
       - "53281:8080"
     expose:

BTCPayServer/BTCPayNetworkProvider.Dash.cs

@@ -0,0 +1,35 @@
+using NBitcoin;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitDash()
+        {
+            //not needed: NBitcoin.Altcoins.Dash.Instance.EnsureRegistered();
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("DASH");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                DisplayName = "Dash",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet
+                    ? "https://insight.dash.org/insight/tx/{0}"
+                    : "https://testnet-insight.dashevo.org/insight/tx/{0}",
+                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "dash",
+                DefaultRateRules = new[]
+                    {
+                        "DASH_X = DASH_BTC * BTC_X",
+                        "DASH_BTC = bittrex(DASH_BTC)"
+                    },
+                CryptoImagePath = "imlegacy/dash.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                //https://github.com/satoshilabs/slips/blob/master/slip-0044.md
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("5'")
+                    : new KeyPath("1'"),
+                MinFee = Money.Satoshis(1m)
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.cs

@@ -50,6 +50,7 @@ namespace BTCPayServer
             InitDogecoin();
             InitBitcoinGold();
             InitMonacoin();
+            InitDash();
             InitPolis();
             InitFeathercoin();
             InitGroestlcoin();

BTCPayServer/BTCPayServer.csproj

@@ -2,9 +2,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.60</Version>
+		<Version>1.0.2.102</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
+  <PropertyGroup>
+    <LangVersion>7.3</LangVersion>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
     <Compile Remove="wwwroot\bundles\jqueryvalidate\**" />
@@ -31,23 +34,25 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
-    <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.4.1" />
+    <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
     <PackageReference Include="Hangfire" Version="1.6.19" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
     <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.2" />
-    <PackageReference Include="LedgerWallet" Version="2.0.0" />
+    <PackageReference Include="LedgerWallet" Version="2.0.0.1" />
     <PackageReference Include="Meziantou.AspNetCore.BundleTagHelpers" Version="2.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.0" />
-    <PackageReference Include="NBitcoin" Version="4.1.1.31" />
+    <PackageReference Include="NBitcoin" Version="4.1.1.45" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.29" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.2.14" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.2.18" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
-    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.16" />
+    <PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" />
+    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.17" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0" />
+    <PackageReference Include="SSH.NET" Version="2016.1.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
     <PackageReference Include="Text.Analyzers" Version="2.6.0" />
   </ItemGroup>
@@ -115,12 +120,42 @@
 	</ItemGroup>
 
 	<ItemGroup>
+    <Content Update="Views\Server\SSHService.cshtml">
+      <Pack>$(IncludeRazorContentInPack)</Pack>
+    </Content>
+	  <Content Update="Views\Stores\PayButton.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
+	  <Content Update="Views\Stores\PayButtonHandle.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
+	  <Content Update="Views\Stores\PayButtonTest.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
 	  <Content Update="Views\Server\LNDGRPCServices.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>
+	  <Content Update="Views\Server\Maintenance.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
 	  <Content Update="Views\Server\Services.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>
+	  <Content Update="Views\Wallets\ListWallets.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
+	  <Content Update="Views\Wallets\WalletTransactions.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
+	  <Content Update="Views\Wallets\_Nav.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
+	  <Content Update="Views\Wallets\_ViewImports.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
+	  <Content Update="Views\Wallets\_ViewStart.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
 	</ItemGroup>
 
 	<ItemGroup>

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -11,6 +11,9 @@ using StandardConfiguration;
 using Microsoft.Extensions.Configuration;
 using NBXplorer;
 using BTCPayServer.Payments.Lightning;
+using Renci.SshNet;
+using NBitcoin.DataEncoders;
+using BTCPayServer.SSH;
 
 namespace BTCPayServer.Configuration
 {
@@ -117,6 +120,45 @@ namespace BTCPayServer.Configuration
             BundleJsCss = conf.GetOrDefault<bool>("bundlejscss", true);
             ExternalUrl = conf.GetOrDefault<Uri>("externalurl", null);
 
+            var sshSettings = ParseSSHConfiguration(conf);
+            if ((!string.IsNullOrEmpty(sshSettings.Password) || !string.IsNullOrEmpty(sshSettings.KeyFile)) && !string.IsNullOrEmpty(sshSettings.Server))
+            {
+                int waitTime = 0;
+                while (!string.IsNullOrEmpty(sshSettings.KeyFile) && !File.Exists(sshSettings.KeyFile))
+                {
+                    if(waitTime++ < 5)
+                        System.Threading.Thread.Sleep(1000);
+                    else
+                        throw new ConfigException($"sshkeyfile does not exist");
+                }
+                    
+                if (sshSettings.Port > ushort.MaxValue ||
+                   sshSettings.Port < ushort.MinValue)
+                    throw new ConfigException($"ssh port is invalid");
+                if (!string.IsNullOrEmpty(sshSettings.Password) && !string.IsNullOrEmpty(sshSettings.KeyFile))
+                    throw new ConfigException($"sshpassword or sshkeyfile should be provided, but not both");
+                try
+                {
+                    sshSettings.CreateConnectionInfo();
+                }
+                catch
+                {
+                    throw new ConfigException($"sshkeyfilepassword is invalid");
+                }
+                SSHSettings = sshSettings;
+            }
+
+            var fingerPrints = conf.GetOrDefault<string>("sshtrustedfingerprints", "");
+            if (!string.IsNullOrEmpty(fingerPrints))
+            {
+                foreach (var fingerprint in fingerPrints.Split(';', StringSplitOptions.RemoveEmptyEntries))
+                {
+                    if (!SSHFingerprint.TryParse(fingerprint, out var f))
+                        throw new ConfigException($"Invalid ssh fingerprint format {fingerprint}");
+                    TrustedFingerprints.Add(f);
+                }
+            }
+
             RootPath = conf.GetOrDefault<string>("rootpath", "/");
             if (!RootPath.StartsWith("/", StringComparison.InvariantCultureIgnoreCase))
                 RootPath = "/" + RootPath;
@@ -124,6 +166,53 @@ namespace BTCPayServer.Configuration
             if (old != null)
                 throw new ConfigException($"internallightningnode should not be used anymore, use btclightning instead");
         }
+
+        private SSHSettings ParseSSHConfiguration(IConfiguration conf)
+        {
+            var externalUrl = conf.GetOrDefault<Uri>("externalurl", null);
+            var settings = new SSHSettings();
+            settings.Server = conf.GetOrDefault<string>("sshconnection", null);
+            if (settings.Server != null)
+            {
+                var parts = settings.Server.Split(':');
+                if (parts.Length == 2 && int.TryParse(parts[1], out int port))
+                {
+                    settings.Port = port;
+                    settings.Server = parts[0];
+                }
+                else
+                {
+                    settings.Port = 22;
+                }
+
+                parts = settings.Server.Split('@');
+                if (parts.Length == 2)
+                {
+                    settings.Username = parts[0];
+                    settings.Server = parts[1];
+                }
+                else
+                {
+                    settings.Username = "root";
+                }
+            }
+            else if (externalUrl != null)
+            {
+                settings.Port = 22;
+                settings.Username = "root";
+                settings.Server = externalUrl.DnsSafeHost;
+            }
+            settings.Password = conf.GetOrDefault<string>("sshpassword", "");
+            settings.KeyFile = conf.GetOrDefault<string>("sshkeyfile", "");
+            settings.KeyFilePassword = conf.GetOrDefault<string>("sshkeyfilepassword", "");
+            return settings;
+        }
+
+        internal bool IsTrustedFingerprint(byte[] fingerPrint, byte[] hostKey)
+        {
+            return TrustedFingerprints.Any(f => f.Match(fingerPrint, hostKey));
+        }
+
         public string RootPath { get; set; }
         public Dictionary<string, LightningConnectionString> InternalLightningByCryptoCode { get; set; } = new Dictionary<string, LightningConnectionString>();
         public ExternalServices ExternalServicesByCryptoCode { get; set; } = new ExternalServices();
@@ -144,6 +233,12 @@ namespace BTCPayServer.Configuration
             get;
             set;
         }
+        public List<SSHFingerprint> TrustedFingerprints { get; set; } = new List<SSHFingerprint>();
+        public SSHSettings SSHSettings
+        {
+            get;
+            set;
+        }
 
         internal string GetRootUri()
         {
@@ -154,7 +249,7 @@ namespace BTCPayServer.Configuration
             return builder.ToString();
         }
     }
-    
+
     public class ExternalServices : MultiValueDictionary<string, ExternalService>
     {
         public IEnumerable<T> GetServices<T>(string cryptoCode) where T : ExternalService

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -34,6 +34,11 @@ namespace BTCPayServer.Configuration
             app.Option("--externalurl", $"The expected external URL of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
             app.Option("--bundlejscss", $"Bundle JavaScript and CSS files for better performance (default: true)", CommandOptionType.SingleValue);
             app.Option("--rootpath", "The root path in the URL to access BTCPay (default: /)", CommandOptionType.SingleValue);
+            app.Option("--sshconnection", "SSH server to manage BTCPay under the form user@server:port (default: root@externalhost or empty)", CommandOptionType.SingleValue);
+            app.Option("--sshpassword", "SSH password to manage BTCPay (default: empty)", CommandOptionType.SingleValue);
+            app.Option("--sshkeyfile", "SSH private key file to manage BTCPay (default: empty)", CommandOptionType.SingleValue);
+            app.Option("--sshkeyfilepassword", "Password of the SSH keyfile (default: empty)", CommandOptionType.SingleValue);
+            app.Option("--sshtrustedfingerprints", "SSH Host public key fingerprint or sha256 (default: empty, it will allow untrusted connections)", CommandOptionType.SingleValue);
             foreach (var network in provider.GetAll())
             {
                 var crypto = network.CryptoCode.ToLowerInvariant();

BTCPayServer/Controllers/AccountController.cs

@@ -17,6 +17,8 @@ using BTCPayServer.Services.Mails;
 using BTCPayServer.Services.Stores;
 using BTCPayServer.Logging;
 using BTCPayServer.Security;
+using System.Globalization;
+using NicolasDorier.RateLimits;
 
 namespace BTCPayServer.Controllers
 {
@@ -69,6 +71,7 @@ namespace BTCPayServer.Controllers
         [HttpPost]
         [AllowAnonymous]
         [ValidateAntiForgeryToken]
+        [RateLimitsFilter(ZoneLimits.Login, Scope = RateLimitsScope.RemoteAddress)]
         public async Task<IActionResult> Login(LoginViewModel model, string returnUrl = null)
         {
             ViewData["ReturnUrl"] = returnUrl;
@@ -236,23 +239,25 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [AllowAnonymous]
-        public async Task<IActionResult> Register(string returnUrl = null)
+        public async Task<IActionResult> Register(string returnUrl = null, bool logon = true)
         {
             var policies = await _SettingsRepository.GetSettingAsync<PoliciesSettings>() ?? new PoliciesSettings();
-            if (policies.LockSubscription)
+            if (policies.LockSubscription && !User.IsInRole(Roles.ServerAdmin))
                 return RedirectToAction(nameof(HomeController.Index), "Home");
             ViewData["ReturnUrl"] = returnUrl;
+            ViewData["Logon"] = logon.ToString(CultureInfo.InvariantCulture).ToLowerInvariant();
             return View();
         }
 
         [HttpPost]
         [AllowAnonymous]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Register(RegisterViewModel model, string returnUrl = null)
+        public async Task<IActionResult> Register(RegisterViewModel model, string returnUrl = null, bool logon = true)
         {
             ViewData["ReturnUrl"] = returnUrl;
+            ViewData["Logon"] = logon.ToString(CultureInfo.InvariantCulture).ToLowerInvariant();
             var policies = await _SettingsRepository.GetSettingAsync<PoliciesSettings>() ?? new PoliciesSettings();
-            if (policies.LockSubscription)
+            if (policies.LockSubscription && !User.IsInRole(Roles.ServerAdmin))
                 return RedirectToAction(nameof(HomeController.Index), "Home");
             if (ModelState.IsValid)
             {
@@ -274,7 +279,8 @@ namespace BTCPayServer.Controllers
                     await _emailSender.SendEmailConfirmationAsync(model.Email, callbackUrl);
                     if (!policies.RequiresConfirmedEmail)
                     {
-                        await _signInManager.SignInAsync(user, isPersistent: false);
+                        if(logon)
+                            await _signInManager.SignInAsync(user, isPersistent: false);
                         return RedirectToLocal(returnUrl);
                     }
                     else

BTCPayServer/Controllers/AppsController.PointOfSale.cs

@@ -19,6 +19,7 @@ using BTCPayServer.Services.Rates;
 using System.Globalization;
 using System.Text;
 using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Cors;
 
 namespace BTCPayServer.Controllers
 {
@@ -162,7 +163,7 @@ namespace BTCPayServer.Controllers
             using (var ctx = _ContextFactory.CreateContext())
             {
                 return await ctx.Apps
-                                .Where(us => us.Id == appId && 
+                                .Where(us => us.Id == appId &&
                                              us.AppType == appType.ToString())
                                 .FirstOrDefaultAsync();
             }
@@ -208,6 +209,7 @@ namespace BTCPayServer.Controllers
         [HttpPost]
         [Route("{appId}/pos")]
         [IgnoreAntiforgeryToken]
+        [EnableCors(CorsPolicies.All)]
         public async Task<IActionResult> ViewPointOfSale(string appId,
                                                         decimal amount,
                                                         string email,
@@ -261,14 +263,6 @@ namespace BTCPayServer.Controllers
             return Redirect(invoice.Data.Url);
         }
 
-        private async Task<StoreData> GetStore(AppData app)
-        {
-            using (var ctx = _ContextFactory.CreateContext())
-            {
-                return await ctx.Stores.FirstOrDefaultAsync(s => s.Id == app.StoreDataId);
-            }
-        }
-
         private async Task UpdateAppSettings(AppData app)
         {
             using (var ctx = _ContextFactory.CreateContext())

BTCPayServer/Controllers/AppsController.cs

@@ -1,18 +1,17 @@
 using System;
-using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Models;
 using BTCPayServer.Models.AppViewModels;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using NBitcoin.DataEncoders;
-using NBitcoin;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Rates;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using NBitcoin;
+using NBitcoin.DataEncoders;
 
 namespace BTCPayServer.Controllers
 {
@@ -24,6 +23,7 @@ namespace BTCPayServer.Controllers
         UserManager<ApplicationUser> _UserManager;
         CurrencyNameTable _Currencies;
         InvoiceController _InvoiceController;
+        BTCPayNetworkProvider _NetworkProvider;
 
         [TempData]
         public string StatusMessage { get; set; }
@@ -32,12 +32,14 @@ namespace BTCPayServer.Controllers
             UserManager<ApplicationUser> userManager,
             ApplicationDbContextFactory contextFactory,
             CurrencyNameTable currencies,
-            InvoiceController invoiceController)
+            InvoiceController invoiceController,
+            BTCPayNetworkProvider networkProvider)
         {
             _InvoiceController = invoiceController;
             _UserManager = userManager;
             _ContextFactory = contextFactory;
             _Currencies = currencies;
+            _NetworkProvider = networkProvider;
         }
         public async Task<IActionResult> ListApps()
         {
@@ -199,5 +201,13 @@ namespace BTCPayServer.Controllers
         {
             return _UserManager.GetUserId(User);
         }
+
+        private async Task<StoreData> GetStore(AppData app)
+        {
+            using (var ctx = _ContextFactory.CreateContext())
+            {
+                return await ctx.Stores.FirstOrDefaultAsync(s => s.Id == app.StoreDataId);
+            }
+        }
     }
 }

BTCPayServer/Controllers/HomeController.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using BTCPayServer.Models;
+using NBitcoin.DataEncoders;
 
 namespace BTCPayServer.Controllers
 {

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -34,7 +34,6 @@ namespace BTCPayServer.Controllers
         {
             var invoice = (await _InvoiceRepository.GetInvoices(new InvoiceQuery()
             {
-                UserId = GetUserId(),
                 InvoiceId = invoiceId,
                 IncludeAddresses = true,
                 IncludeEvents = true
@@ -213,7 +212,7 @@ namespace BTCPayServer.Controllers
             bool isDefaultCrypto = false;
             if (paymentMethodIdStr == null)
             {
-                paymentMethodIdStr = store.GetDefaultCrypto();
+                paymentMethodIdStr = store.GetDefaultCrypto(_NetworkProvider);
                 isDefaultCrypto = true;
             }
 
@@ -231,7 +230,11 @@ namespace BTCPayServer.Controllers
             {
                 if (!isDefaultCrypto)
                     return null;
-                var paymentMethodTemp = invoice.GetPaymentMethods(_NetworkProvider).First();
+                var paymentMethodTemp = invoice.GetPaymentMethods(_NetworkProvider)
+                                               .Where(c=> paymentMethodId.CryptoCode == c.GetId().CryptoCode)
+                                               .FirstOrDefault();
+                if (paymentMethodTemp == null)
+                    paymentMethodTemp = invoice.GetPaymentMethods(_NetworkProvider).First();
                 network = paymentMethodTemp.Network;
                 paymentMethodId = paymentMethodTemp.GetId();
                 paymentMethodIdStr = paymentMethodId.ToString();

BTCPayServer/Controllers/InvoiceController.cs

@@ -49,7 +49,7 @@ namespace BTCPayServer.Controllers
     {
         InvoiceRepository _InvoiceRepository;
         ContentSecurityPolicies _CSP;
-        BTCPayRateProviderFactory _RateProvider;
+        RateFetcher _RateProvider;
         StoreRepository _StoreRepository;
         UserManager<ApplicationUser> _UserManager;
         private CurrencyNameTable _CurrencyNameTable;
@@ -62,7 +62,7 @@ namespace BTCPayServer.Controllers
             InvoiceRepository invoiceRepository,
             CurrencyNameTable currencyNameTable,
             UserManager<ApplicationUser> userManager,
-            BTCPayRateProviderFactory rateProvider,
+            RateFetcher rateProvider,
             StoreRepository storeRepository,
             EventAggregator eventAggregator,
             BTCPayWalletProvider walletProvider,
@@ -84,6 +84,8 @@ namespace BTCPayServer.Controllers
 
         internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl)
         {
+            InvoiceLogs logs = new InvoiceLogs();
+            logs.Write("Creation of invoice starting");
             var entity = new InvoiceEntity
             {
                 InvoiceTime = DateTimeOffset.UtcNow
@@ -121,9 +123,10 @@ namespace BTCPayServer.Controllers
 
             HashSet<CurrencyPair> currencyPairsToFetch = new HashSet<CurrencyPair>();
             var rules = storeBlob.GetRateRules(_NetworkProvider);
-
+            var excludeFilter = storeBlob.GetExcludedPaymentMethods(); // Here we can compose filters from other origin with PaymentFilter.Any()
             foreach (var network in store.GetSupportedPaymentMethods(_NetworkProvider)
-                                               .Select(c => _NetworkProvider.GetNetwork(c.PaymentId.CryptoCode))
+                                                .Where(s => !excludeFilter.Match(s.PaymentId))
+                                                .Select(c => _NetworkProvider.GetNetwork(c.PaymentId.CryptoCode))
                                                 .Where(c => c != null))
             {
                 currencyPairsToFetch.Add(new CurrencyPair(network.CryptoCode, invoice.Currency));
@@ -136,7 +139,9 @@ namespace BTCPayServer.Controllers
             var rateRules = storeBlob.GetRateRules(_NetworkProvider);
             var fetchingByCurrencyPair = _RateProvider.FetchRates(currencyPairsToFetch, rateRules);
 
+            var fetchingAll = WhenAllFetched(logs, fetchingByCurrencyPair);
             var supportedPaymentMethods = store.GetSupportedPaymentMethods(_NetworkProvider)
+                                               .Where(s => !excludeFilter.Match(s.PaymentId))
                                                .Select(c =>
                                                 (Handler: (IPaymentMethodHandler)_ServiceProvider.GetService(typeof(IPaymentMethodHandler<>).MakeGenericType(c.GetType())),
                                                 SupportedPaymentMethod: c,
@@ -144,59 +149,26 @@ namespace BTCPayServer.Controllers
                                                 .Where(c => c.Network != null)
                                                 .Select(o =>
                                                     (SupportedPaymentMethod: o.SupportedPaymentMethod,
-                                                    PaymentMethod: CreatePaymentMethodAsync(fetchingByCurrencyPair, o.Handler, o.SupportedPaymentMethod, o.Network, entity, store)))
+                                                    PaymentMethod: CreatePaymentMethodAsync(fetchingByCurrencyPair, o.Handler, o.SupportedPaymentMethod, o.Network, entity, store, logs)))
                                                 .ToList();
-
-            List<string> invoiceLogs = new List<string>();
             List<ISupportedPaymentMethod> supported = new List<ISupportedPaymentMethod>();
             var paymentMethods = new PaymentMethodDictionary();
-
-            foreach (var pair in fetchingByCurrencyPair)
-            {
-                var rateResult = await pair.Value;
-                invoiceLogs.Add($"{pair.Key}: The rating rule is {rateResult.Rule}");
-                invoiceLogs.Add($"{pair.Key}: The evaluated rating rule is {rateResult.EvaluatedRule}");
-                if (rateResult.Errors.Count != 0)
-                {
-                    var allRateRuleErrors = string.Join(", ", rateResult.Errors.ToArray());
-                    invoiceLogs.Add($"{pair.Key}: Rate rule error ({allRateRuleErrors})");
-                }
-                if (rateResult.ExchangeExceptions.Count != 0)
-                {
-                    foreach (var ex in rateResult.ExchangeExceptions)
-                    {
-                        invoiceLogs.Add($"{pair.Key}: Exception reaching exchange {ex.ExchangeName} ({ex.Exception.Message})");
-                    }
-                }
-            }
-
             foreach (var o in supportedPaymentMethods)
             {
-                try
-                {
-                    var paymentMethod = await o.PaymentMethod;
-                    if (paymentMethod == null)
-                        throw new PaymentMethodUnavailableException("Payment method unavailable");
-                    supported.Add(o.SupportedPaymentMethod);
-                    paymentMethods.Add(paymentMethod);
-                }
-                catch (PaymentMethodUnavailableException ex)
-                {
-                    invoiceLogs.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Payment method unavailable ({ex.Message})");
-                }
-                catch (Exception ex)
-                {
-                    invoiceLogs.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Unexpected exception ({ex.ToString()})");
-                }
+                var paymentMethod = await o.PaymentMethod;
+                if (paymentMethod == null)
+                    continue;
+                supported.Add(o.SupportedPaymentMethod);
+                paymentMethods.Add(paymentMethod);
             }
 
             if (supported.Count == 0)
             {
                 StringBuilder errors = new StringBuilder();
                 errors.AppendLine("No payment method available for this store");
-                foreach (var error in invoiceLogs)
+                foreach (var error in logs.ToList())
                 {
-                    errors.AppendLine(error);
+                    errors.AppendLine(error.ToString());
                 }
                 throw new BitpayHttpException(400, errors.ToString());
             }
@@ -204,71 +176,106 @@ namespace BTCPayServer.Controllers
             entity.SetSupportedPaymentMethods(supported);
             entity.SetPaymentMethods(paymentMethods);
             entity.PosData = invoice.PosData;
-            entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, invoiceLogs, _NetworkProvider);
-
+            entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, logs, _NetworkProvider);
+            await fetchingAll;
             _EventAggregator.Publish(new Events.InvoiceEvent(entity.EntityToDTO(_NetworkProvider), 1001, "invoice_created"));
             var resp = entity.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }
 
-        private async Task<PaymentMethod> CreatePaymentMethodAsync(Dictionary<CurrencyPair, Task<RateResult>> fetchingByCurrencyPair, IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store)
+        private Task WhenAllFetched(InvoiceLogs logs, Dictionary<CurrencyPair, Task<RateResult>> fetchingByCurrencyPair)
         {
-            var storeBlob = store.GetStoreBlob();
-            var rate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, entity.ProductInformation.Currency)];
-            if (rate.Value == null)
-                return null;
-            PaymentMethod paymentMethod = new PaymentMethod();
-            paymentMethod.ParentEntity = entity;
-            paymentMethod.Network = network;
-            paymentMethod.SetId(supportedPaymentMethod.PaymentId);
-            paymentMethod.Rate = rate.Value.Value;
-            var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, store, network);
-            if (storeBlob.NetworkFeeDisabled)
-                paymentDetails.SetNoTxFee();
-            paymentMethod.SetPaymentMethodDetails(paymentDetails);
-
-            Func<Money, Money, bool> compare = null;
-            CurrencyValue limitValue = null;
-            string errorMessage = null;
-            if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.LightningLike &&
-               storeBlob.LightningMaxValue != null)
+            return Task.WhenAll(fetchingByCurrencyPair.Select(async pair =>
             {
-                compare = (a, b) => a > b;
-                limitValue = storeBlob.LightningMaxValue;
-                errorMessage = "The amount of the invoice is too high to be paid with lightning";
-            }
-            else if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.BTCLike &&
-               storeBlob.OnChainMinValue != null)
-            {
-                compare = (a, b) => a < b;
-                limitValue = storeBlob.OnChainMinValue;
-                errorMessage = "The amount of the invoice is too low to be paid on chain";
-            }
-
-            if (compare != null)
-            {
-                var limitValueRate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, limitValue.Currency)];
-                if (limitValueRate.Value.HasValue)
+                var rateResult = await pair.Value;
+                logs.Write($"{pair.Key}: The rating rule is {rateResult.Rule}");
+                logs.Write($"{pair.Key}: The evaluated rating rule is {rateResult.EvaluatedRule}");
+                if (rateResult.Errors.Count != 0)
                 {
-                    var limitValueCrypto = Money.Coins(limitValue.Value / limitValueRate.Value.Value);
-                    if (compare(paymentMethod.Calculate().Due, limitValueCrypto))
+                    var allRateRuleErrors = string.Join(", ", rateResult.Errors.ToArray());
+                    logs.Write($"{pair.Key}: Rate rule error ({allRateRuleErrors})");
+                }
+                foreach (var ex in rateResult.ExchangeExceptions)
+                {
+                    logs.Write($"{pair.Key}: Exception reaching exchange {ex.ExchangeName} ({ex.Exception.Message})");
+                }
+            }).ToArray());
+        }
+
+        private async Task<PaymentMethod> CreatePaymentMethodAsync(Dictionary<CurrencyPair, Task<RateResult>> fetchingByCurrencyPair, IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store, InvoiceLogs logs)
+        {
+            try
+            {
+                var storeBlob = store.GetStoreBlob();
+                var preparePayment = handler.PreparePayment(supportedPaymentMethod, store, network);
+                var rate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, entity.ProductInformation.Currency)];
+                if (rate.BidAsk == null)
+                {
+                    return null;
+                }
+                PaymentMethod paymentMethod = new PaymentMethod();
+                paymentMethod.ParentEntity = entity;
+                paymentMethod.Network = network;
+                paymentMethod.SetId(supportedPaymentMethod.PaymentId);
+                paymentMethod.Rate = rate.BidAsk.Bid;
+                var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, store, network, preparePayment);
+                if (storeBlob.NetworkFeeDisabled)
+                    paymentDetails.SetNoTxFee();
+                paymentMethod.SetPaymentMethodDetails(paymentDetails);
+
+                Func<Money, Money, bool> compare = null;
+                CurrencyValue limitValue = null;
+                string errorMessage = null;
+                if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.LightningLike &&
+                   storeBlob.LightningMaxValue != null)
+                {
+                    compare = (a, b) => a > b;
+                    limitValue = storeBlob.LightningMaxValue;
+                    errorMessage = "The amount of the invoice is too high to be paid with lightning";
+                }
+                else if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.BTCLike &&
+                   storeBlob.OnChainMinValue != null)
+                {
+                    compare = (a, b) => a < b;
+                    limitValue = storeBlob.OnChainMinValue;
+                    errorMessage = "The amount of the invoice is too low to be paid on chain";
+                }
+
+                if (compare != null)
+                {
+                    var limitValueRate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, limitValue.Currency)];
+                    if (limitValueRate.BidAsk != null)
                     {
-                        throw new PaymentMethodUnavailableException(errorMessage);
+                        var limitValueCrypto = Money.Coins(limitValue.Value / limitValueRate.BidAsk.Bid);
+                        if (compare(paymentMethod.Calculate().Due, limitValueCrypto))
+                        {
+                            logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: {errorMessage}");
+                            return null;
+                        }
                     }
                 }
-            }
-            ///////////////
+                ///////////////
 
 
 #pragma warning disable CS0618
-            if (paymentMethod.GetId().IsBTCOnChain)
-            {
-                entity.TxFee = paymentMethod.TxFee;
-                entity.Rate = paymentMethod.Rate;
-                entity.DepositAddress = paymentMethod.DepositAddress;
-            }
+                if (paymentMethod.GetId().IsBTCOnChain)
+                {
+                    entity.TxFee = paymentMethod.TxFee;
+                    entity.Rate = paymentMethod.Rate;
+                    entity.DepositAddress = paymentMethod.DepositAddress;
+                }
 #pragma warning restore CS0618
-            return paymentMethod;
+                return paymentMethod;
+            }
+            catch (PaymentMethodUnavailableException ex)
+            {
+                logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: Payment method unavailable ({ex.Message})");
+            }
+            catch (Exception ex)
+            {
+                logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: Unexpected exception ({ex.ToString()})");
+            }
+            return null;
         }
 
         private SpeedPolicy ParseSpeedPolicy(string transactionSpeed, SpeedPolicy defaultPolicy)

BTCPayServer/Controllers/RateController.cs

@@ -15,12 +15,12 @@ namespace BTCPayServer.Controllers
 {
     public class RateController : Controller
     {
-        BTCPayRateProviderFactory _RateProviderFactory;
+        RateFetcher _RateProviderFactory;
         BTCPayNetworkProvider _NetworkProvider;
         CurrencyNameTable _CurrencyNameTable;
         StoreRepository _StoreRepo;
         public RateController(
-            BTCPayRateProviderFactory rateProviderFactory,
+            RateFetcher rateProviderFactory,
             BTCPayNetworkProvider networkProvider,
             StoreRepository storeRepo,
             CurrencyNameTable currencyNameTable)
@@ -31,6 +31,49 @@ namespace BTCPayServer.Controllers
             _CurrencyNameTable = currencyNameTable ?? throw new ArgumentNullException(nameof(currencyNameTable));
         }
 
+        [Route("rates/{baseCurrency}")]
+        [HttpGet]
+        [BitpayAPIConstraint]
+        public async Task<IActionResult> GetBaseCurrencyRates(string baseCurrency, string storeId)
+        {
+            storeId = storeId ?? this.HttpContext.GetStoreData()?.Id;
+            var store = this.HttpContext.GetStoreData();
+            if (store == null || store.Id != storeId)
+                store = await _StoreRepo.FindStore(storeId);
+            if (store == null)
+            {
+                var err = Json(new BitpayErrorsModel() { Error = "Store not found" });
+                err.StatusCode = 404;
+                return err;
+            }
+            var supportedMethods = store.GetSupportedPaymentMethods(_NetworkProvider);
+
+            var currencyCodes = supportedMethods.Where(method => !string.IsNullOrEmpty(method.PaymentId.CryptoCode))
+                .Select(method => method.PaymentId.CryptoCode).Distinct();
+
+            var currencypairs = BuildCurrencyPairs(currencyCodes, baseCurrency);
+            
+            var result = await GetRates2(currencypairs, store.Id);
+            var rates = (result as JsonResult)?.Value as Rate[];
+            if (rates == null)
+                return result;
+            return Json(new DataWrapper<Rate[]>(rates));
+        }
+
+
+        [Route("rates/{baseCurrency}/{currency}")]
+        [HttpGet]
+        [BitpayAPIConstraint]
+        public async Task<IActionResult> GetCurrencyPairRate(string baseCurrency, string currency, string storeId)
+        {
+            storeId = storeId ?? this.HttpContext.GetStoreData()?.Id;
+            var result = await GetRates2($"{baseCurrency}_{currency}", storeId);
+            var rates = (result as JsonResult)?.Value as Rate[];
+            if (rates == null)
+                return result;
+            return Json(new DataWrapper<Rate>(rates.First()));
+        }
+
         [Route("rates")]
         [HttpGet]
         [BitpayAPIConstraint]
@@ -44,19 +87,19 @@ namespace BTCPayServer.Controllers
             return Json(new DataWrapper<Rate[]>(rates));
         }
 
+
         [Route("api/rates")]
         [HttpGet]
         public async Task<IActionResult> GetRates2(string currencyPairs, string storeId)
         {
-            if(storeId == null || currencyPairs == null)
+            if (storeId == null)
             {
-                var result = Json(new BitpayErrorsModel() { Error = "You need to specify storeId (in your store settings) and currencyPairs (eg. BTC_USD,LTC_CAD)" });
+                var result = Json(new BitpayErrorsModel() { Error = "You need to specify storeId (in your store settings)" });
                 result.StatusCode = 400;
                 return result;
             }
-
             var store = this.HttpContext.GetStoreData();
-            if(store == null || store.Id != storeId)
+            if (store == null || store.Id != storeId)
                 store = await _StoreRepo.FindStore(storeId);
             if (store == null)
             {
@@ -64,12 +107,30 @@ namespace BTCPayServer.Controllers
                 result.StatusCode = 404;
                 return result;
             }
+
+            if (currencyPairs == null)
+            {
+                var supportedMethods = store.GetSupportedPaymentMethods(_NetworkProvider);
+                var currencyCodes = supportedMethods.Select(method => method.PaymentId.CryptoCode).Distinct();
+                var defaultCrypto = store.GetDefaultCrypto(_NetworkProvider);
+
+                currencyPairs = BuildCurrencyPairs(currencyCodes, defaultCrypto);
+
+                if (string.IsNullOrEmpty(currencyPairs))
+                {
+                    var result = Json(new BitpayErrorsModel() { Error = "You need to specify currencyPairs (eg. BTC_USD,LTC_CAD)" });
+                    result.StatusCode = 400;
+                    return result;
+                }
+            }
+
+
             var rules = store.GetStoreBlob().GetRateRules(_NetworkProvider);
 
             HashSet<CurrencyPair> pairs = new HashSet<CurrencyPair>();
-            foreach(var currency in currencyPairs.Split(','))
+            foreach (var currency in currencyPairs.Split(','))
             {
-                if(!CurrencyPair.TryParse(currency, out var pair))
+                if (!CurrencyPair.TryParse(currency, out var pair))
                 {
                     var result = Json(new BitpayErrorsModel() { Error = $"Currency pair {currency} uncorrectly formatted" });
                     result.StatusCode = 400;
@@ -81,7 +142,7 @@ namespace BTCPayServer.Controllers
             var fetching = _RateProviderFactory.FetchRates(pairs, rules);
             await Task.WhenAll(fetching.Select(f => f.Value).ToArray());
             return Json(pairs
-                            .Select(r => (Pair: r, Value: fetching[r].GetAwaiter().GetResult().Value))
+                            .Select(r => (Pair: r, Value: fetching[r].GetAwaiter().GetResult().BidAsk?.Bid))
                             .Where(r => r.Value.HasValue)
                             .Select(r =>
                             new Rate()
@@ -94,6 +155,20 @@ namespace BTCPayServer.Controllers
                             }).Where(n => n.Name != null).ToArray());
         }
 
+        private static string BuildCurrencyPairs(IEnumerable<string> currencyCodes, string baseCrypto)
+        {
+            StringBuilder currencyPairsBuilder = new StringBuilder();
+            bool first = true;
+            foreach (var currencyCode in currencyCodes)
+            {
+                if(!first)
+                    currencyPairsBuilder.Append(",");
+                first = false;
+                currencyPairsBuilder.Append($"{baseCrypto}_{currencyCode}");
+            }
+            return currencyPairsBuilder.ToString();
+        }
+
         public class Rate
         {
 

BTCPayServer/Controllers/ServerController.cs

@@ -22,6 +22,8 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Mail;
 using System.Threading.Tasks;
+using Renci.SshNet;
+using BTCPayServer.Logging;
 
 namespace BTCPayServer.Controllers
 {
@@ -30,21 +32,24 @@ namespace BTCPayServer.Controllers
     {
         private UserManager<ApplicationUser> _UserManager;
         SettingsRepository _SettingsRepository;
-        private BTCPayRateProviderFactory _RateProviderFactory;
+        private readonly NBXplorerDashboard _dashBoard;
+        private RateFetcher _RateProviderFactory;
         private StoreRepository _StoreRepository;
         LightningConfigurationProvider _LnConfigProvider;
         BTCPayServerOptions _Options;
 
         public ServerController(UserManager<ApplicationUser> userManager,
             Configuration.BTCPayServerOptions options,
-            BTCPayRateProviderFactory rateProviderFactory,
+            RateFetcher rateProviderFactory,
             SettingsRepository settingsRepository,
+            NBXplorerDashboard dashBoard,
             LightningConfigurationProvider lnConfigProvider,
             Services.Stores.StoreRepository storeRepository)
         {
             _Options = options;
             _UserManager = userManager;
             _SettingsRepository = settingsRepository;
+            _dashBoard = dashBoard;
             _RateProviderFactory = rateProviderFactory;
             _StoreRepository = storeRepository;
             _LnConfigProvider = lnConfigProvider;
@@ -149,6 +154,179 @@ namespace BTCPayServer.Controllers
             return View(userVM);
         }
 
+        [Route("server/maintenance")]
+        public IActionResult Maintenance()
+        {
+            MaintenanceViewModel vm = new MaintenanceViewModel();
+            vm.UserName = "btcpayserver";
+            vm.DNSDomain = this.Request.Host.Host;
+            vm.SetConfiguredSSH(_Options.SSHSettings);
+            if (IPAddress.TryParse(vm.DNSDomain, out var unused))
+                vm.DNSDomain = null;
+            return View(vm);
+        }
+        [Route("server/maintenance")]
+        [HttpPost]
+        public async Task<IActionResult> Maintenance(MaintenanceViewModel vm, string command)
+        {
+            if (!ModelState.IsValid)
+                return View(vm);
+            vm.SetConfiguredSSH(_Options.SSHSettings);
+            if (command == "changedomain")
+            {
+                if (string.IsNullOrWhiteSpace(vm.DNSDomain))
+                {
+                    ModelState.AddModelError(nameof(vm.DNSDomain), $"Required field");
+                    return View(vm);
+                }
+                vm.DNSDomain = vm.DNSDomain.Trim().ToLowerInvariant();
+                if (vm.DNSDomain.Equals(this.Request.Host.Host, StringComparison.OrdinalIgnoreCase))
+                    return View(vm);
+                if (IPAddress.TryParse(vm.DNSDomain, out var unused))
+                {
+                    ModelState.AddModelError(nameof(vm.DNSDomain), $"This should be a domain name");
+                    return View(vm);
+                }
+                if (vm.DNSDomain.Equals(this.Request.Host.Host, StringComparison.InvariantCultureIgnoreCase))
+                {
+                    ModelState.AddModelError(nameof(vm.DNSDomain), $"The server is already set to use this domain");
+                    return View(vm);
+                }
+                var builder = new UriBuilder();
+                using (var client = new HttpClient(new HttpClientHandler()
+                {
+                    ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
+                }))
+                {
+                    try
+                    {
+                        builder.Scheme = this.Request.Scheme;
+                        builder.Host = vm.DNSDomain;
+                        var addresses1 = Dns.GetHostAddressesAsync(this.Request.Host.Host);
+                        var addresses2 = Dns.GetHostAddressesAsync(vm.DNSDomain);
+                        await Task.WhenAll(addresses1, addresses2);
+
+                        var addressesSet = addresses1.GetAwaiter().GetResult().Select(c => c.ToString()).ToHashSet();
+                        var hasCommonAddress = addresses2.GetAwaiter().GetResult().Select(c => c.ToString()).Any(s => addressesSet.Contains(s));
+                        if (!hasCommonAddress)
+                        {
+                            ModelState.AddModelError(nameof(vm.DNSDomain), $"Invalid host ({vm.DNSDomain} is not pointing to this BTCPay instance)");
+                            return View(vm);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        var messages = new List<object>();
+                        messages.Add(ex.Message);
+                        if (ex.InnerException != null)
+                            messages.Add(ex.InnerException.Message);
+                        ModelState.AddModelError(nameof(vm.DNSDomain), $"Invalid domain ({string.Join(", ", messages.ToArray())})");
+                        return View(vm);
+                    }
+                }
+
+                var error = RunSSH(vm, $"changedomain.sh {vm.DNSDomain}");
+                if (error != null)
+                    return error;
+
+                builder.Path = null;
+                builder.Query = null;
+                StatusMessage = $"Domain name changing... the server will restart, please use \"{builder.Uri.AbsoluteUri}\"";
+            }
+            else if (command == "update")
+            {
+                var error = RunSSH(vm, $"btcpay-update.sh");
+                if (error != null)
+                    return error;
+                StatusMessage = $"The server might restart soon if an update is available...";
+            }
+            else
+            {
+                return NotFound();
+            }
+            return RedirectToAction(nameof(Maintenance));
+        }
+
+        public static string RunId = Encoders.Hex.EncodeData(NBitcoin.RandomUtils.GetBytes(32));
+        [HttpGet]
+        [Route("runid")]
+        [AllowAnonymous]
+        public IActionResult SeeRunId(string expected = null)
+        {
+            if (expected == RunId)
+                return Ok();
+            return BadRequest();
+        }
+
+        private IActionResult RunSSH(MaintenanceViewModel vm, string ssh)
+        {
+            ssh = $"sudo bash -c '. /etc/profile.d/btcpay-env.sh && nohup {ssh} > /dev/null 2>&1 & disown'";
+            var sshClient = _Options.SSHSettings == null ? vm.CreateSSHClient(this.Request.Host.Host)
+                                                         : new SshClient(_Options.SSHSettings.CreateConnectionInfo());
+
+            if (_Options.TrustedFingerprints.Count != 0)
+            {
+                sshClient.HostKeyReceived += (object sender, Renci.SshNet.Common.HostKeyEventArgs e) =>
+                {
+                    if (_Options.TrustedFingerprints.Count == 0)
+                    {
+                        Logs.Configuration.LogWarning($"SSH host fingerprint for {e.HostKeyName} is untrusted, start BTCPay with -sshtrustedfingerprints \"{Encoders.Hex.EncodeData(e.FingerPrint)}\"");
+                        e.CanTrust = true; // Not a typo, we want the connection to succeed with a warning
+                    }
+                    else
+                    {
+                        e.CanTrust = _Options.IsTrustedFingerprint(e.FingerPrint, e.HostKey);
+                        if(!e.CanTrust)
+                            Logs.Configuration.LogError($"SSH host fingerprint for {e.HostKeyName} is untrusted, start BTCPay with -sshtrustedfingerprints \"{Encoders.Hex.EncodeData(e.FingerPrint)}\"");
+                    }
+                };
+            }
+            else
+            {
+
+            }
+
+            try
+            {
+                sshClient.Connect();
+            }
+            catch (Renci.SshNet.Common.SshAuthenticationException)
+            {
+                ModelState.AddModelError(nameof(vm.Password), "Invalid credentials");
+                sshClient.Dispose();
+                return View(vm);
+            }
+            catch (Exception ex)
+            {
+                var message = ex.Message;
+                if (ex is AggregateException aggrEx && aggrEx.InnerException?.Message != null)
+                {
+                    message = aggrEx.InnerException.Message;
+                }
+                ModelState.AddModelError(nameof(vm.UserName), $"Connection problem ({message})");
+                sshClient.Dispose();
+                return View(vm);
+            }
+
+            var sshCommand = sshClient.CreateCommand(ssh);
+            sshCommand.CommandTimeout = TimeSpan.FromMinutes(1.0);
+            sshCommand.BeginExecute(ar =>
+            {
+                try
+                {
+                    Logs.PayServer.LogInformation("Running SSH command: " + ssh);
+                    var result = sshCommand.EndExecute(ar);
+                    Logs.PayServer.LogInformation("SSH command executed: " + result);
+                }
+                catch (Exception ex)
+                {
+                    Logs.PayServer.LogWarning("Error while executing SSH command: " + ex.Message);
+                }
+                sshClient.Dispose();
+            });
+            return null;
+        }
+
         private static bool IsAdmin(IList<string> roles)
         {
             return roles.Contains(Roles.ServerAdmin, StringComparer.Ordinal);
@@ -255,12 +433,18 @@ namespace BTCPayServer.Controllers
                     }
                 }
             }
+            result.HasSSH = _Options.SSHSettings != null;
             return View(result);
         }
 
         [Route("server/services/lnd-grpc/{cryptoCode}/{index}")]
         public IActionResult LNDGRPCServices(string cryptoCode, int index, uint? nonce)
         {
+            if (!_dashBoard.IsFullySynched(cryptoCode, out var unusud))
+            {
+                StatusMessage = $"Error: {cryptoCode} is not fully synched";
+                return RedirectToAction(nameof(Services));
+            }
             var external = GetExternalLNDConnectionString(cryptoCode, index);
             if (external == null)
                 return NotFound();
@@ -316,6 +500,7 @@ namespace BTCPayServer.Controllers
             LightningConfigurations confs = new LightningConfigurations();
             LightningConfiguration conf = new LightningConfiguration();
             conf.Type = "grpc";
+            conf.ChainType = _Options.NetworkType.ToString();
             conf.CryptoCode = cryptoCode;
             conf.Host = external.BaseUri.DnsSafeHost;
             conf.Port = external.BaseUri.Port;
@@ -336,7 +521,7 @@ namespace BTCPayServer.Controllers
             if (connectionString == null)
                 return null;
             connectionString = connectionString.Clone();
-            if(connectionString.MacaroonFilePath != null)
+            if (connectionString.MacaroonFilePath != null)
             {
                 try
                 {
@@ -351,7 +536,28 @@ namespace BTCPayServer.Controllers
             }
             return connectionString;
         }
-        
+
+        [Route("server/services/ssh")]
+        public IActionResult SSHService(bool downloadKeyFile = false)
+        {
+            var settings = _Options.SSHSettings;
+            if (settings == null)
+                return NotFound();
+            if (downloadKeyFile)
+            {
+                if (!System.IO.File.Exists(settings.KeyFile))
+                    return NotFound();
+                return File(System.IO.File.ReadAllBytes(settings.KeyFile), "application/octet-stream", "id_rsa");
+            }
+            SSHServiceViewModel vm = new SSHServiceViewModel();
+            string port = settings.Port == 22 ? "" : $" -p {settings.Port}";
+            vm.CommandLine = $"ssh {settings.Username}@{settings.Server}{port}";
+            vm.Password = settings.Password;
+            vm.KeyFilePassword = settings.KeyFilePassword;
+            vm.HasKeyFile = !string.IsNullOrEmpty(settings.KeyFile);
+            return View(vm);
+        }
+
         [Route("server/theme")]
         public async Task<IActionResult> Theme()
         {

BTCPayServer/Controllers/StoresController.BTCLike.cs

@@ -34,7 +34,7 @@ namespace BTCPayServer.Controllers
             }
 
             DerivationSchemeViewModel vm = new DerivationSchemeViewModel();
-            vm.ServerUrl = GetStoreUrl(storeId);
+            vm.ServerUrl = WalletsController.GetLedgerWebsocketUrl(this.HttpContext, cryptoCode, null);
             vm.CryptoCode = cryptoCode;
             vm.RootKeyPath = network.GetRootKeyPath();
             SetExistingValues(store, vm);
@@ -44,6 +44,7 @@ namespace BTCPayServer.Controllers
         private void SetExistingValues(StoreData store, DerivationSchemeViewModel vm)
         {
             vm.DerivationScheme = GetExistingDerivationStrategy(vm.CryptoCode, store)?.DerivationStrategyBase.ToString();
+            vm.Enabled = !store.GetStoreBlob().IsExcluded(new PaymentMethodId(vm.CryptoCode, PaymentTypes.BTCLike));
         }
 
         private DerivationStrategy GetExistingDerivationStrategy(string cryptoCode, StoreData store)
@@ -59,7 +60,7 @@ namespace BTCPayServer.Controllers
         [Route("{storeId}/derivations/{cryptoCode}")]
         public async Task<IActionResult> AddDerivationScheme(string storeId, DerivationSchemeViewModel vm, string cryptoCode)
         {
-            vm.ServerUrl = GetStoreUrl(storeId);
+            vm.ServerUrl = WalletsController.GetLedgerWebsocketUrl(this.HttpContext, cryptoCode, null);
             vm.CryptoCode = cryptoCode;
             var store = HttpContext.GetStoreData();
             if (store == null)
@@ -78,6 +79,11 @@ namespace BTCPayServer.Controllers
             }
 
             PaymentMethodId paymentMethodId = new PaymentMethodId(network.CryptoCode, PaymentTypes.BTCLike);
+            var exisingStrategy = store.GetSupportedPaymentMethods(_NetworkProvider)
+                                       .Where(c => c.PaymentId == paymentMethodId)
+                                       .OfType<DerivationStrategy>()
+                                       .Select(c => c.DerivationStrategyBase.ToString())
+                                       .FirstOrDefault();
             DerivationStrategy strategy = null;
             try
             {
@@ -94,10 +100,32 @@ namespace BTCPayServer.Controllers
                 return View(vm);
             }
 
-            if (!vm.Confirmation && strategy != null)
-                return ShowAddresses(vm, strategy);
+            var showAddress = (vm.Confirmation && !string.IsNullOrWhiteSpace(vm.HintAddress)) || // Testing hint address
+                              (!vm.Confirmation && strategy != null && exisingStrategy != strategy.DerivationStrategyBase.ToString());  // Checking addresses after setting xpub
 
-            if (vm.Confirmation && !string.IsNullOrWhiteSpace(vm.HintAddress))
+            if (!showAddress)
+            {
+                try
+                {
+                    if (strategy != null)
+                        await wallet.TrackAsync(strategy.DerivationStrategyBase);
+                    store.SetSupportedPaymentMethod(paymentMethodId, strategy);
+
+                    var storeBlob = store.GetStoreBlob();
+                    storeBlob.SetExcluded(paymentMethodId, !vm.Enabled);
+                    store.SetStoreBlob(storeBlob);
+                }
+                catch
+                {
+                    ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid Derivation Scheme");
+                    return View(vm);
+                }
+
+                await _Repo.UpdateStore(store);
+                StatusMessage = $"Derivation scheme for {network.CryptoCode} has been modified.";
+                return RedirectToAction(nameof(UpdateStore), new { storeId = storeId });
+            }
+            else if (!string.IsNullOrEmpty(vm.HintAddress))
             {
                 BitcoinAddress address = null;
                 try
@@ -123,26 +151,8 @@ namespace BTCPayServer.Controllers
                 vm.StatusMessage = "Address successfully found, please verify that the rest is correct and click on \"Confirm\"";
                 ModelState.Remove(nameof(vm.HintAddress));
                 ModelState.Remove(nameof(vm.DerivationScheme));
-                return ShowAddresses(vm, strategy);
-            }
-            else
-            {
-                try
-                {
-                    if (strategy != null)
-                        await wallet.TrackAsync(strategy.DerivationStrategyBase);
-                    store.SetSupportedPaymentMethod(paymentMethodId, strategy);
-                }
-                catch
-                {
-                    ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid Derivation Scheme");
-                    return View(vm);
-                }
-
-                await _Repo.UpdateStore(store);
-                StatusMessage = $"Derivation scheme for {network.CryptoCode} has been modified.";
-                return RedirectToAction(nameof(UpdateStore), new { storeId = storeId });
             }
+            return ShowAddresses(vm, strategy);
         }
 
         private IActionResult ShowAddresses(DerivationSchemeViewModel vm, DerivationStrategy strategy)
@@ -161,279 +171,5 @@ namespace BTCPayServer.Controllers
             vm.Confirmation = true;
             return View(vm);
         }
-
-
-        public class GetInfoResult
-        {
-            public int RecommendedSatoshiPerByte { get; set; }
-            public double Balance { get; set; }
-        }
-
-        public class SendToAddressResult
-        {
-            public string TransactionId { get; set; }
-        }
-
-        [HttpGet]
-        [Route("{storeId}/ws/ledger")]
-        public async Task<IActionResult> LedgerConnection(
-            string storeId,
-            string command,
-            // getinfo
-            string cryptoCode = null,
-            // getxpub
-            int account = 0,
-            // sendtoaddress
-            string destination = null, string amount = null, string feeRate = null, string substractFees = null
-            )
-        {
-            if (!HttpContext.WebSockets.IsWebSocketRequest)
-                return NotFound();
-            var store = HttpContext.GetStoreData();
-            if (store == null)
-                return NotFound();
-
-            var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
-
-            using (var normalOperationTimeout = new CancellationTokenSource())
-            using (var signTimeout = new CancellationTokenSource())
-            {
-                normalOperationTimeout.CancelAfter(TimeSpan.FromMinutes(30));
-                var hw = new HardwareWalletService(webSocket);
-                object result = null;
-                try
-                {
-                    BTCPayNetwork network = null;
-                    if (cryptoCode != null)
-                    {
-                        network = _NetworkProvider.GetNetwork(cryptoCode);
-                        if (network == null)
-                            throw new FormatException("Invalid value for crypto code");
-                    }
-
-                    BitcoinAddress destinationAddress = null;
-                    if (destination != null)
-                    {
-                        try
-                        {
-                            destinationAddress = BitcoinAddress.Create(destination, network.NBitcoinNetwork);
-                        }
-                        catch { }
-                        if (destinationAddress == null)
-                            throw new FormatException("Invalid value for destination");
-                    }
-
-                    FeeRate feeRateValue = null;
-                    if (feeRate != null)
-                    {
-                        try
-                        {
-                            feeRateValue = new FeeRate(Money.Satoshis(int.Parse(feeRate, CultureInfo.InvariantCulture)), 1);
-                        }
-                        catch { }
-                        if (feeRateValue == null || feeRateValue.FeePerK <= Money.Zero)
-                            throw new FormatException("Invalid value for fee rate");
-                    }
-
-                    Money amountBTC = null;
-                    if (amount != null)
-                    {
-                        try
-                        {
-                            amountBTC = Money.Parse(amount);
-                        }
-                        catch { }
-                        if (amountBTC == null || amountBTC <= Money.Zero)
-                            throw new FormatException("Invalid value for amount");
-                    }
-
-                    bool subsctractFeesValue = false;
-                    if (substractFees != null)
-                    {
-                        try
-                        {
-                            subsctractFeesValue = bool.Parse(substractFees);
-                        }
-                        catch { throw new FormatException("Invalid value for subtract fees"); }
-                    }
-                    if (command == "test")
-                    {
-                        result = await hw.Test(normalOperationTimeout.Token);
-                    }
-                    if (command == "getxpub")
-                    {
-                        var getxpubResult = await hw.GetExtPubKey(network, account, normalOperationTimeout.Token);
-                        result = getxpubResult;
-                    }
-                    if (command == "getinfo")
-                    {
-                        var strategy = GetDirectDerivationStrategy(store, network);
-                        var strategyBase = GetDerivationStrategy(store, network);
-                        if (strategy == null || await hw.GetKeyPath(network, strategy, normalOperationTimeout.Token) == null)
-                        {
-                            throw new Exception($"This store is not configured to use this ledger");
-                        }
-
-                        var feeProvider = _FeeRateProvider.CreateFeeProvider(network);
-                        var recommendedFees = feeProvider.GetFeeRateAsync();
-                        var balance = _WalletProvider.GetWallet(network).GetBalance(strategyBase);
-                        result = new GetInfoResult() { Balance = (double)(await balance).ToDecimal(MoneyUnit.BTC), RecommendedSatoshiPerByte = (int)(await recommendedFees).GetFee(1).Satoshi };
-                    }
-
-                    if (command == "sendtoaddress")
-                    {
-                        if (!_Dashboard.IsFullySynched(network.CryptoCode, out var summary))
-                            throw new Exception($"{network.CryptoCode}: not started or fully synched");
-                        var strategy = GetDirectDerivationStrategy(store, network);
-                        var strategyBase = GetDerivationStrategy(store, network);
-                        var wallet = _WalletProvider.GetWallet(network);
-                        var change = wallet.GetChangeAddressAsync(strategyBase);
-
-                        var unspentCoins = await wallet.GetUnspentCoins(strategyBase);
-                        var changeAddress = await change;
-                        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");
-                        }
-
-                        var foundKeyPath = await hw.GetKeyPath(network, strategy, normalOperationTimeout.Token);
-                        if (foundKeyPath == null)
-                        {
-                            throw new HardwareWalletException($"This store is not configured to use this ledger");
-                        }
-
-                        TransactionBuilder builder = new TransactionBuilder();
-                        builder.StandardTransactionPolicy.MinRelayTxFee = summary.Status.BitcoinStatus.MinRelayTxFee;
-                        builder.SetConsensusFactory(network.NBitcoinNetwork);
-                        builder.AddCoins(unspentCoins.Select(c => c.Coin).ToArray());
-
-                        foreach (var element in send)
-                        {
-                            builder.Send(element.destination, element.amount);
-                            if (element.substractFees)
-                                builder.SubtractFees();
-                        }
-                        builder.SetChange(changeAddress.Item1);
-
-                        if (network.MinFee == null)
-                        {
-                            builder.SendEstimatedFees(feeRateValue);
-                        }
-                        else
-                        {
-                            var estimatedFee = builder.EstimateFees(feeRateValue);
-                            if (network.MinFee > estimatedFee)
-                                builder.SendFees(network.MinFee);
-                            else
-                                builder.SendEstimatedFees(feeRateValue);
-                        }
-                        builder.Shuffle();
-                        var unsigned = builder.BuildTransaction(false);
-
-                        var keypaths = new Dictionary<Script, KeyPath>();
-                        foreach (var c in unspentCoins)
-                        {
-                            keypaths.TryAdd(c.Coin.ScriptPubKey, c.KeyPath);
-                        }
-
-                        var hasChange = unsigned.Outputs.Count == 2;
-                        var usedCoins = builder.FindSpentCoins(unsigned);
-
-                        Dictionary<uint256, Transaction> parentTransactions = new Dictionary<uint256, Transaction>();
-
-                        if (!strategy.Segwit)
-                        {
-                            var parentHashes = usedCoins.Select(c => c.Outpoint.Hash).ToHashSet();
-                            var explorer = _ExplorerProvider.GetExplorerClient(network);
-                            var getTransactionAsyncs = parentHashes.Select(h => (Op: explorer.GetTransactionAsync(h), Hash: h)).ToList();
-                            foreach (var getTransactionAsync in getTransactionAsyncs)
-                            {
-                                var tx = (await getTransactionAsync.Op);
-                                if (tx == null)
-                                    throw new Exception($"Parent transaction {getTransactionAsync.Hash} not found");
-                                parentTransactions.Add(tx.Transaction.GetHash(), tx.Transaction);
-                            }
-                        }
-
-
-                        signTimeout.CancelAfter(TimeSpan.FromMinutes(5));
-                        var transaction = await hw.SignTransactionAsync(usedCoins.Select(c => new SignatureRequest
-                        {
-                            InputTransaction = parentTransactions.TryGet(c.Outpoint.Hash),
-                            InputCoin = c,
-                            KeyPath = foundKeyPath.Derive(keypaths[c.TxOut.ScriptPubKey]),
-                            PubKey = strategy.Root.Derive(keypaths[c.TxOut.ScriptPubKey]).PubKey
-                        }).ToArray(), unsigned, hasChange ? foundKeyPath.Derive(changeAddress.Item2) : null, signTimeout.Token);
-                        try
-                        {
-                            var broadcastResult = await wallet.BroadcastTransactionsAsync(new List<Transaction>() { transaction });
-                            if (!broadcastResult[0].Success)
-                            {
-                                throw new Exception($"RPC Error while broadcasting: {broadcastResult[0].RPCCode} {broadcastResult[0].RPCCodeMessage} {broadcastResult[0].RPCMessage}");
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            throw new Exception("Error while broadcasting: " + ex.Message);
-                        }
-                        wallet.InvalidateCache(strategyBase);
-                        result = new SendToAddressResult() { TransactionId = transaction.GetHash().ToString() };
-                    }
-                }
-                catch (OperationCanceledException)
-                { result = new LedgerTestResult() { Success = false, Error = "Timeout" }; }
-                catch (Exception ex)
-                { result = new LedgerTestResult() { Success = false, Error = ex.Message }; }
-                finally { hw.Dispose(); }
-                try
-                {
-                    if (result != null)
-                    {
-                        UTF8Encoding UTF8NOBOM = new UTF8Encoding(false);
-                        var bytes = UTF8NOBOM.GetBytes(JsonConvert.SerializeObject(result, _MvcJsonOptions.SerializerSettings));
-                        await webSocket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, true, new CancellationTokenSource(2000).Token);
-                    }
-                }
-                catch { }
-                finally
-                {
-                    await webSocket.CloseSocket();
-                }
-            }
-            return new EmptyResult();
-        }
-
-        private DirectDerivationStrategy GetDirectDerivationStrategy(StoreData store, BTCPayNetwork network)
-        {
-            var strategy = GetDerivationStrategy(store, network);
-            var directStrategy = strategy as DirectDerivationStrategy;
-            if (directStrategy == null)
-                directStrategy = (strategy as P2SHDerivationStrategy).Inner as DirectDerivationStrategy;
-            return directStrategy;
-        }
-
-        private DerivationStrategyBase GetDerivationStrategy(StoreData store, BTCPayNetwork network)
-        {
-            var strategy = store
-                            .GetSupportedPaymentMethods(_NetworkProvider)
-                            .OfType<DerivationStrategy>()
-                            .FirstOrDefault(s => s.Network.NBitcoinNetwork == network.NBitcoinNetwork);
-            if (strategy == null)
-            {
-                throw new Exception($"Derivation strategy for {network.CryptoCode} is not set");
-            }
-
-            return strategy.DerivationStrategyBase;
-        }
     }
 }

BTCPayServer/Controllers/StoresController.LightningLike.cs

@@ -24,9 +24,11 @@ namespace BTCPayServer.Controllers
             var store = HttpContext.GetStoreData();
             if (store == null)
                 return NotFound();
-            LightningNodeViewModel vm = new LightningNodeViewModel();
-            vm.CryptoCode = cryptoCode;
-            vm.InternalLightningNode = GetInternalLighningNode(cryptoCode)?.ToString();
+            LightningNodeViewModel vm = new LightningNodeViewModel
+            {
+                CryptoCode = cryptoCode,
+                InternalLightningNode = GetInternalLighningNode(cryptoCode)?.ToString()
+            };
             SetExistingValues(store, vm);
             return View(vm);
         }
@@ -34,6 +36,7 @@ namespace BTCPayServer.Controllers
         private void SetExistingValues(StoreData store, LightningNodeViewModel vm)
         {
             vm.ConnectionString = GetExistingLightningSupportedPaymentMethod(vm.CryptoCode, store)?.GetLightningUrl()?.ToString();
+            vm.Enabled = !store.GetStoreBlob().IsExcluded(new PaymentMethodId(vm.CryptoCode, PaymentTypes.LightningLike));
         }
         private LightningSupportedPaymentMethod GetExistingLightningSupportedPaymentMethod(string cryptoCode, StoreData store)
         {
@@ -134,39 +137,41 @@ namespace BTCPayServer.Controllers
                 paymentMethod.SetLightningUrl(connectionString);
             }
 
-            if (command == "save")
+            switch (command)
             {
-                store.SetSupportedPaymentMethod(paymentMethodId, paymentMethod);
-                await _Repo.UpdateStore(store);
-                StatusMessage = $"Lightning node modified ({network.CryptoCode})";
-                return RedirectToAction(nameof(UpdateStore), new { storeId = storeId });
-            }
-            else // if(command == "test")
-            {
-                if (paymentMethod == null)
-                {
+                case "save":
+                    var storeBlob = store.GetStoreBlob();
+                    storeBlob.SetExcluded(paymentMethodId, !vm.Enabled);
+                    store.SetStoreBlob(storeBlob);
+                    store.SetSupportedPaymentMethod(paymentMethodId, paymentMethod);
+                    await _Repo.UpdateStore(store);
+                    StatusMessage = $"Lightning node modified ({network.CryptoCode})";
+                    return RedirectToAction(nameof(UpdateStore), new { storeId = storeId });
+                case "test" when paymentMethod == null:
                     ModelState.AddModelError(nameof(vm.ConnectionString), "Missing url parameter");
                     return View(vm);
-                }
-                var handler = (LightningLikePaymentHandler)_ServiceProvider.GetRequiredService<IPaymentMethodHandler<Payments.Lightning.LightningSupportedPaymentMethod>>();
-                try
-                {
-                    var info = await handler.Test(paymentMethod, network);
-                    if (!vm.SkipPortTest)
+                case "test":
+                    var handler = (LightningLikePaymentHandler)_ServiceProvider.GetRequiredService<IPaymentMethodHandler<Payments.Lightning.LightningSupportedPaymentMethod>>();
+                    try
                     {
-                        using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(20)))
+                        var info = await handler.Test(paymentMethod, network);
+                        if (!vm.SkipPortTest)
                         {
-                            await handler.TestConnection(info, cts.Token);
+                            using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(20)))
+                            {
+                                await handler.TestConnection(info, cts.Token);
+                            }
                         }
+                        vm.StatusMessage = $"Connection to the lightning node succeeded ({info})";
+                    }
+                    catch (Exception ex)
+                    {
+                        vm.StatusMessage = $"Error: {ex.Message}";
+                        return View(vm);
                     }
-                    vm.StatusMessage = $"Connection to the lightning node succeeded ({info})";
-                }
-                catch (Exception ex)
-                {
-                    vm.StatusMessage = $"Error: {ex.Message}";
                     return View(vm);
-                }
-                return View(vm);
+                default:
+                    return View(vm);
             }
         }
 

BTCPayServer/Controllers/StoresController.cs

@@ -1,8 +1,13 @@
-using BTCPayServer.Authentication;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Authentication;
 using BTCPayServer.Configuration;
 using BTCPayServer.Data;
-using BTCPayServer.HostedServices;
 using BTCPayServer.Models;
+using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Rating;
 using BTCPayServer.Security;
@@ -11,21 +16,13 @@ using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
 using BTCPayServer.Services.Wallets;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.Extensions.Options;
 using NBitcoin;
 using NBitcoin.DataEncoders;
-using NBXplorer.DerivationStrategy;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace BTCPayServer.Controllers
 {
@@ -35,28 +32,26 @@ namespace BTCPayServer.Controllers
     [AutoValidateAntiforgeryToken]
     public partial class StoresController : Controller
     {
-        BTCPayRateProviderFactory _RateFactory;
+        RateFetcher _RateFactory;
         public string CreatedStoreId { get; set; }
         public StoresController(
-            NBXplorerDashboard dashboard,
             IServiceProvider serviceProvider,
             BTCPayServerOptions btcpayServerOptions,
             BTCPayServerEnvironment btcpayEnv,
-            IOptions<MvcJsonOptions> mvcJsonOptions,
             StoreRepository repo,
             TokenRepository tokenRepo,
             UserManager<ApplicationUser> userManager,
             AccessTokenController tokenController,
             BTCPayWalletProvider walletProvider,
             BTCPayNetworkProvider networkProvider,
-            BTCPayRateProviderFactory rateFactory,
+            RateFetcher rateFactory,
             ExplorerClientProvider explorerProvider,
             IFeeProviderFactory feeRateProvider,
             LanguageService langService,
-            IHostingEnvironment env)
+            IHostingEnvironment env,
+            InvoiceController invoiceController)
         {
             _RateFactory = rateFactory;
-            _Dashboard = dashboard;
             _Repo = repo;
             _TokenRepository = tokenRepo;
             _UserManager = userManager;
@@ -66,19 +61,17 @@ namespace BTCPayServer.Controllers
             _Env = env;
             _NetworkProvider = networkProvider;
             _ExplorerProvider = explorerProvider;
-            _MvcJsonOptions = mvcJsonOptions.Value;
             _FeeRateProvider = feeRateProvider;
             _ServiceProvider = serviceProvider;
             _BtcpayServerOptions = btcpayServerOptions;
             _BTCPayEnv = btcpayEnv;
+            _InvoiceController = invoiceController;
         }
-        NBXplorerDashboard _Dashboard;
         BTCPayServerOptions _BtcpayServerOptions;
         BTCPayServerEnvironment _BTCPayEnv;
         IServiceProvider _ServiceProvider;
         BTCPayNetworkProvider _NetworkProvider;
         private ExplorerClientProvider _ExplorerProvider;
-        private MvcJsonOptions _MvcJsonOptions;
         private IFeeProviderFactory _FeeRateProvider;
         BTCPayWalletProvider _WalletProvider;
         AccessTokenController _TokenController;
@@ -87,6 +80,7 @@ namespace BTCPayServer.Controllers
         UserManager<ApplicationUser> _UserManager;
         private LanguageService _LangService;
         IHostingEnvironment _Env;
+        InvoiceController _InvoiceController;
 
         [TempData]
         public string StatusMessage
@@ -94,21 +88,6 @@ namespace BTCPayServer.Controllers
             get; set;
         }
 
-        [HttpGet]
-        [Route("{storeId}/wallet/{cryptoCode}")]
-        public IActionResult Wallet(string cryptoCode)
-        {
-            WalletModel model = new WalletModel();
-            model.ServerUrl = GetStoreUrl(StoreData.Id);
-            model.CryptoCurrency = cryptoCode;
-            return View(model);
-        }
-
-        private string GetStoreUrl(string storeId)
-        {
-            return HttpContext.Request.GetAbsoluteRoot() + "/stores/" + storeId + "/";
-        }
-
         [HttpGet]
         [Route("{storeId}/users")]
         public async Task<IActionResult> StoreUsers()
@@ -200,7 +179,7 @@ namespace BTCPayServer.Controllers
             var storeBlob = StoreData.GetStoreBlob();
             var vm = new RatesViewModel();
             vm.SetExchangeRates(GetSupportedExchanges(), storeBlob.PreferredExchange ?? CoinAverageRateProvider.CoinAverageName);
-            vm.RateMultiplier = (double)storeBlob.GetRateMultiplier();
+            vm.Spread = (double)(storeBlob.Spread * 100m);
             vm.Script = storeBlob.GetRateRules(_NetworkProvider).ToString();
             vm.DefaultScript = storeBlob.GetDefaultRateRules(_NetworkProvider).ToString();
             vm.AvailableExchanges = GetSupportedExchanges();
@@ -225,7 +204,7 @@ namespace BTCPayServer.Controllers
             model.AvailableExchanges = GetSupportedExchanges();
 
             blob.PreferredExchange = model.PreferredExchange;
-            blob.SetRateMultiplier(model.RateMultiplier);
+            blob.Spread = (decimal)model.Spread / 100.0m;
 
             if (!model.ShowScripting)
             {
@@ -283,7 +262,7 @@ namespace BTCPayServer.Controllers
                     {
                         CurrencyPair = fetch.Key.ToString(),
                         Error = testResult.Errors.Count != 0,
-                        Rule = testResult.Errors.Count == 0 ? testResult.Rule + " = " + testResult.Value.Value.ToString(CultureInfo.InvariantCulture)
+                        Rule = testResult.Errors.Count == 0 ? testResult.Rule + " = " + testResult.BidAsk.Bid.ToString(CultureInfo.InvariantCulture)
                                                             : testResult.EvaluatedRule
                     });
                 }
@@ -338,7 +317,7 @@ namespace BTCPayServer.Controllers
         {
             var storeBlob = StoreData.GetStoreBlob();
             var vm = new CheckoutExperienceViewModel();
-            vm.SetCryptoCurrencies(_ExplorerProvider, StoreData.GetDefaultCrypto());
+            vm.SetCryptoCurrencies(_ExplorerProvider, StoreData.GetDefaultCrypto(_NetworkProvider));
             vm.SetLanguages(_LangService, storeBlob.DefaultLang);
             vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
             vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
@@ -373,7 +352,7 @@ namespace BTCPayServer.Controllers
             }
             bool needUpdate = false;
             var blob = StoreData.GetStoreBlob();
-            if (StoreData.GetDefaultCrypto() != model.DefaultCryptoCurrency)
+            if (StoreData.GetDefaultCrypto(_NetworkProvider) != model.DefaultCryptoCurrency)
             {
                 needUpdate = true;
                 StoreData.SetDefaultCrypto(model.DefaultCryptoCurrency);
@@ -425,7 +404,7 @@ namespace BTCPayServer.Controllers
             vm.NetworkFee = !storeBlob.NetworkFeeDisabled;
             vm.SpeedPolicy = store.SpeedPolicy;
             vm.CanDelete = _Repo.CanDeleteStores();
-            AddPaymentMethods(store, vm);
+            AddPaymentMethods(store, storeBlob, vm);
             vm.MonitoringExpiration = storeBlob.MonitoringExpiration;
             vm.InvoiceExpiration = storeBlob.InvoiceExpiration;
             vm.LightningDescriptionTemplate = storeBlob.LightningDescriptionTemplate;
@@ -434,8 +413,9 @@ namespace BTCPayServer.Controllers
         }
 
 
-        private void AddPaymentMethods(StoreData store, StoreViewModel vm)
+        private void AddPaymentMethods(StoreData store, StoreBlob storeBlob, StoreViewModel vm)
         {
+            var excludeFilters = storeBlob.GetExcludedPaymentMethods();
             var derivationByCryptoCode =
                 store
                 .GetSupportedPaymentMethods(_NetworkProvider)
@@ -447,7 +427,9 @@ namespace BTCPayServer.Controllers
                 vm.DerivationSchemes.Add(new StoreViewModel.DerivationScheme()
                 {
                     Crypto = network.CryptoCode,
-                    Value = strategy?.DerivationStrategyBase?.ToString() ?? string.Empty
+                    Value = strategy?.DerivationStrategyBase?.ToString() ?? string.Empty,
+                    WalletId = new WalletId(store.Id, network.CryptoCode),
+                    Enabled = !excludeFilters.Match(new Payments.PaymentMethodId(network.CryptoCode, Payments.PaymentTypes.BTCLike))
                 });
             }
 
@@ -459,10 +441,12 @@ namespace BTCPayServer.Controllers
             foreach (var network in _NetworkProvider.GetAll())
             {
                 var lightning = lightningByCryptoCode.TryGet(network.CryptoCode);
+                var paymentId = new Payments.PaymentMethodId(network.CryptoCode, Payments.PaymentTypes.LightningLike);
                 vm.LightningNodes.Add(new StoreViewModel.LightningNode()
                 {
                     CryptoCode = network.CryptoCode,
-                    Address = lightning?.GetLightningUrl()?.BaseUri.AbsoluteUri ?? string.Empty
+                    Address = lightning?.GetLightningUrl()?.BaseUri.AbsoluteUri ?? string.Empty,
+                    Enabled = !excludeFilters.Match(paymentId)
                 });
             }
         }
@@ -537,7 +521,7 @@ namespace BTCPayServer.Controllers
 
         private CoinAverageExchange[] GetSupportedExchanges()
         {
-            return _RateFactory.GetSupportedExchanges()
+            return _RateFactory.RateProviderFactory.GetSupportedExchanges()
                     .Select(c => c.Value)
                     .OrderBy(s => s.Name, StringComparer.OrdinalIgnoreCase)
                     .ToArray();
@@ -783,5 +767,65 @@ namespace BTCPayServer.Controllers
                 return null;
             return _UserManager.GetUserId(User);
         }
+
+
+
+        // TODO: Need to have talk about how architect default currency implementation
+        // For now we have also hardcoded USD for Store creation and then Invoice creation
+        const string DEFAULT_CURRENCY = "USD";
+
+        [Route("{storeId}/paybutton")]
+        public IActionResult PayButton()
+        {
+            var store = StoreData;
+
+            var appUrl = HttpContext.Request.GetAbsoluteRoot().WithTrailingSlash();
+            var model = new PayButtonViewModel
+            {
+                Price = 10,
+                Currency = DEFAULT_CURRENCY,
+                ButtonSize = 2,
+                UrlRoot = appUrl,
+                PayButtonImageUrl = appUrl + "img/paybutton/pay.png",
+                StoreId = store.Id
+            };
+            return View(model);
+        }
+
+        [HttpPost]
+        [Route("{storeId}/pay")]
+        [IgnoreAntiforgeryToken]
+        [EnableCors(CorsPolicies.All)]
+        public async Task<IActionResult> PayButtonHandle(string storeId, [FromForm]PayButtonViewModel model)
+        {
+            var store = StoreData;
+
+            // TODO: extract validation to model
+            if (model.Price <= 0)
+                ModelState.AddModelError("Price", "Price must be greater than 0");
+
+            if (!ModelState.IsValid)
+                return View();
+
+            var invoice = await _InvoiceController.CreateInvoiceCore(new NBitpayClient.Invoice()
+            {
+                Price = model.Price,
+                Currency = model.Currency,
+                ItemDesc = model.CheckoutDesc,
+                OrderId = model.OrderId,
+                BuyerEmail = model.NotifyEmail,
+                NotificationURL = model.ServerIpn,
+                RedirectURL = model.BrowserRedirect,
+                FullNotifications = true
+            }, store, HttpContext.Request.GetAbsoluteRoot());
+            return Redirect(invoice.Data.Url);
+        }
+
+        [HttpGet]
+        [Route("{storeId}/paybuttontest")]
+        public IActionResult PayButtonTest(string storeId)
+        {
+            return View();
+        }
     }
 }

BTCPayServer/Controllers/UserStoresController.cs

@@ -23,18 +23,15 @@ namespace BTCPayServer.Controllers
         private StoreRepository _Repo;
         private BTCPayNetworkProvider _NetworkProvider;
         private UserManager<ApplicationUser> _UserManager;
-        private BTCPayWalletProvider _WalletProvider;
 
         public UserStoresController(
             UserManager<ApplicationUser> userManager,
             BTCPayNetworkProvider networkProvider,
-            BTCPayWalletProvider walletProvider,
             StoreRepository storeRepository)
         {
             _Repo = storeRepository;
             _NetworkProvider = networkProvider;
             _UserManager = userManager;
-            _WalletProvider = walletProvider;
         }        
 
         [HttpGet]
@@ -85,17 +82,6 @@ namespace BTCPayServer.Controllers
         {
             StoresViewModel result = new StoresViewModel();
             var stores = await _Repo.GetStoresByUserId(GetUserId());
-
-            var balances = stores
-                                .Select(s => s.GetSupportedPaymentMethods(_NetworkProvider)
-                                              .OfType<DerivationStrategy>()
-                                              .Select(d => ((Wallet: _WalletProvider.GetWallet(d.Network),
-                                                            DerivationStrategy: d.DerivationStrategyBase)))
-                                              .Where(_ => _.Wallet != null)
-                                              .Select(async _ => (await GetBalanceString(_)) + " " + _.Wallet.Network.CryptoCode))
-                                .ToArray();
-
-            await Task.WhenAll(balances.SelectMany(_ => _));
             for (int i = 0; i < stores.Length; i++)
             {
                 var store = stores[i];
@@ -104,8 +90,7 @@ namespace BTCPayServer.Controllers
                     Id = store.Id,
                     Name = store.StoreName,
                     WebSite = store.StoreWebsite,
-                    IsOwner = store.HasClaim(Policies.CanModifyStoreSettings.Key),
-                    Balances = store.HasClaim(Policies.CanModifyStoreSettings.Key) ? balances[i].Select(t => t.Result).ToArray() : Array.Empty<string>()
+                    IsOwner = store.HasClaim(Policies.CanModifyStoreSettings.Key)
                 });
             }
             return View(result);
@@ -128,22 +113,6 @@ namespace BTCPayServer.Controllers
             });
         }
 
-        private static async Task<string> GetBalanceString((BTCPayWallet Wallet, DerivationStrategyBase DerivationStrategy) _)
-        {
-            using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(10)))
-            {
-                try
-                {
-                    return (await _.Wallet.GetBalance(_.DerivationStrategy, cts.Token)).ToString();
-                }
-                catch
-                {
-                    return "--";
-                }
-            }
-        }
-
-
         private string GetUserId()
         {
             return _UserManager.GetUserId(User);

BTCPayServer/Controllers/WalletsController.cs

@@ -0,0 +1,487 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net.WebSockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+using BTCPayServer.HostedServices;
+using BTCPayServer.ModelBinders;
+using BTCPayServer.Models;
+using BTCPayServer.Models.WalletViewModels;
+using BTCPayServer.Security;
+using BTCPayServer.Services;
+using BTCPayServer.Services.Rates;
+using BTCPayServer.Services.Stores;
+using BTCPayServer.Services.Wallets;
+using LedgerWallet;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using NBitcoin;
+using NBXplorer.DerivationStrategy;
+using Newtonsoft.Json;
+using static BTCPayServer.Controllers.StoresController;
+
+namespace BTCPayServer.Controllers
+{
+    [Route("wallets")]
+    [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
+    [AutoValidateAntiforgeryToken]
+    public class WalletsController : Controller
+    {
+        private StoreRepository _Repo;
+        private BTCPayNetworkProvider _NetworkProvider;
+        private readonly UserManager<ApplicationUser> _userManager;
+        private readonly IOptions<MvcJsonOptions> _mvcJsonOptions;
+        private readonly NBXplorerDashboard _dashboard;
+        private readonly ExplorerClientProvider _explorerProvider;
+        private readonly IFeeProviderFactory _feeRateProvider;
+        private readonly BTCPayWalletProvider _walletProvider;
+        RateFetcher _RateProvider;
+        CurrencyNameTable _currencyTable;
+        public WalletsController(StoreRepository repo,
+                                 CurrencyNameTable currencyTable,
+                                 BTCPayNetworkProvider networkProvider,
+                                 UserManager<ApplicationUser> userManager,
+                                 IOptions<MvcJsonOptions> mvcJsonOptions,
+                                 NBXplorerDashboard dashboard,
+                                 RateFetcher rateProvider,
+                                 ExplorerClientProvider explorerProvider,
+                                 IFeeProviderFactory feeRateProvider,
+                                 BTCPayWalletProvider walletProvider)
+        {
+            _currencyTable = currencyTable;
+            _Repo = repo;
+            _RateProvider = rateProvider;
+            _NetworkProvider = networkProvider;
+            _userManager = userManager;
+            _mvcJsonOptions = mvcJsonOptions;
+            _dashboard = dashboard;
+            _explorerProvider = explorerProvider;
+            _feeRateProvider = feeRateProvider;
+            _walletProvider = walletProvider;
+        }
+
+        public async Task<IActionResult> ListWallets()
+        {
+            var wallets = new ListWalletsViewModel();
+            var stores = await _Repo.GetStoresByUserId(GetUserId());
+
+            var onChainWallets = stores
+                                .SelectMany(s => s.GetSupportedPaymentMethods(_NetworkProvider)
+                                              .OfType<DerivationStrategy>()
+                                              .Select(d => ((Wallet: _walletProvider.GetWallet(d.Network),
+                                                            DerivationStrategy: d.DerivationStrategyBase,
+                                                            Network: d.Network)))
+                                              .Where(_ => _.Wallet != null)
+                                              .Select(_ => (Wallet: _.Wallet,
+                                                            Store: s,
+                                                            Balance: GetBalanceString(_.Wallet, _.DerivationStrategy),
+                                                            DerivationStrategy: _.DerivationStrategy,
+                                                            Network: _.Network)))
+                                              .ToList();
+
+            foreach (var wallet in onChainWallets)
+            {
+                ListWalletsViewModel.WalletViewModel walletVm = new ListWalletsViewModel.WalletViewModel();
+                wallets.Wallets.Add(walletVm);
+                walletVm.Balance = await wallet.Balance + " " + wallet.Wallet.Network.CryptoCode;
+                if (!wallet.Store.HasClaim(Policies.CanModifyStoreSettings.Key))
+                {
+                    walletVm.Balance = "";
+                }
+                walletVm.CryptoCode = wallet.Network.CryptoCode;
+                walletVm.StoreId = wallet.Store.Id;
+                walletVm.Id = new WalletId(wallet.Store.Id, wallet.Network.CryptoCode);
+                walletVm.StoreName = wallet.Store.StoreName;
+                walletVm.IsOwner = wallet.Store.HasClaim(Policies.CanModifyStoreSettings.Key);
+            }
+
+            return View(wallets);
+        }
+
+        [HttpGet]
+        [Route("{walletId}")]
+        public async Task<IActionResult> WalletTransactions(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId)
+        {
+            var store = await _Repo.FindStore(walletId.StoreId, GetUserId());
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
+            if (paymentMethod == null)
+                return NotFound();
+
+            var wallet = _walletProvider.GetWallet(paymentMethod.Network);
+            var transactions = await wallet.FetchTransactions(paymentMethod.DerivationStrategyBase);
+
+            var model = new ListTransactionsViewModel();
+            foreach(var tx in transactions.UnconfirmedTransactions.Transactions.Concat(transactions.ConfirmedTransactions.Transactions))
+            {
+                var vm = new ListTransactionsViewModel.TransactionViewModel();
+                model.Transactions.Add(vm);
+                vm.Id = tx.TransactionId.ToString();
+                vm.Link = string.Format(CultureInfo.InvariantCulture, paymentMethod.Network.BlockExplorerLink, vm.Id);
+                vm.Timestamp = tx.Timestamp;
+                vm.Positive = tx.BalanceChange >= Money.Zero;
+                vm.Balance = tx.BalanceChange.ToString();
+            }
+            model.Transactions = model.Transactions.OrderByDescending(t => t.Timestamp).ToList();
+            return View(model);
+        }
+
+
+        [HttpGet]
+        [Route("{walletId}/send")]
+        public async Task<IActionResult> WalletSend(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId)
+        {
+            if (walletId?.StoreId == null)
+                return NotFound();
+            var store = await _Repo.FindStore(walletId.StoreId, GetUserId());
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
+            if (paymentMethod == null)
+                return NotFound();
+
+            var storeData = store.GetStoreBlob();
+            var rateRules = store.GetStoreBlob().GetRateRules(_NetworkProvider);
+            rateRules.Spread = 0.0m;
+            var currencyPair = new Rating.CurrencyPair(paymentMethod.PaymentId.CryptoCode, GetCurrencyCode(storeData.DefaultLang) ?? "USD");
+            WalletModel model = new WalletModel();
+            model.ServerUrl = GetLedgerWebsocketUrl(this.HttpContext, walletId.CryptoCode, paymentMethod.DerivationStrategyBase);
+            model.CryptoCurrency = walletId.CryptoCode;
+
+            using (CancellationTokenSource cts = new CancellationTokenSource())
+            {
+                try
+                {
+                    cts.CancelAfter(TimeSpan.FromSeconds(5));
+                    var result = await _RateProvider.FetchRate(currencyPair, rateRules).WithCancellation(cts.Token);
+                    if (result.BidAsk != null)
+                    {
+                        model.Rate = result.BidAsk.Center;
+                        model.Divisibility = _currencyTable.GetNumberFormatInfo(currencyPair.Right, true).CurrencyDecimalDigits;
+                        model.Fiat = currencyPair.Right;
+                    }
+                    else
+                    {
+                        model.RateError = $"{result.EvaluatedRule} ({string.Join(", ", result.Errors.OfType<object>().ToArray())})";
+                    }
+                }
+                catch(Exception ex) { model.RateError = ex.Message; }
+            }
+            return View(model);
+        }
+
+        private string GetCurrencyCode(string defaultLang)
+        {
+            if (defaultLang == null)
+                return null;
+            try
+            {
+                var ri = new RegionInfo(defaultLang);
+                return ri.ISOCurrencySymbol;
+            }
+            catch(ArgumentException) { }
+            return null;
+        }
+
+        private DerivationStrategy GetPaymentMethod(WalletId walletId, StoreData store)
+        {
+            if (store == null || !store.HasClaim(Policies.CanModifyStoreSettings.Key))
+                return null;
+
+            var paymentMethod = store
+                            .GetSupportedPaymentMethods(_NetworkProvider)
+                            .OfType<DerivationStrategy>()
+                            .FirstOrDefault(p => p.PaymentId.PaymentType == Payments.PaymentTypes.BTCLike && p.PaymentId.CryptoCode == walletId.CryptoCode);
+            return paymentMethod;
+        }
+
+        private static async Task<string> GetBalanceString(BTCPayWallet wallet, DerivationStrategyBase derivationStrategy)
+        {
+            using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(10)))
+            {
+                try
+                {
+                    return (await wallet.GetBalance(derivationStrategy, cts.Token)).ToString();
+                }
+                catch
+                {
+                    return "--";
+                }
+            }
+        }
+
+        private string GetUserId()
+        {
+            return _userManager.GetUserId(User);
+        }
+
+        public static string GetLedgerWebsocketUrl(HttpContext httpContext, string cryptoCode, DerivationStrategyBase derivationStrategy)
+        {
+            return $"{httpContext.Request.GetAbsoluteRoot().WithTrailingSlash()}ws/ledger/{cryptoCode}/{derivationStrategy?.ToString() ?? string.Empty}";
+        }
+
+        [HttpGet]
+        [Route("/ws/ledger/{cryptoCode}/{derivationScheme?}")]
+        public async Task<IActionResult> LedgerConnection(
+            string command,
+            // getinfo
+            string cryptoCode = null,
+            // getxpub
+            [ModelBinder(typeof(ModelBinders.DerivationSchemeModelBinder))]
+            DerivationStrategyBase derivationScheme = null,
+            int account = 0,
+            // sendtoaddress
+            string destination = null, string amount = null, string feeRate = null, string substractFees = null
+            )
+        {
+            if (!HttpContext.WebSockets.IsWebSocketRequest)
+                return NotFound();
+            var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
+
+            using (var normalOperationTimeout = new CancellationTokenSource())
+            using (var signTimeout = new CancellationTokenSource())
+            {
+                normalOperationTimeout.CancelAfter(TimeSpan.FromMinutes(30));
+                var hw = new HardwareWalletService(webSocket);
+                object result = null;
+                try
+                {
+                    BTCPayNetwork network = null;
+                    if (cryptoCode != null)
+                    {
+                        network = _NetworkProvider.GetNetwork(cryptoCode);
+                        if (network == null)
+                            throw new FormatException("Invalid value for crypto code");
+                    }
+
+                    BitcoinAddress destinationAddress = null;
+                    if (destination != null)
+                    {
+                        try
+                        {
+                            destinationAddress = BitcoinAddress.Create(destination, network.NBitcoinNetwork);
+                        }
+                        catch { }
+                        if (destinationAddress == null)
+                            throw new FormatException("Invalid value for destination");
+                    }
+
+                    FeeRate feeRateValue = null;
+                    if (feeRate != null)
+                    {
+                        try
+                        {
+                            feeRateValue = new FeeRate(Money.Satoshis(int.Parse(feeRate, CultureInfo.InvariantCulture)), 1);
+                        }
+                        catch { }
+                        if (feeRateValue == null || feeRateValue.FeePerK <= Money.Zero)
+                            throw new FormatException("Invalid value for fee rate");
+                    }
+
+                    Money amountBTC = null;
+                    if (amount != null)
+                    {
+                        try
+                        {
+                            amountBTC = Money.Parse(amount);
+                        }
+                        catch { }
+                        if (amountBTC == null || amountBTC <= Money.Zero)
+                            throw new FormatException("Invalid value for amount");
+                    }
+
+                    bool subsctractFeesValue = false;
+                    if (substractFees != null)
+                    {
+                        try
+                        {
+                            subsctractFeesValue = bool.Parse(substractFees);
+                        }
+                        catch { throw new FormatException("Invalid value for subtract fees"); }
+                    }
+                    if (command == "test")
+                    {
+                        result = await hw.Test(normalOperationTimeout.Token);
+                    }
+                    if (command == "getxpub")
+                    {
+                        var getxpubResult = await hw.GetExtPubKey(network, account, normalOperationTimeout.Token);
+                        result = getxpubResult;
+                    }
+                    if (command == "getinfo")
+                    {
+                        var strategy = GetDirectDerivationStrategy(derivationScheme);
+                        if (strategy == null || await hw.GetKeyPath(network, strategy, normalOperationTimeout.Token) == null)
+                        {
+                            throw new Exception($"This store is not configured to use this ledger");
+                        }
+
+                        var feeProvider = _feeRateProvider.CreateFeeProvider(network);
+                        var recommendedFees = feeProvider.GetFeeRateAsync();
+                        var balance = _walletProvider.GetWallet(network).GetBalance(derivationScheme);
+                        result = new GetInfoResult() { Balance = (double)(await balance).ToDecimal(MoneyUnit.BTC), RecommendedSatoshiPerByte = (int)(await recommendedFees).GetFee(1).Satoshi };
+                    }
+
+                    if (command == "sendtoaddress")
+                    {
+                        if (!_dashboard.IsFullySynched(network.CryptoCode, out var summary))
+                            throw new Exception($"{network.CryptoCode}: not started or fully synched");
+                        var strategy = GetDirectDerivationStrategy(derivationScheme);
+                        var wallet = _walletProvider.GetWallet(network);
+                        var change = wallet.GetChangeAddressAsync(derivationScheme);
+
+                        var 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)
+                        {
+                            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");
+                        }
+
+                        var foundKeyPath = await hw.GetKeyPath(network, strategy, normalOperationTimeout.Token);
+                        if (foundKeyPath == null)
+                        {
+                            throw new HardwareWalletException($"This store is not configured to use this ledger");
+                        }
+
+                        TransactionBuilder builder = new TransactionBuilder();
+                        builder.StandardTransactionPolicy.MinRelayTxFee = summary.Status.BitcoinStatus.MinRelayTxFee;
+                        builder.SetConsensusFactory(network.NBitcoinNetwork);
+                        builder.AddCoins(unspentCoins.Select(c => c.Coin).ToArray());
+
+                        foreach (var element in send)
+                        {
+                            builder.Send(element.destination, element.amount);
+                            if (element.substractFees)
+                                builder.SubtractFees();
+                        }
+                        builder.SetChange(changeAddress.Item1);
+
+                        if (network.MinFee == null)
+                        {
+                            builder.SendEstimatedFees(feeRateValue);
+                        }
+                        else
+                        {
+                            var estimatedFee = builder.EstimateFees(feeRateValue);
+                            if (network.MinFee > estimatedFee)
+                                builder.SendFees(network.MinFee);
+                            else
+                                builder.SendEstimatedFees(feeRateValue);
+                        }
+                        builder.Shuffle();
+                        var unsigned = builder.BuildTransaction(false);
+
+                        var keypaths = new Dictionary<Script, KeyPath>();
+                        foreach (var c in unspentCoins)
+                        {
+                            keypaths.TryAdd(c.Coin.ScriptPubKey, c.KeyPath);
+                        }
+
+                        var hasChange = unsigned.Outputs.Count == 2;
+                        var usedCoins = builder.FindSpentCoins(unsigned);
+
+                        Dictionary<uint256, Transaction> parentTransactions = new Dictionary<uint256, Transaction>();
+
+                        if (!strategy.Segwit)
+                        {
+                            var parentHashes = usedCoins.Select(c => c.Outpoint.Hash).ToHashSet();
+                            var explorer = _explorerProvider.GetExplorerClient(network);
+                            var getTransactionAsyncs = parentHashes.Select(h => (Op: explorer.GetTransactionAsync(h), Hash: h)).ToList();
+                            foreach (var getTransactionAsync in getTransactionAsyncs)
+                            {
+                                var tx = (await getTransactionAsync.Op);
+                                if (tx == null)
+                                    throw new Exception($"Parent transaction {getTransactionAsync.Hash} not found");
+                                parentTransactions.Add(tx.Transaction.GetHash(), tx.Transaction);
+                            }
+                        }
+
+
+                        signTimeout.CancelAfter(TimeSpan.FromMinutes(5));
+                        var transaction = await hw.SignTransactionAsync(usedCoins.Select(c => new SignatureRequest
+                        {
+                            InputTransaction = parentTransactions.TryGet(c.Outpoint.Hash),
+                            InputCoin = c,
+                            KeyPath = foundKeyPath.Derive(keypaths[c.TxOut.ScriptPubKey]),
+                            PubKey = strategy.Root.Derive(keypaths[c.TxOut.ScriptPubKey]).PubKey
+                        }).ToArray(), unsigned, hasChange ? foundKeyPath.Derive(changeAddress.Item2) : null, signTimeout.Token);
+                        try
+                        {
+                            var broadcastResult = await wallet.BroadcastTransactionsAsync(new List<Transaction>() { transaction });
+                            if (!broadcastResult[0].Success)
+                            {
+                                throw new Exception($"RPC Error while broadcasting: {broadcastResult[0].RPCCode} {broadcastResult[0].RPCCodeMessage} {broadcastResult[0].RPCMessage}");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new Exception("Error while broadcasting: " + ex.Message);
+                        }
+                        wallet.InvalidateCache(derivationScheme);
+                        result = new SendToAddressResult() { TransactionId = transaction.GetHash().ToString() };
+                    }
+                }
+                catch (OperationCanceledException)
+                { result = new LedgerTestResult() { Success = false, Error = "Timeout" }; }
+                catch (Exception ex)
+                { result = new LedgerTestResult() { Success = false, Error = ex.Message }; }
+                finally { hw.Dispose(); }
+                try
+                {
+                    if (result != null)
+                    {
+                        UTF8Encoding UTF8NOBOM = new UTF8Encoding(false);
+                        var bytes = UTF8NOBOM.GetBytes(JsonConvert.SerializeObject(result, _mvcJsonOptions.Value.SerializerSettings));
+                        await webSocket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, true, new CancellationTokenSource(2000).Token);
+                    }
+                }
+                catch { }
+                finally
+                {
+                    await webSocket.CloseSocket();
+                }
+            }
+            return new EmptyResult();
+        }
+
+        private DirectDerivationStrategy GetDirectDerivationStrategy(DerivationStrategyBase strategy)
+        {
+            if (strategy == null)
+                throw new Exception("The derivation scheme is not provided");
+            var directStrategy = strategy as DirectDerivationStrategy;
+            if (directStrategy == null)
+                directStrategy = (strategy as P2SHDerivationStrategy).Inner as DirectDerivationStrategy;
+            return directStrategy;
+        }
+    }
+
+
+    public class GetInfoResult
+    {
+        public int RecommendedSatoshiPerByte { get; set; }
+        public double Balance { get; set; }
+    }
+
+    public class SendToAddressResult
+    {
+        public string TransactionId { get; set; }
+    }
+}

BTCPayServer/CorsPolicies.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer
+{
+    public static class CorsPolicies
+    {
+        public const string All = "BTCPAY_ALL";
+    }
+}

BTCPayServer/Data/StoreData.cs

@@ -197,9 +197,9 @@ namespace BTCPayServer.Data
         public IEnumerable<APIKeyData> APIKeys { get; set; }
 
 #pragma warning disable CS0618
-        public string GetDefaultCrypto()
+        public string GetDefaultCrypto(BTCPayNetworkProvider networkProvider = null)
         {
-            return DefaultCrypto ?? "BTC";
+            return DefaultCrypto ?? (networkProvider == null ? "BTC" : GetSupportedPaymentMethods(networkProvider).Select(p => p.PaymentId.CryptoCode).FirstOrDefault() ?? "BTC");
         }
         public void SetDefaultCrypto(string defaultCryptoCurrency)
         {
@@ -281,23 +281,9 @@ namespace BTCPayServer.Data
             set;
         }
 
-        public void SetRateMultiplier(double rate)
-        {
-            RateRules = new List<RateRule_Obsolete>();
-            RateRules.Add(new RateRule_Obsolete() { Multiplier = rate });
-        }
-        public decimal GetRateMultiplier()
-        {
-            decimal rate = 1.0m;
-            if (RateRules == null || RateRules.Count == 0)
-                return rate;
-            foreach (var rule in RateRules)
-            {
-                rate = rule.Apply(null, rate);
-            }
-            return rate;
-        }
+        public decimal Spread { get; set; } = 0.0m;
 
+        [Obsolete]
         public List<RateRule_Obsolete> RateRules { get; set; } = new List<RateRule_Obsolete>();
         public string PreferredExchange { get; set; }
 
@@ -336,15 +322,15 @@ namespace BTCPayServer.Data
 
         public BTCPayServer.Rating.RateRules GetRateRules(BTCPayNetworkProvider networkProvider)
         {
-            if (!RateScripting || 
-                string.IsNullOrEmpty(RateScript) || 
+            if (!RateScripting ||
+                string.IsNullOrEmpty(RateScript) ||
                 !BTCPayServer.Rating.RateRules.TryParse(RateScript, out var rules))
             {
                 return GetDefaultRateRules(networkProvider);
             }
             else
             {
-                rules.GlobalMultiplier = GetRateMultiplier();
+                rules.Spread = Spread;
                 return rules;
             }
         }
@@ -370,8 +356,37 @@ namespace BTCPayServer.Data
             builder.AppendLine($"X_X = {preferredExchange}(X_X);");
 
             BTCPayServer.Rating.RateRules.TryParse(builder.ToString(), out var rules);
-            rules.GlobalMultiplier = GetRateMultiplier();
+            rules.Spread = Spread;
             return rules;
         }
+
+        [Obsolete("Use GetExcludedPaymentMethods instead")]
+        public string[] ExcludedPaymentMethods { get; set; }
+
+        public IPaymentFilter GetExcludedPaymentMethods()
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            if (ExcludedPaymentMethods == null || ExcludedPaymentMethods.Length == 0)
+                return PaymentFilter.Never();
+            return PaymentFilter.Any(ExcludedPaymentMethods.Select(p => PaymentFilter.WhereIs(PaymentMethodId.Parse(p))).ToArray());
+#pragma warning restore CS0618 // Type or member is obsolete
+        }
+
+        public bool IsExcluded(PaymentMethodId paymentMethodId)
+        {
+            return GetExcludedPaymentMethods().Match(paymentMethodId);
+        }
+
+        public void SetExcluded(PaymentMethodId paymentMethodId, bool value)
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            var methods = new HashSet<string>(ExcludedPaymentMethods ?? Array.Empty<string>());
+            if (value)
+                methods.Add(paymentMethodId.ToString());
+            else
+                methods.Remove(paymentMethodId.ToString());
+            ExcludedPaymentMethods = methods.ToArray();
+#pragma warning restore CS0618 // Type or member is obsolete
+        }
     }
 }

BTCPayServer/DerivationStrategy.cs

@@ -32,7 +32,7 @@ namespace BTCPayServer
 
         public BTCPayNetwork Network { get { return this._Network; } }
 
-        public DerivationStrategyBase DerivationStrategyBase { get { return this._DerivationStrategy; } }
+        public DerivationStrategyBase DerivationStrategyBase => this._DerivationStrategy;
 
         public PaymentMethodId PaymentId => new PaymentMethodId(Network.CryptoCode, PaymentTypes.BTCLike);
 

BTCPayServer/Extensions.cs

@@ -137,6 +137,23 @@ namespace BTCPayServer
                         request.PathBase.ToUriComponent());
         }
 
+        public static string GetCurrentUrl(this HttpRequest request)
+        {
+            return string.Concat(
+                        request.Scheme,
+                        "://",
+                        request.Host.ToUriComponent(),
+                        request.PathBase.ToUriComponent(),
+                        request.Path.ToUriComponent());
+        }
+
+        public static string GetCurrentPath(this HttpRequest request)
+        {
+            return string.Concat(
+                        request.PathBase.ToUriComponent(),
+                        request.Path.ToUriComponent());
+        }
+
         public static string GetAbsoluteUri(this HttpRequest request, string redirectUrl)
         {
             bool isRelative =

BTCPayServer/Filters/XFrameOptionsAttribute.cs

@@ -23,7 +23,10 @@ namespace BTCPayServer.Filters
 
         public void OnActionExecuting(ActionExecutingContext context)
         {
-            context.HttpContext.Response.SetHeaderOnStarting("X-Frame-Options", Value);
+            if (context.IsEffectivePolicy<XFrameOptionsAttribute>(this))
+            {
+                context.HttpContext.Response.SetHeaderOnStarting("X-Frame-Options", Value);
+            }
         }
     }
 }

BTCPayServer/HostedServices/CheckConfigurationHostedService.cs

@@ -0,0 +1,76 @@
+using System;
+using Microsoft.Extensions.Logging;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+using BTCPayServer.Services;
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using BTCPayServer.Configuration;
+using BTCPayServer.Logging;
+using NBitcoin.DataEncoders;
+
+namespace BTCPayServer.HostedServices
+{
+    public class CheckConfigurationHostedService : IHostedService
+    {
+        private readonly BTCPayServerOptions _options;
+
+        public CheckConfigurationHostedService(BTCPayServerOptions options)
+        {
+            _options = options;
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            new Thread(() =>
+            {
+                if (_options.SSHSettings != null)
+                {
+                    Logs.Configuration.LogInformation($"SSH settings detected, testing connection to {_options.SSHSettings.Username}@{_options.SSHSettings.Server} on port {_options.SSHSettings.Port} ...");
+                    var connection = new Renci.SshNet.SshClient(_options.SSHSettings.CreateConnectionInfo());
+                    connection.HostKeyReceived += (object sender, Renci.SshNet.Common.HostKeyEventArgs e) =>
+                    {
+                        e.CanTrust = true;
+                        if (!_options.IsTrustedFingerprint(e.FingerPrint, e.HostKey))
+                        {
+                            Logs.Configuration.LogWarning($"SSH host fingerprint for {e.HostKeyName} is untrusted, start BTCPay with -sshtrustedfingerprints \"{Encoders.Hex.EncodeData(e.FingerPrint)}\"");
+                        }
+                    };
+                    try
+                    {
+                        connection.Connect();
+                        connection.Disconnect();
+                        Logs.Configuration.LogInformation($"SSH connection succeeded");
+                    }
+                    catch (Renci.SshNet.Common.SshAuthenticationException)
+                    {
+                        Logs.Configuration.LogWarning($"SSH invalid credentials");
+                    }
+                    catch (Exception ex)
+                    {
+                        var message = ex.Message;
+                        if (ex is AggregateException aggrEx && aggrEx.InnerException?.Message != null)
+                        {
+                            message = aggrEx.InnerException.Message;
+                        }
+                        Logs.Configuration.LogWarning($"SSH connection issue: {message}");
+                    }
+                    finally
+                    {
+                        connection.Dispose();
+                    }
+                }
+            })
+            { IsBackground = true }.Start();
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            return Task.CompletedTask;
+        }
+    }
+}

BTCPayServer/HostedServices/InvoiceNotificationManager.cs

@@ -202,7 +202,8 @@ namespace BTCPayServer.HostedServices
                 PaymentSubtotals = dto.PaymentSubtotals,
                 PaymentTotals = dto.PaymentTotals,
                 AmountPaid = dto.AmountPaid,
-                ExchangeRates = dto.ExchangeRates
+                ExchangeRates = dto.ExchangeRates,
+                
             };
 
             // We keep backward compatibility with bitpay by passing BTC info to the notification
@@ -309,6 +310,8 @@ namespace BTCPayServer.HostedServices
             leases.Add(_EventAggregator.Subscribe<InvoiceEvent>(async e =>
             {
                 var invoice = await _InvoiceRepository.GetInvoice(null, e.Invoice.Id);
+                if (invoice == null)
+                    return;
                 List<Task> tasks = new List<Task>();
 
                 // Awaiting this later help make sure invoices should arrive in order

BTCPayServer/HostedServices/MigratorHostedService.cs

@@ -53,6 +53,12 @@ namespace BTCPayServer.HostedServices
                     settings.UnreachableStoreCheck = true;
                     await _Settings.UpdateSetting(settings);
                 }
+                if (!settings.ConvertMultiplierToSpread)
+                {
+                    await ConvertMultiplierToSpread();
+                    settings.ConvertMultiplierToSpread = true;
+                    await _Settings.UpdateSetting(settings);
+                }
             }
             catch (Exception ex)
             {
@@ -61,6 +67,31 @@ namespace BTCPayServer.HostedServices
             }
         }
 
+        private async Task ConvertMultiplierToSpread()
+        {
+            using (var ctx = _DBContextFactory.CreateContext())
+            {
+                foreach (var store in await ctx.Stores.ToArrayAsync())
+                {
+                    var blob = store.GetStoreBlob();
+#pragma warning disable CS0612 // Type or member is obsolete
+                    decimal multiplier = 1.0m;
+                    if (blob.RateRules != null && blob.RateRules.Count != 0)
+                    {
+                        foreach (var rule in blob.RateRules)
+                        {
+                            multiplier = rule.Apply(null, multiplier);
+                        }
+                    }
+                    blob.RateRules = null;
+                    blob.Spread = Math.Min(1.0m, Math.Max(0m, -(multiplier - 1.0m)));
+                    store.SetStoreBlob(blob);
+#pragma warning restore CS0612 // Type or member is obsolete
+                }
+                await ctx.SaveChangesAsync();
+            }
+        }
+
         private Task UnreachableStoreCheck()
         {
             return _StoreRepository.CleanUnreachableStores();

BTCPayServer/HostedServices/RatesHostedService.cs

@@ -18,9 +18,9 @@ namespace BTCPayServer.HostedServices
     {
         private SettingsRepository _SettingsRepository;
         private CoinAverageSettings _coinAverageSettings;
-        BTCPayRateProviderFactory _RateProviderFactory;
+        RateProviderFactory _RateProviderFactory;
         public RatesHostedService(SettingsRepository repo,
-                                  BTCPayRateProviderFactory rateProviderFactory,
+                                  RateProviderFactory rateProviderFactory,
                                   CoinAverageSettings coinAverageSettings)
         {
             this._SettingsRepository = repo;
@@ -33,16 +33,41 @@ namespace BTCPayServer.HostedServices
             return new[]
             {
                 CreateLoopTask(RefreshCoinAverageSupportedExchanges),
-                CreateLoopTask(RefreshCoinAverageSettings)
+                CreateLoopTask(RefreshCoinAverageSettings),
+                CreateLoopTask(RefreshRates)
             };
         }
+        async Task RefreshRates()
+        {
+
+            using (var timeout = CancellationTokenSource.CreateLinkedTokenSource(Cancellation))
+            {
+                timeout.CancelAfter(TimeSpan.FromSeconds(20.0));
+                try
+                {
+                    await Task.WhenAll(_RateProviderFactory.Providers
+                                    .Select(p => (Fetcher: p.Value as BackgroundFetcherRateProvider, ExchangeName: p.Key)).Where(p => p.Fetcher != null)
+                                    .Select(p => p.Fetcher.UpdateIfNecessary().ContinueWith(t =>
+                                    {
+                                        if (t.Result.Exception != null)
+                                        {
+                                            Logs.PayServer.LogWarning($"Error while contacting {p.ExchangeName}: {t.Result.Exception.Message}");
+                                        }
+                                    }, TaskScheduler.Default))
+                                    .ToArray()).WithCancellation(timeout.Token);
+                }
+                catch (OperationCanceledException) when (timeout.IsCancellationRequested)
+                {
+                }
+            }
+            await Task.Delay(TimeSpan.FromSeconds(30), Cancellation);
+        }
 
         async Task RefreshCoinAverageSupportedExchanges()
         {
-            await new SynchronizationContextRemover();
             var tickers = await new CoinAverageRateProvider() { Authenticator = _coinAverageSettings }.GetExchangeTickersAsync();
             var exchanges = new CoinAverageExchanges();
-            foreach(var item in tickers
+            foreach (var item in tickers
                 .Exchanges
                 .Select(c => new CoinAverageExchange(c.Name, c.DisplayName)))
             {
@@ -54,7 +79,6 @@ namespace BTCPayServer.HostedServices
 
         async Task RefreshCoinAverageSettings()
         {
-            await new SynchronizationContextRemover();
             var rates = (await _SettingsRepository.GetSettingAsync<RatesSetting>()) ?? new RatesSetting();
             _RateProviderFactory.CacheSpan = TimeSpan.FromMinutes(rates.CacheInMinutes);
             if (!string.IsNullOrWhiteSpace(rates.PrivateKey) && !string.IsNullOrWhiteSpace(rates.PublicKey))

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -39,6 +39,9 @@ using BTCPayServer.HostedServices;
 using Meziantou.AspNetCore.BundleTagHelpers;
 using System.Security.Claims;
 using BTCPayServer.Security;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using NBXplorer.DerivationStrategy;
+using NicolasDorier.RateLimits;
 
 namespace BTCPayServer.Hosting
 {
@@ -51,6 +54,7 @@ namespace BTCPayServer.Hosting
                 var factory = provider.GetRequiredService<ApplicationDbContextFactory>();
                 factory.ConfigureBuilder(o);
             });
+            services.AddHttpClient();
             services.TryAddSingleton<SettingsRepository>();
             services.TryAddSingleton<InvoicePaymentNotification>();
             services.TryAddSingleton<BTCPayServerOptions>(o => o.GetRequiredService<IOptions<BTCPayServerOptions>>().Value);
@@ -105,13 +109,19 @@ namespace BTCPayServer.Hosting
             });
 
             services.AddSingleton<CssThemeManager>();
-            services.Configure<MvcOptions>((o) => { o.Filters.Add(new ContentSecurityPolicyCssThemeManager()); });
+            services.Configure<MvcOptions>((o) => {
+                o.Filters.Add(new ContentSecurityPolicyCssThemeManager());
+                o.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(WalletId)));
+                o.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(DerivationStrategyBase)));
+            });
             services.AddSingleton<IHostedService, CssThemeManagerHostedService>();
             services.AddSingleton<IHostedService, MigratorHostedService>();
 
             services.AddSingleton<Payments.IPaymentMethodHandler<DerivationStrategy>, Payments.Bitcoin.BitcoinLikePaymentHandler>();
             services.AddSingleton<IHostedService, Payments.Bitcoin.NBXplorerListener>();
 
+            services.AddSingleton<IHostedService, HostedServices.CheckConfigurationHostedService>();
+
             services.AddSingleton<Payments.IPaymentMethodHandler<Payments.Lightning.LightningSupportedPaymentMethod>, Payments.Lightning.LightningLikePaymentHandler>();
             services.AddSingleton<IHostedService, Payments.Lightning.LightningListener>();
 
@@ -129,7 +139,8 @@ namespace BTCPayServer.Hosting
                 else
                     return new Bitpay(new Key(), new Uri("https://test.bitpay.com/"));
             });
-            services.TryAddSingleton<BTCPayRateProviderFactory>();
+            services.TryAddSingleton<RateProviderFactory>();
+            services.TryAddSingleton<RateFetcher>();
 
             services.TryAddScoped<IHttpContextAccessor, HttpContextAccessor>();
             services.AddTransient<AccessTokenController>();
@@ -146,11 +157,19 @@ namespace BTCPayServer.Hosting
             {
                 var opts = provider.GetRequiredService<BTCPayServerOptions>();
                 var bundle = new BundleOptions();
-                bundle.UseMinifiedFiles = opts.BundleJsCss;
+                bundle.UseBundles = opts.BundleJsCss;
                 bundle.AppendVersion = true;
                 return bundle;
             });
 
+            services.AddCors(options=> 
+            {
+                options.AddPolicy(CorsPolicies.All, p=>p.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin());
+            });
+
+            var rateLimits = new RateLimitService();
+            rateLimits.SetZone($"zone={ZoneLimits.Login} rate=5r/min burst=3 nodelay");
+            services.AddSingleton(rateLimits);
             return services;
         }
 

BTCPayServer/Hosting/BTCpayMiddleware.cs

@@ -100,7 +100,7 @@ namespace BTCPayServer.Hosting
                 (isJson || httpContext.Request.Query.ContainsKey("token")))
                 return true;
 
-            if (path.Equals("/rates", StringComparison.OrdinalIgnoreCase) &&
+            if (path.StartsWith("/rates", StringComparison.OrdinalIgnoreCase) &&
                 httpContext.Request.Method == "GET")
                 return true;
 

BTCPayServer/Hosting/Startup.cs

@@ -155,6 +155,7 @@ namespace BTCPayServer.Hosting
                 app.UseDeveloperExceptionPage();
             }
 
+            app.UseCors();
             app.UsePayServer();
             app.UseStaticFiles();
             app.UseAuthentication();
@@ -165,6 +166,7 @@ namespace BTCPayServer.Hosting
                 Authorization = new[] { new NeedRole(Roles.ServerAdmin) }
             });
             app.UseWebSockets();
+            app.UseStatusCodePages();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(

BTCPayServer/Logging/InvoiceLog.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Logging
+{
+    public class InvoiceLog
+    {
+        public DateTimeOffset Timestamp { get; set; }
+        public string Log { get; set; }
+
+        public override string ToString()
+        {
+            return $"{Timestamp.UtcDateTime}: {Log}";
+        }
+    }
+    public class InvoiceLogs
+    {
+        List<InvoiceLog> _InvoiceLogs = new List<InvoiceLog>();
+        public void Write(string data)
+        {
+            lock (_InvoiceLogs)
+            {
+                _InvoiceLogs.Add(new InvoiceLog() { Timestamp = DateTimeOffset.UtcNow, Log = data });
+            }
+        }
+
+        public List<InvoiceLog> ToList()
+        {
+            lock (_InvoiceLogs)
+            {
+                return _InvoiceLogs.ToList();
+            }
+        }
+    }
+}

BTCPayServer/ModelBinders/DerivationSchemeModelBinder.cs

@@ -0,0 +1,58 @@
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using NBitcoin;
+using System.Reflection;
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using NBXplorer.DerivationStrategy;
+
+namespace BTCPayServer.ModelBinders
+{
+    public class DerivationSchemeModelBinder : IModelBinder
+    {
+        public DerivationSchemeModelBinder()
+        {
+
+        }
+
+        #region IModelBinder Members
+
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (!typeof(DerivationStrategyBase).GetTypeInfo().IsAssignableFrom(bindingContext.ModelType))
+            {
+                return Task.CompletedTask;
+            }
+
+            ValueProviderResult val = bindingContext.ValueProvider.GetValue(
+                bindingContext.ModelName);
+            if (val == null)
+            {
+                return Task.CompletedTask;
+            }
+
+            string key = val.FirstValue as string;
+            if (key == null)
+            {
+                return Task.CompletedTask;
+            }
+
+            var networkProvider = (BTCPayNetworkProvider)bindingContext.HttpContext.RequestServices.GetService(typeof(BTCPayNetworkProvider));
+            var cryptoCode = bindingContext.ValueProvider.GetValue("cryptoCode").FirstValue;
+            var network = networkProvider.GetNetwork(cryptoCode ?? "BTC");
+            try
+            {
+                var data = new DerivationStrategyFactory(network.NBitcoinNetwork).Parse(key);
+                if (!bindingContext.ModelType.IsInstanceOfType(data))
+                {
+                    throw new FormatException("Invalid destination type");
+                }
+                bindingContext.Result = ModelBindingResult.Success(data);
+            }
+            catch { throw new FormatException("Invalid derivation scheme"); }
+            return Task.CompletedTask;
+        }
+
+        #endregion
+    }
+}

BTCPayServer/ModelBinders/WalletIdModelBinder.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace BTCPayServer.ModelBinders
+{
+    public class WalletIdModelBinder : IModelBinder
+    {
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (!typeof(WalletId).GetTypeInfo().IsAssignableFrom(bindingContext.ModelType))
+            {
+                return Task.CompletedTask;
+            }
+
+            ValueProviderResult val = bindingContext.ValueProvider.GetValue(
+                bindingContext.ModelName);
+            if (val == null)
+            {
+                return Task.CompletedTask;
+            }
+
+            string key = val.FirstValue as string;
+            if (key == null)
+            {
+                return Task.CompletedTask;
+            }
+
+            if(WalletId.TryParse(key, out var walletId))
+            {
+                bindingContext.Result = ModelBindingResult.Success(walletId);
+            }
+            return Task.CompletedTask;
+        }
+    }
+}

BTCPayServer/Models/AppViewModels/ListAppsViewModel.cs

@@ -15,6 +15,7 @@ namespace BTCPayServer.Models.AppViewModels
             public string AppName { get; set; }
             public string AppType { get; set; }
             public bool IsOwner { get; set; }
+
             public string UpdateAction { get { return "Update" + AppType; } }
             public string ViewAction { get { return "View" + AppType; } }
         }

BTCPayServer/Models/ServerViewModels/MaintenanceViewModel.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Configuration;
+using BTCPayServer.SSH;
+using Renci.SshNet;
+
+namespace BTCPayServer.Models.ServerViewModels
+{
+    public class MaintenanceViewModel
+    {
+        public bool ExposedSSH { get; set; }
+        [Required]
+        public string UserName { get; set; }
+        [Required]
+        [DataType(DataType.Password)]
+        public string Password { get; set; }
+        [Display(Name = "Change domain")]
+        public string DNSDomain { get; set; }
+        public SshClient CreateSSHClient(string host)
+        {
+            return new SshClient(host, UserName, Password);
+        }
+
+        internal void SetConfiguredSSH(SSHSettings settings)
+        {
+            if(settings != null)
+            {
+                ExposedSSH = true;
+                UserName = "unknown";
+                Password = "unknown";
+            }
+        }
+    }
+}

BTCPayServer/Models/ServerViewModels/SSHServiceViewModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Models.ServerViewModels
+{
+    public class SSHServiceViewModel
+    {
+        public string CommandLine { get; set; }
+        public string Password { get; set; }
+        public string KeyFilePassword { get; set; }
+        public bool HasKeyFile { get; set; }
+    }
+}

BTCPayServer/Models/ServerViewModels/ServicesViewModel.cs

@@ -14,5 +14,6 @@ namespace BTCPayServer.Models.ServerViewModels
             public int Index { get; set; }
         }
         public List<LNDServiceViewModel> LNDServices { get; set; } = new List<LNDServiceViewModel>();
+        public bool HasSSH { get; set; }
     }
 }

BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs

@@ -27,6 +27,7 @@ namespace BTCPayServer.Models.StoreViewModels
         [Display(Name = "Hint address")]
         public string HintAddress { get; set; }
         public bool Confirmation { get; set; }
+        public bool Enabled { get; set; } = true;
 
         public string ServerUrl { get; set; }
         public string StatusMessage { get; internal set; }

BTCPayServer/Models/StoreViewModels/LightningNodeViewModel.cs

@@ -24,5 +24,6 @@ namespace BTCPayServer.Models.StoreViewModels
         public string StatusMessage { get; set; }
         public string InternalLightningNode { get; internal set; }
         public bool SkipPortTest { get; set; }
+        public bool Enabled { get; set; } = true;
     }
 }

BTCPayServer/Models/StoreViewModels/PayButtonViewModel.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Models.StoreViewModels
+{
+    public class PayButtonViewModel
+    {
+        public decimal Price { get; set; }
+        [Required]
+        public string Currency { get; set; }
+        public string CheckoutDesc { get; set; }
+        public string OrderId { get; set; }
+        public int ButtonSize { get; set; }
+        [Url]
+        public string ServerIpn { get; set; }
+        [Url]
+        public string BrowserRedirect { get; set; }
+        [EmailAddress]
+        public string NotifyEmail { get; set; }
+
+        public string StoreId { get; set; }
+
+        // Data that influences Pay Button UI, but not invoice creation
+        public string UrlRoot { get; set; }
+        public List<string> CurrencyDropdown { get; set; }
+        public string PayButtonImageUrl { get; set; }
+    }
+}

BTCPayServer/Models/StoreViewModels/RatesViewModel.cs

@@ -44,9 +44,9 @@ namespace BTCPayServer.Models.StoreViewModels
         public string ScriptTest { get; set; }
         public CoinAverageExchange[] AvailableExchanges { get; set; }
 
-        [Display(Name = "Multiply the rate by... (Setting to 1.01 would apply a discount of 1% to the purchase)")]
-        [Range(0.01, 10.0)]
-        public double RateMultiplier
+        [Display(Name = "Add a spread on exchange rate of ... %")]
+        [Range(0.0, 100.0)]
+        public double Spread
         {
             get;
             set;

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -18,6 +18,8 @@ namespace BTCPayServer.Models.StoreViewModels
         {
             public string Crypto { get; set; }
             public string Value { get; set; }
+            public WalletId WalletId { get; set; }
+            public bool Enabled { get; set; }
         }
 
         public StoreViewModel()
@@ -82,6 +84,7 @@ namespace BTCPayServer.Models.StoreViewModels
         {
             public string CryptoCode { get; set; }
             public string Address { get; set; }
+            public bool Enabled { get; set; }
         }
         public List<LightningNode> LightningNodes
         {

BTCPayServer/Models/StoreViewModels/StoresViewModel.cs

@@ -34,10 +34,6 @@ namespace BTCPayServer.Models.StoreViewModels
                 get;
                 set;
             }
-            public string[] Balances
-            {
-                get; set;
-            }
         }
     }
 }

BTCPayServer/Models/WalletViewModels/ListTransactionsViewModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Models.WalletViewModels
+{
+    public class ListTransactionsViewModel
+    {
+        public class TransactionViewModel
+        {
+            public DateTimeOffset Timestamp { get; set; }
+            public string Id { get; set; }
+            public string Link { get; set; }
+            public bool Positive { get; set; }
+            public string Balance { get; set; }
+        }
+        public List<TransactionViewModel> Transactions { get; set; } = new List<TransactionViewModel>();
+    }
+}

BTCPayServer/Models/WalletViewModels/ListWalletsViewModel.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Models.WalletViewModels
+{
+    public class ListWalletsViewModel
+    {
+        public class WalletViewModel
+        {
+            public string StoreName { get; set; }
+            public string StoreId { get; set; }
+            public string CryptoCode { get; set; }
+            public string Balance { get; set; }
+            public bool IsOwner { get; set; }
+            public WalletId Id { get; set; }
+        }
+
+        public List<WalletViewModel> Wallets { get; set; } = new List<WalletViewModel>();
+    }
+}

BTCPayServer/Models/WalletViewModels/WalletModel.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace BTCPayServer.Models.StoreViewModels
+namespace BTCPayServer.Models.WalletViewModels
 {
     public class WalletModel
     {
@@ -15,5 +15,9 @@ namespace BTCPayServer.Models.StoreViewModels
             get;
             set;
         }
+        public decimal? Rate { get; set; }
+        public int Divisibility { get; set; }
+        public string Fiat { get; set; }
+        public string RateError { get; set; }
     }
 }

BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs

@@ -27,16 +27,30 @@ namespace BTCPayServer.Payments.Bitcoin
             _WalletProvider = walletProvider;
         }
 
-        public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(DerivationStrategy supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network)
+        class Prepare
+        {
+            public Task<FeeRate> GetFeeRate;
+            public Task<BitcoinAddress> ReserveAddress;
+        }
+
+        public override object PreparePayment(DerivationStrategy supportedPaymentMethod, StoreData store, BTCPayNetwork network)
+        {
+            return new Prepare()
+            {
+                GetFeeRate = _FeeRateProviderFactory.CreateFeeProvider(network).GetFeeRateAsync(),
+                ReserveAddress = _WalletProvider.GetWallet(network).ReserveAddressAsync(supportedPaymentMethod.DerivationStrategyBase)
+            };
+        }
+
+        public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(DerivationStrategy supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network, object preparePaymentObject)
         {
             if (!_ExplorerProvider.IsAvailable(network))
                 throw new PaymentMethodUnavailableException($"Full node not available");
-            var getFeeRate = _FeeRateProviderFactory.CreateFeeProvider(network).GetFeeRateAsync();
-            var getAddress = _WalletProvider.GetWallet(network).ReserveAddressAsync(supportedPaymentMethod.DerivationStrategyBase);
+            var prepare = (Prepare)preparePaymentObject;
             Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod onchainMethod = new Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod();
-            onchainMethod.FeeRate = await getFeeRate;
+            onchainMethod.FeeRate = await prepare.GetFeeRate;
             onchainMethod.TxFee = onchainMethod.FeeRate.GetFee(100); // assume price for 100 bytes
-            onchainMethod.DepositAddress = (await getAddress).ToString();
+            onchainMethod.DepositAddress = (await prepare.ReserveAddress).ToString();
             return onchainMethod;
         }
     }

BTCPayServer/Payments/IPaymentFilter.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Payments
+{
+    public interface IPaymentFilter
+    {
+        bool Match(PaymentMethodId paymentMethodId);
+    }
+
+    public class PaymentFilter
+    {
+        class NeverPaymentFilter : IPaymentFilter
+        {
+
+            private static readonly NeverPaymentFilter _Instance = new NeverPaymentFilter();
+            public static NeverPaymentFilter Instance
+            {
+                get
+                {
+                    return _Instance;
+                }
+            }
+            public bool Match(PaymentMethodId paymentMethodId)
+            {
+                return false;
+            }
+        }
+        class CompositePaymentFilter : IPaymentFilter
+        {
+            private readonly IPaymentFilter[] _filters;
+
+            public CompositePaymentFilter(IPaymentFilter[] filters)
+            {
+                _filters = filters;
+            }
+            public bool Match(PaymentMethodId paymentMethodId)
+            {
+                return _filters.Any(f => f.Match(paymentMethodId));
+            }
+        }
+        class PaymentIdFilter : IPaymentFilter
+        {
+            private readonly PaymentMethodId _paymentMethodId;
+
+            public PaymentIdFilter(PaymentMethodId paymentMethodId)
+            {
+                _paymentMethodId = paymentMethodId;
+            }
+            public bool Match(PaymentMethodId paymentMethodId)
+            {
+                return paymentMethodId == _paymentMethodId;
+            }
+        }
+        public static IPaymentFilter Never()
+        {
+            return NeverPaymentFilter.Instance;
+        }
+        public static IPaymentFilter Any(IPaymentFilter[] filters)
+        {
+            if (filters == null)
+                throw new ArgumentNullException(nameof(filters));
+            return new CompositePaymentFilter(filters);
+        }
+        public static IPaymentFilter WhereIs(PaymentMethodId paymentMethodId)
+        {
+            if (paymentMethodId == null)
+                throw new ArgumentNullException(nameof(paymentMethodId));
+            return new PaymentIdFilter(paymentMethodId);
+        }
+    }
+}

BTCPayServer/Payments/IPaymentMethodHandler.cs

@@ -20,23 +20,46 @@ namespace BTCPayServer.Payments
         /// <param name="store"></param>
         /// <param name="network"></param>
         /// <returns></returns>
-        Task<IPaymentMethodDetails> CreatePaymentMethodDetails(ISupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network);
+        Task<IPaymentMethodDetails> CreatePaymentMethodDetails(ISupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network, object preparePaymentObject);
+
+        /// <summary>
+        /// This method called before the rate have been fetched
+        /// </summary>
+        /// <param name="supportedPaymentMethod"></param>
+        /// <param name="store"></param>
+        /// <param name="network"></param>
+        /// <returns></returns>
+        object PreparePayment(ISupportedPaymentMethod supportedPaymentMethod, StoreData store, BTCPayNetwork network);
     }
 
     public interface IPaymentMethodHandler<T> : IPaymentMethodHandler where T : ISupportedPaymentMethod
     {
-        Task<IPaymentMethodDetails> CreatePaymentMethodDetails(T supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network);
+        Task<IPaymentMethodDetails> CreatePaymentMethodDetails(T supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network, object preparePaymentObject);
     }
 
     public abstract class PaymentMethodHandlerBase<T> : IPaymentMethodHandler<T> where T : ISupportedPaymentMethod
     {
-        public abstract Task<IPaymentMethodDetails> CreatePaymentMethodDetails(T supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network);
+        
+        public abstract Task<IPaymentMethodDetails> CreatePaymentMethodDetails(T supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network, object preparePaymentObject);
+        public virtual object PreparePayment(T supportedPaymentMethod, StoreData store, BTCPayNetwork network)
+        {
+            return null;
+        }
 
-        Task<IPaymentMethodDetails> IPaymentMethodHandler.CreatePaymentMethodDetails(ISupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network)
+        object IPaymentMethodHandler.PreparePayment(ISupportedPaymentMethod supportedPaymentMethod, StoreData store, BTCPayNetwork network)
         {
             if (supportedPaymentMethod is T method)
             {
-                return CreatePaymentMethodDetails(method, paymentMethod, store, network);
+                return PreparePayment(method, store, network);
+            }
+            throw new NotSupportedException("Invalid supportedPaymentMethod");
+        }
+
+        Task<IPaymentMethodDetails> IPaymentMethodHandler.CreatePaymentMethodDetails(ISupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network, object preparePaymentObject)
+        {
+            if (supportedPaymentMethod is T method)
+            {
+                return CreatePaymentMethodDetails(method, paymentMethod, store, network, preparePaymentObject);
             }
             throw new NotSupportedException("Invalid supportedPaymentMethod");
         }

BTCPayServer/Payments/Lightning/CLightning/CLightningRPCClient.cs

@@ -211,13 +211,26 @@ namespace BTCPayServer.Payments.Lightning.CLightning
         async Task<LightningNodeInformation> ILightningInvoiceClient.GetInfo(CancellationToken cancellation)
         {
             var info = await GetInfoAsync(cancellation);
-            var address = info.Address.Select(a => a.Address).FirstOrDefault();
-            var port = info.Port;
+            return ToLightningNodeInformation(info);
+        }
+
+        internal static LightningNodeInformation ToLightningNodeInformation(Charge.GetInfoResponse info)
+        {
+            var addr = info.Address.FirstOrDefault();
+            if (addr == null)
+            {
+                addr = new Charge.GetInfoResponse.GetInfoAddress();
+                addr.Address = "127.0.0.1";
+            }
+            if (addr.Port == 0)
+            {
+                addr.Port = 9735;
+            }
             return new LightningNodeInformation()
             {
                 NodeId = info.Id,
-                P2PPort = port,
-                Address = address,
+                P2PPort = addr.Port,
+                Address = addr.Address,
                 BlockHeight = info.BlockHeight
             };
         }

BTCPayServer/Payments/Lightning/Charge/ChargeClient.cs

@@ -163,15 +163,7 @@ namespace BTCPayServer.Payments.Lightning.Charge
         async Task<LightningNodeInformation> ILightningInvoiceClient.GetInfo(CancellationToken cancellation)
         {
             var info = await GetInfoAsync(cancellation);
-            var address = info.Address.Select(a => a.Address).FirstOrDefault();
-            var port = info.Port;
-            return new LightningNodeInformation()
-            {
-                NodeId = info.Id,
-                P2PPort = port,
-                Address = address,
-                BlockHeight = info.BlockHeight
-            };
+            return CLightning.CLightningRPCClient.ToLightningNodeInformation(info);
         }
     }
 }

BTCPayServer/Payments/Lightning/Charge/GetInfoResponse.cs

@@ -15,7 +15,6 @@ namespace BTCPayServer.Payments.Lightning.Charge
             public int Port { get; set; }
         }
         public string Id { get; set; }
-        public int Port { get; set; }
         public GetInfoAddress[] Address { get; set; }
         public string Version { get; set; }
         public int BlockHeight { get; set; }

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -26,7 +26,7 @@ namespace BTCPayServer.Payments.Lightning
             _LightningClientFactory = lightningClientFactory;
             _Dashboard = dashboard;
         }
-        public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network)
+        public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network, object preparePaymentObject)
         {
             var storeBlob = store.GetStoreBlob();
             var test = Test(supportedPaymentMethod, network);

BTCPayServer/Payments/Lightning/Lnd/LndInvoiceClient.cs

@@ -183,18 +183,24 @@ namespace BTCPayServer.Payments.Lightning.Lnd
                 NodeId = resp.Identity_pubkey
             };
 
+            try
+            {
+                var node = await _rpcClient.GetNodeInfoAsync(resp.Identity_pubkey, cancellation);
+                if (node.Node.Addresses == null || node.Node.Addresses.Count == 0)
+                    throw new Exception("Lnd External IP not set, make sure you use --externalip=$EXTERNALIP parameter on lnd");
 
-            var node = await _rpcClient.GetNodeInfoAsync(resp.Identity_pubkey, cancellation);
-            if (node.Node.Addresses == null || node.Node.Addresses.Count == 0)
-                throw new Exception("Lnd External IP not set, make sure you use --externalip=$EXTERNALIP parameter on lnd");
+                var firstNodeInfo = node.Node.Addresses.First();
+                var externalHostPort = firstNodeInfo.Addr.Split(':');
 
-            var firstNodeInfo = node.Node.Addresses.First();
-            var externalHostPort = firstNodeInfo.Addr.Split(':');
+                nodeInfo.Address = externalHostPort[0];
+                nodeInfo.P2PPort = ConvertInv.ToInt32(externalHostPort[1]);
 
-            nodeInfo.Address = externalHostPort[0];
-            nodeInfo.P2PPort = ConvertInv.ToInt32(externalHostPort[1]);
-
-            return nodeInfo;
+                return nodeInfo;
+            }
+            catch (SwaggerException ex) when (!string.IsNullOrEmpty(ex.Response))
+            {
+                throw new Exception("LND threw an error: " + ex.Response);
+            }
         }
 
         public async Task<LightningInvoice> GetInvoice(string invoiceId, CancellationToken cancellation = default(CancellationToken))
@@ -229,7 +235,7 @@ namespace BTCPayServer.Payments.Lightning.Lnd
             else
             {
                 var invoiceExpiry = ConvertInv.ToInt64(resp.Creation_date) + ConvertInv.ToInt64(resp.Expiry);
-                if (DateTimeOffset.FromUnixTimeSeconds(invoiceExpiry) > DateTimeOffset.UtcNow)
+                if (DateTimeOffset.FromUnixTimeSeconds(invoiceExpiry) < DateTimeOffset.UtcNow)
                 {
                     invoice.Status = "expired";
                 }

BTCPayServer/Properties/launchSettings.json

@@ -3,18 +3,18 @@
     "Docker-Regtest": {
       "commandName": "Project",
       "launchBrowser": true,
-        "environmentVariables": {
-            "BTCPAY_NETWORK": "regtest",
-            "BTCPAY_LTCEXPLORERURL": "http://127.0.0.1:32838/",
-            "BTCPAY_BTCEXPLORERURL": "http://127.0.0.1:32838/",
-            "ASPNETCORE_ENVIRONMENT": "Development",
-            "BTCPAY_CHAINS": "btc,ltc",
-            "BTCPAY_BTCLIGHTNING": "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify",
-            "BTCPAY_BTCEXTERNALLNDGRPC": "type=lnd-grpc;server=https://lnd:lnd@127.0.0.1:53280/;allowinsecure=true",
-            "BTCPAY_POSTGRES": "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver",
-            "BTCPAY_BUNDLEJSCSS": "false"
-        },
+      "environmentVariables": {
+        "BTCPAY_NETWORK": "regtest",
+        "BTCPAY_BUNDLEJSCSS": "false",
+        "BTCPAY_LTCEXPLORERURL": "http://127.0.0.1:32838/",
+        "BTCPAY_BTCLIGHTNING": "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify",
+        "BTCPAY_BTCEXTERNALLNDGRPC": "type=lnd-grpc;server=https://lnd:lnd@127.0.0.1:53280/;allowinsecure=true",
+        "BTCPAY_BTCEXPLORERURL": "http://127.0.0.1:32838/",
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "BTCPAY_CHAINS": "btc,ltc",
+        "BTCPAY_POSTGRES": "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver"
+      },
       "applicationUrl": "http://127.0.0.1:14142/"
     }
   }
-}
+}

BTCPayServer/Rating/ExchangeRates.cs

@@ -138,6 +138,9 @@ namespace BTCPayServer.Rating
                 return _Ask;
             }
         }
+
+        public decimal Center => (Ask + Bid) / 2.0m;
+
         public BidAsk Inverse()
         {
             return new BidAsk(1.0m / Ask, 1.0m / Bid);
@@ -218,6 +221,16 @@ namespace BTCPayServer.Rating
     }
     public class ExchangeRate
     {
+        public ExchangeRate()
+        {
+
+        }
+        public ExchangeRate(string exchange, CurrencyPair currencyPair, BidAsk bidAsk)
+        {
+            this.Exchange = exchange;
+            this.CurrencyPair = currencyPair;
+            this.BidAsk = bidAsk;
+        }
         public string Exchange { get; set; }
         public CurrencyPair CurrencyPair { get; set; }
         public BidAsk BidAsk { get; set; }

BTCPayServer/Rating/RateRules.cs

@@ -99,7 +99,20 @@ namespace BTCPayServer.Rating
         SyntaxNode root;
         RuleList ruleList;
 
-        public decimal GlobalMultiplier { get; set; } = 1.0m;
+        decimal _Spread;
+        public decimal Spread
+        {
+            get
+            {
+                return _Spread;
+            }
+            set
+            {
+                if (value > 1.0m || value < 0.0m)
+                    throw new ArgumentOutOfRangeException(paramName: nameof(value), message: "The spread should be between 0 and 1");
+                _Spread = value;
+            }
+        }
 
         RateRules(SyntaxNode root)
         {
@@ -133,10 +146,12 @@ namespace BTCPayServer.Rating
         {
             if (currencyPair.Left == "X" || currencyPair.Right == "X")
                 throw new ArgumentException(paramName: nameof(currencyPair), message: "Invalid X currency");
+            if (currencyPair.Left == currencyPair.Right)
+                return new RateRule(this, currencyPair, CreateExpression("1.0"));
             var candidate = FindBestCandidate(currencyPair);
-            if (GlobalMultiplier != decimal.One)
+            if (Spread != decimal.Zero)
             {
-                candidate = CreateExpression($"({candidate}) * {GlobalMultiplier.ToString(CultureInfo.InvariantCulture)}");
+                candidate = CreateExpression($"({candidate}) * ({(1.0m - Spread).ToString(CultureInfo.InvariantCulture)}, {(1.0m + Spread).ToString(CultureInfo.InvariantCulture)})");
             }
             return new RateRule(this, currencyPair, candidate);
         }
@@ -255,7 +270,7 @@ namespace BTCPayServer.Rating
                 {
                     case SyntaxKind.UnaryMinusExpression:
                         var v = Values.Pop();
-                        if(v.Bid == v.Ask)
+                        if (v.Bid == v.Ask)
                         {
                             Values.Push(-v);
                         }
@@ -336,7 +351,7 @@ namespace BTCPayServer.Rating
             {
                 _TupleValues = new Stack<decimal>();
                 base.VisitTupleExpression(node);
-                if(_TupleValues.Count != 2)
+                if (_TupleValues.Count != 2)
                 {
                     Errors.Add(RateRulesErrors.MissingArgument);
                 }
@@ -504,7 +519,7 @@ namespace BTCPayServer.Rating
 
         public bool Reevaluate()
         {
-            _Value = null;
+            _BidAsk = null;
             _EvaluatedNode = null;
             _Evaluated = null;
             Errors.Clear();
@@ -524,7 +539,7 @@ namespace BTCPayServer.Rating
                 Errors.AddRange(calculate.Errors);
                 return false;
             }
-            _Value = calculate.Values.Pop().Bid;
+            _BidAsk = calculate.Values.Pop();
             _EvaluatedNode = result;
             return true;
         }
@@ -563,12 +578,12 @@ namespace BTCPayServer.Rating
             return expression.NormalizeWhitespace("", "\n").ToString();
         }
 
-        decimal? _Value;
-        public decimal? Value
+        BidAsk _BidAsk;
+        public BidAsk BidAsk
         {
             get
             {
-                return _Value;
+                return _BidAsk;
             }
         }
     }

BTCPayServer/SSH/SSHFingerprint.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NBitcoin;
+using NBitcoin.DataEncoders;
+
+namespace BTCPayServer.SSH
+{
+    public class SSHFingerprint
+    {
+        public static bool TryParse(string str, out SSHFingerprint fingerPrint)
+        {
+            if (str == null)
+                throw new ArgumentNullException(nameof(str));
+            fingerPrint = null;
+            str = str.Trim();
+            try
+            {
+                var shortFingerprint = str.Replace(":", "", StringComparison.OrdinalIgnoreCase);
+                if (HexEncoder.IsWellFormed(shortFingerprint))
+                {
+                    var hash = Encoders.Hex.DecodeData(shortFingerprint);
+                    if (hash.Length == 16)
+                    {
+                        fingerPrint = new SSHFingerprint(hash);
+                        return true;
+                    }
+                    return false;
+                }
+            }
+            catch
+            {
+            }
+
+            if (str.StartsWith("SHA256:", StringComparison.OrdinalIgnoreCase))
+                str = str.Substring("SHA256:".Length).Trim();
+            if (str.Contains(':', StringComparison.OrdinalIgnoreCase))
+                return false;
+            if (!str.EndsWith('='))
+                str = str + "=";
+            try
+            {
+                var hash = Encoders.Base64.DecodeData(str);
+                if (hash.Length == 32)
+                {
+                    fingerPrint = new SSHFingerprint(hash);
+                    return true;
+                }
+            }
+            catch
+            {
+            }
+            return false;
+        }
+
+        public SSHFingerprint(byte[] hash)
+        {
+            if (hash.Length == 16)
+            {
+                _ShortFingerprint = hash;
+                _Original = string.Join(':', hash.Select(b => b.ToString("x2", CultureInfo.InvariantCulture))
+                    .ToArray());
+            }
+            else if (hash.Length == 32)
+            {
+                _FullHash = hash;
+                _Original = "SHA256:" + Encoders.Base64.EncodeData(hash);
+                if (_Original.EndsWith("=", StringComparison.OrdinalIgnoreCase))
+                    _Original = _Original.Substring(0, _Original.Length - 1);
+            }
+            else
+                throw new ArgumentException(paramName:nameof(hash), message: "Invalid length, expected 16 or 32");
+        }
+
+        byte[] _ShortFingerprint;
+        byte[] _FullHash;
+
+        public bool Match(byte[] shortFingerprint, byte[] hostKey)
+        {
+            if (shortFingerprint == null)
+                throw new ArgumentNullException(nameof(shortFingerprint));
+            if (hostKey == null)
+                throw new ArgumentNullException(nameof(hostKey));
+            if (_ShortFingerprint != null)
+                return Utils.ArrayEqual(shortFingerprint, _ShortFingerprint);
+            return Utils.ArrayEqual(_FullHash, NBitcoin.Crypto.Hashes.SHA256(hostKey));
+        }
+
+        string _Original;
+        public override string ToString()
+        {
+            return _Original;
+        }
+    }
+}

BTCPayServer/SSH/SSHSettings.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
+using Renci.SshNet;
+
+namespace BTCPayServer.SSH
+{
+    public class SSHSettings
+    {
+        public string Server { get; set; }
+        public int Port { get; set; } = 22;
+        public string KeyFile { get; set; }
+        public string KeyFilePassword { get; set; }
+        public string Username { get; set; }
+        public string Password { get; set; }
+
+        public ConnectionInfo CreateConnectionInfo()
+        {
+            if (!string.IsNullOrEmpty(KeyFile))
+            {
+                return new ConnectionInfo(Server, Port, Username, new[] { new PrivateKeyAuthenticationMethod(Username, new PrivateKeyFile(KeyFile, KeyFilePassword)) });
+            }
+            else
+            {
+                return new ConnectionInfo(Server, Port, Username, new[] { new PasswordAuthenticationMethod(Username, Password) });
+            }
+        }
+    }
+}

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -710,7 +710,6 @@ namespace BTCPayServer.Services.Invoices
             accounting.DueUncapped = accounting.TotalDue - accounting.Paid;
             accounting.NetworkFee = accounting.TotalDue - totalDueNoNetworkCost;
             var minimumTotalDueSatoshi = Math.Max(1.0m, accounting.TotalDue.Satoshi * (1.0m - ((decimal)ParentEntity.PaymentTolerance / 100.0m)));
-            minimumTotalDueSatoshi = Extensions.RoundUp(minimumTotalDueSatoshi, precision);
             accounting.MinimumTotalDue = Money.Satoshis(minimumTotalDueSatoshi);
             return accounting;
         }

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -19,6 +19,7 @@ using System.Globalization;
 using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Logging;
 using BTCPayServer.Payments;
+using System.Data.Common;
 
 namespace BTCPayServer.Services.Invoices
 {
@@ -101,7 +102,7 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
-        public async Task<InvoiceEntity> CreateInvoiceAsync(string storeId, InvoiceEntity invoice, IEnumerable<string> creationLogs, BTCPayNetworkProvider networkProvider)
+        public async Task<InvoiceEntity> CreateInvoiceAsync(string storeId, InvoiceEntity invoice, InvoiceLogs creationLogs, BTCPayNetworkProvider networkProvider)
         {
             List<string> textSearch = new List<string>();
             invoice = Clone(invoice, null);
@@ -147,13 +148,13 @@ namespace BTCPayServer.Services.Invoices
                 }
                 context.PendingInvoices.Add(new PendingInvoiceData() { Id = invoice.Id });
 
-                foreach(var log in creationLogs)
+                foreach(var log in creationLogs.ToList())
                 {
                     context.InvoiceEvents.Add(new InvoiceEventData()
                     {
                         InvoiceDataId = invoice.Id,
-                        Message = log,
-                        Timestamp = invoice.InvoiceTime,
+                        Message = log.Log,
+                        Timestamp = log.Timestamp,
                         UniqueId = Encoders.Hex.EncodeData(RandomUtils.GetBytes(10))
                     });
                 }
@@ -244,7 +245,11 @@ namespace BTCPayServer.Services.Invoices
                     Timestamp = DateTimeOffset.UtcNow,
                     UniqueId = Encoders.Hex.EncodeData(RandomUtils.GetBytes(10))
                 });
-                await context.SaveChangesAsync();
+                try
+                {
+                    await context.SaveChangesAsync();
+                }
+                catch(DbUpdateException) { } // Probably the invoice does not exists anymore
             }
         }
 

BTCPayServer/Services/LightningConfigurationProvider.cs

@@ -43,6 +43,7 @@ namespace BTCPayServer.Services
     }
     public class LightningConfiguration
     {
+        public string ChainType { get; set; }
         public string Type { get; set; }
         public string CryptoCode { get; set; }
         public string Host { get; set; }

BTCPayServer/Services/MigrationSettings.cs

@@ -9,5 +9,6 @@ namespace BTCPayServer.Services
     {
         public bool UnreachableStoreCheck { get; set; }
         public bool DeprecatedLightningConnectionStringCheck { get; set; }
+        public bool ConvertMultiplierToSpread { get; set; }
     }
 }

BTCPayServer/Services/Rates/BTCPayRateProviderFactory.cs

@@ -1,215 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using BTCPayServer.Rating;
-using ExchangeSharp;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Options;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class ExchangeException
-    {
-        public Exception Exception { get; set; }
-        public string ExchangeName { get; set; }
-    }
-    public class RateResult
-    {
-        public List<ExchangeException> ExchangeExceptions { get; set; } = new List<ExchangeException>();
-        public string Rule { get; set; }
-        public string EvaluatedRule { get; set; }
-        public HashSet<RateRulesErrors> Errors { get; set; }
-        public decimal? Value { get; set; }
-        public bool Cached { get; internal set; }
-    }
-
-    public class BTCPayRateProviderFactory
-    {
-        class QueryRateResult
-        {
-            public bool CachedResult { get; set; }
-            public List<ExchangeException> Exceptions { get; set; }
-            public ExchangeRates ExchangeRates { get; set; }
-        }
-        IMemoryCache _Cache;
-        private IOptions<MemoryCacheOptions> _CacheOptions;
-        public IMemoryCache Cache
-        {
-            get
-            {
-                return _Cache;
-            }
-        }
-        CoinAverageSettings _CoinAverageSettings;
-        public BTCPayRateProviderFactory(IOptions<MemoryCacheOptions> cacheOptions,
-                                         BTCPayNetworkProvider btcpayNetworkProvider,
-                                         CoinAverageSettings coinAverageSettings)
-        {
-            if (cacheOptions == null)
-                throw new ArgumentNullException(nameof(cacheOptions));
-            _CoinAverageSettings = coinAverageSettings;
-            _Cache = new MemoryCache(cacheOptions);
-            _CacheOptions = cacheOptions;
-            // We use 15 min because of limits with free version of bitcoinaverage
-            CacheSpan = TimeSpan.FromMinutes(15.0);
-            this.btcpayNetworkProvider = btcpayNetworkProvider;
-            InitExchanges();
-        }
-
-        public bool UseCoinAverageAsFallback { get; set; } = true;
-
-        private void InitExchanges()
-        {
-            // We need to be careful to only add exchanges which OnGetTickers implementation make only 1 request
-            DirectProviders.Add("binance", new ExchangeSharpRateProvider("binance", new ExchangeBinanceAPI(), true));
-            DirectProviders.Add("bittrex", new ExchangeSharpRateProvider("bittrex", new ExchangeBittrexAPI(), true));
-            DirectProviders.Add("poloniex", new ExchangeSharpRateProvider("poloniex", new ExchangePoloniexAPI(), false));
-            DirectProviders.Add("hitbtc", new ExchangeSharpRateProvider("hitbtc", new ExchangeHitbtcAPI(), false));
-            DirectProviders.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
-
-            // Handmade providers
-            DirectProviders.Add("bitpay", new BitpayRateProvider(new NBitpayClient.Bitpay(new NBitcoin.Key(), new Uri("https://bitpay.com/"))));
-            DirectProviders.Add(QuadrigacxRateProvider.QuadrigacxName, new QuadrigacxRateProvider());
-            DirectProviders.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, Authenticator = _CoinAverageSettings });
-
-            // Those exchanges make multiple requests when calling GetTickers so we remove them
-            //DirectProviders.Add("kraken", new ExchangeSharpRateProvider("kraken", new ExchangeKrakenAPI(), true));
-            //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()));
-            //DirectProviders.Add("bitstamp", new ExchangeSharpRateProvider("bitstamp", new ExchangeBitstampAPI()));
-        }
-
-        public CoinAverageExchanges GetSupportedExchanges()
-        {
-            CoinAverageExchanges exchanges = new CoinAverageExchanges();
-            foreach (var exchange in _CoinAverageSettings.AvailableExchanges)
-            {
-                exchanges.Add(exchange.Value);
-            }
-
-            // Add other exchanges supported here
-            exchanges.Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average"));
-            exchanges.Add(new CoinAverageExchange("cryptopia", "Cryptopia"));
-
-            return exchanges;
-        }
-
-        private readonly Dictionary<string, IRateProvider> _DirectProviders = new Dictionary<string, IRateProvider>();
-        public Dictionary<string, IRateProvider> DirectProviders
-        {
-            get
-            {
-                return _DirectProviders;
-            }
-        }
-
-
-        BTCPayNetworkProvider btcpayNetworkProvider;
-        TimeSpan _CacheSpan;
-        public TimeSpan CacheSpan
-        {
-            get
-            {
-                return _CacheSpan;
-            }
-            set
-            {
-                _CacheSpan = value;
-                InvalidateCache();
-            }
-        }
-
-        public void InvalidateCache()
-        {
-            _Cache = new MemoryCache(_CacheOptions);
-        }
-
-        public async Task<RateResult> FetchRate(CurrencyPair pair, RateRules rules)
-        {
-            return await FetchRates(new HashSet<CurrencyPair>(new[] { pair }), rules).First().Value;
-        }
-
-        public Dictionary<CurrencyPair, Task<RateResult>> FetchRates(HashSet<CurrencyPair> pairs, RateRules rules)
-        {
-            if (rules == null)
-                throw new ArgumentNullException(nameof(rules));
-
-            var fetchingRates = new Dictionary<CurrencyPair, Task<RateResult>>();
-            var fetchingExchanges = new Dictionary<string, Task<QueryRateResult>>();
-            var consolidatedRates = new ExchangeRates();
-
-            foreach (var i in pairs.Select(p => (Pair: p, RateRule: rules.GetRuleFor(p))))
-            {
-                var dependentQueries = new List<Task<QueryRateResult>>();
-                foreach (var requiredExchange in i.RateRule.ExchangeRates)
-                {
-                    if (!fetchingExchanges.TryGetValue(requiredExchange.Exchange, out var fetching))
-                    {
-                        fetching = QueryRates(requiredExchange.Exchange);
-                        fetchingExchanges.Add(requiredExchange.Exchange, fetching);
-                    }
-                    dependentQueries.Add(fetching);
-                }
-                fetchingRates.Add(i.Pair, GetRuleValue(dependentQueries, i.RateRule));
-            }
-            return fetchingRates;
-        }
-
-        private async Task<RateResult> GetRuleValue(List<Task<QueryRateResult>> dependentQueries, RateRule rateRule)
-        {
-            var result = new RateResult();
-            result.Cached = true;
-            foreach (var queryAsync in dependentQueries)
-            {
-                var query = await queryAsync;
-                if (!query.CachedResult)
-                    result.Cached = false;
-                result.ExchangeExceptions.AddRange(query.Exceptions);
-                foreach (var rule in query.ExchangeRates)
-                {
-                    rateRule.ExchangeRates.Add(rule);
-                }
-            }
-            rateRule.Reevaluate();
-            result.Value = rateRule.Value;
-            result.Errors = rateRule.Errors;
-            result.EvaluatedRule = rateRule.ToString(true);
-            result.Rule = rateRule.ToString(false);
-            return result;
-        }
-
-
-        private async Task<QueryRateResult> QueryRates(string exchangeName)
-        {
-            List<IRateProvider> providers = new List<IRateProvider>();
-            if (DirectProviders.TryGetValue(exchangeName, out var directProvider))
-                providers.Add(directProvider);
-            if (_CoinAverageSettings.AvailableExchanges.ContainsKey(exchangeName))
-            {
-                providers.Add(new CoinAverageRateProvider()
-                {
-                    Exchange = exchangeName,
-                    Authenticator = _CoinAverageSettings
-                });
-            }
-            var fallback = new FallbackRateProvider(providers.ToArray());
-            var cached = new CachedRateProvider(exchangeName, fallback, _Cache)
-            {
-                CacheSpan = CacheSpan
-            };
-            var value = await cached.GetRatesAsync();
-            return new QueryRateResult()
-            {
-                CachedResult = !fallback.Used,
-                ExchangeRates = value,
-                Exceptions = fallback.Exceptions
-                .Select(c => new ExchangeException() { Exception = c, ExchangeName = exchangeName }).ToList()
-            };
-        }
-    }
-}

BTCPayServer/Services/Rates/BackgroundFetcherRateProvider.cs

@@ -0,0 +1,162 @@
+using System;
+using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+using BTCPayServer.Logging;
+using BTCPayServer.Rating;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class BackgroundFetcherRateProvider : IRateProvider
+    {
+        public class LatestFetch
+        {
+            public ExchangeRates Latest;
+            public DateTimeOffset NextRefresh;
+            public DateTimeOffset Expiration;
+            public Exception Exception;
+
+            internal ExchangeRates GetResult()
+            {
+                if (Expiration <= DateTimeOffset.UtcNow)
+                {
+                    if (Exception != null)
+                    {
+                        ExceptionDispatchInfo.Capture(Exception).Throw();
+                    }
+                    else
+                    {
+                        throw new InvalidOperationException("The rate has expired");
+                    }
+                }
+                return Latest;
+            }
+        }
+
+        IRateProvider _Inner;
+        public BackgroundFetcherRateProvider(IRateProvider inner)
+        {
+            if (inner == null)
+                throw new ArgumentNullException(nameof(inner));
+            _Inner = inner;
+        }
+
+        TimeSpan _RefreshRate = TimeSpan.FromSeconds(30);
+        public TimeSpan RefreshRate
+        {
+            get
+            {
+                return _RefreshRate;
+            }
+            set
+            {
+                var diff = value - _RefreshRate;
+                var latest = _Latest;
+                if (latest != null)
+                    latest.NextRefresh += diff;
+                _RefreshRate = value;
+            }
+        }
+
+        TimeSpan _ValidatyTime = TimeSpan.FromMinutes(10);
+        public TimeSpan ValidatyTime
+        {
+            get
+            {
+                return _ValidatyTime;
+            }
+            set
+            {
+                var diff = value - _ValidatyTime;
+                var latest = _Latest;
+                if (latest != null)
+                    latest.Expiration += diff;
+                _ValidatyTime = value;
+            }
+        }
+
+        public DateTimeOffset NextUpdate
+        {
+            get
+            {
+                var latest = _Latest;
+                if (latest == null)
+                    return DateTimeOffset.UtcNow;
+                return latest.NextRefresh;
+            }
+        }
+
+        public bool DoNotAutoFetchIfExpired { get; set; }
+
+        public async Task<LatestFetch> UpdateIfNecessary()
+        {
+            if (NextUpdate <= DateTimeOffset.UtcNow)
+            {
+                try
+                {
+                    await Fetch();
+                }
+                catch { } // Exception is inside _Latest
+                return _Latest;
+            }
+            return _Latest;
+        }
+
+        LatestFetch _Latest;
+        public async Task<ExchangeRates> GetRatesAsync()
+        {
+            var latest = _Latest;
+            if (!DoNotAutoFetchIfExpired && latest != null && latest.Expiration <= DateTimeOffset.UtcNow + TimeSpan.FromSeconds(1.0))
+            {
+                Logs.PayServer.LogWarning($"GetRatesAsync was called on {GetExchangeName()} when the rate is outdated. It should never happen, let BTCPayServer developers know about this.");
+                latest = null;
+            }
+            return (latest ?? (await Fetch())).GetResult();
+        }
+
+        private string GetExchangeName()
+        {
+            if (_Inner is IHasExchangeName exchangeName)
+                return exchangeName.ExchangeName ?? "???";
+            return "???";
+        }
+
+        private async Task<LatestFetch> Fetch()
+        {
+            var previous = _Latest;
+            var fetch = new LatestFetch();
+            try
+            {
+                var rates = await _Inner.GetRatesAsync();
+                fetch.Latest = rates;
+                fetch.Expiration = DateTimeOffset.UtcNow + ValidatyTime;
+                fetch.NextRefresh = DateTimeOffset.UtcNow + RefreshRate;
+            }
+            catch (Exception ex)
+            {
+                if (previous != null)
+                {
+                    fetch.Latest = previous.Latest;
+                    fetch.Expiration = previous.Expiration;
+                }
+                else
+                {
+                    fetch.Expiration = DateTimeOffset.UtcNow;
+                }
+                fetch.NextRefresh = DateTimeOffset.UtcNow;
+                fetch.Exception = ex;
+            }
+            _Latest = fetch;
+            fetch.GetResult(); // Will throw if not valid
+            return fetch;
+        }
+
+        public void InvalidateCache()
+        {
+            _Latest = null;
+        }
+    }
+}

BTCPayServer/Services/Rates/BitpayRateProvider.cs

@@ -9,7 +9,7 @@ using BTCPayServer.Rating;
 
 namespace BTCPayServer.Services.Rates
 {
-    public class BitpayRateProvider : IRateProvider
+    public class BitpayRateProvider : IRateProvider, IHasExchangeName
     {
         public const string BitpayName = "bitpay";
         Bitpay _Bitpay;
@@ -20,6 +20,8 @@ namespace BTCPayServer.Services.Rates
             _Bitpay = bitpay;
         }
 
+        public string ExchangeName => BitpayName;
+
         public async Task<ExchangeRates> GetRatesAsync()
         {
             return new ExchangeRates((await _Bitpay.GetRatesAsync().ConfigureAwait(false))

BTCPayServer/Services/Rates/CachedRateProvider.cs

@@ -7,7 +7,7 @@ using Microsoft.Extensions.Caching.Memory;
 
 namespace BTCPayServer.Services.Rates
 {
-    public class CachedRateProvider : IRateProvider
+    public class CachedRateProvider : IRateProvider, IHasExchangeName
     {
         private IRateProvider _Inner;
         private IMemoryCache _MemoryCache;
@@ -31,14 +31,14 @@ namespace BTCPayServer.Services.Rates
             }
         }
 
-        public string ExchangeName { get; set; }
+        public string ExchangeName { get; }
 
         public TimeSpan CacheSpan
         {
             get;
             set;
         } = TimeSpan.FromMinutes(1.0);
-        public IMemoryCache MemoryCache { get => _MemoryCache; private set => _MemoryCache = value; }
+        public IMemoryCache MemoryCache { get => _MemoryCache; set => _MemoryCache = value; }
         
         public Task<ExchangeRates> GetRatesAsync()
         {

BTCPayServer/Services/Rates/CoinAverageRateProvider.cs

@@ -49,13 +49,26 @@ namespace BTCPayServer.Services.Rates
         Task AddHeader(HttpRequestMessage message);
     }
 
-    public class CoinAverageRateProvider : IRateProvider
+    public class CoinAverageRateProvider : IRateProvider, IHasExchangeName
     {
         public const string CoinAverageName = "coinaverage";
         public CoinAverageRateProvider()
         {
 
         }
+
+        public HttpClient HttpClient
+        {
+            get
+            {
+                return _LocalClient ?? _Client;
+            }
+            set
+            {
+                _LocalClient = null;
+            }
+        }
+        HttpClient _LocalClient;
         static HttpClient _Client = new HttpClient();
 
         public string Exchange { get; set; } = CoinAverageName;
@@ -69,6 +82,8 @@ namespace BTCPayServer.Services.Rates
 
         public ICoinAverageAuthenticator Authenticator { get; set; }
 
+        public string ExchangeName => Exchange ?? CoinAverageName;
+
         private bool TryToBidAsk(JProperty p, out BidAsk bidAsk)
         {
             bidAsk = null;
@@ -107,7 +122,7 @@ namespace BTCPayServer.Services.Rates
             {
                 await auth.AddHeader(request);
             }
-            var resp = await _Client.SendAsync(request);
+            var resp = await HttpClient.SendAsync(request);
             using (resp)
             {
 
@@ -150,7 +165,7 @@ namespace BTCPayServer.Services.Rates
             {
                 await auth.AddHeader(request);
             }
-            var resp = await _Client.SendAsync(request);
+            var resp = await HttpClient.SendAsync(request);
             resp.EnsureSuccessStatusCode();
         }
 
@@ -162,7 +177,7 @@ namespace BTCPayServer.Services.Rates
             {
                 await auth.AddHeader(request);
             }
-            var resp = await _Client.SendAsync(request);
+            var resp = await HttpClient.SendAsync(request);
             resp.EnsureSuccessStatusCode();
             var jobj = JObject.Parse(await resp.Content.ReadAsStringAsync());
             var response = new GetRateLimitsResponse();
@@ -193,7 +208,7 @@ namespace BTCPayServer.Services.Rates
             {
                 await auth.AddHeader(request);
             }
-            var resp = await _Client.SendAsync(request);
+            var resp = await HttpClient.SendAsync(request);
             resp.EnsureSuccessStatusCode();
             var jobj = JObject.Parse(await resp.Content.ReadAsStringAsync());
             var response = new GetExchangeTickersResponse();

BTCPayServer/Services/Rates/ExchangeSharpRateProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -9,7 +10,7 @@ using ExchangeSharp;
 
 namespace BTCPayServer.Services.Rates
 {
-    public class ExchangeSharpRateProvider : IRateProvider
+    public class ExchangeSharpRateProvider : IRateProvider, IHasExchangeName
     {
         readonly ExchangeAPI _ExchangeAPI;
         readonly string _ExchangeName;
@@ -28,6 +29,8 @@ namespace BTCPayServer.Services.Rates
             get; set;
         }
 
+        public string ExchangeName => _ExchangeName;
+
         public async Task<ExchangeRates> GetRatesAsync()
         {
             await new SynchronizationContextRemover();
@@ -43,17 +46,17 @@ namespace BTCPayServer.Services.Rates
         }
 
         // ExchangeSymbolToGlobalSymbol throws exception which would kill perf
-        HashSet<string> notFoundSymbols = new HashSet<string>();
+        ConcurrentDictionary<string, string> notFoundSymbols = new ConcurrentDictionary<string, string>();
         private ExchangeRate CreateExchangeRate(KeyValuePair<string, ExchangeTicker> ticker)
         {
-            if (notFoundSymbols.Contains(ticker.Key))
+            if (notFoundSymbols.ContainsKey(ticker.Key))
                 return null;
             try
             {
                 var tickerName = _ExchangeAPI.ExchangeSymbolToGlobalSymbol(ticker.Key);
                 if (!CurrencyPair.TryParse(tickerName, out var pair))
                 {
-                    notFoundSymbols.Add(ticker.Key);
+                    notFoundSymbols.TryAdd(ticker.Key, ticker.Key);
                     return null;
                 }
                 if(ReverseCurrencyPair)
@@ -66,7 +69,7 @@ namespace BTCPayServer.Services.Rates
             }
             catch (ArgumentException)
             {
-                notFoundSymbols.Add(ticker.Key);
+                notFoundSymbols.TryAdd(ticker.Key, ticker.Key);
                 return null;
             }
         }

BTCPayServer/Services/Rates/FallbackRateProvider.cs

@@ -9,7 +9,6 @@ namespace BTCPayServer.Services.Rates
     public class FallbackRateProvider : IRateProvider
     {
         IRateProvider[] _Providers;
-        public bool Used { get; set; }
         public FallbackRateProvider(IRateProvider[] providers)
         {
             if (providers == null)
@@ -19,7 +18,6 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<ExchangeRates> GetRatesAsync()
         {
-            Used = true;
             foreach (var p in _Providers)
             {
                 try

BTCPayServer/Services/Rates/IHasExchangeName.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services.Rates
+{
+    public interface IHasExchangeName
+    {
+        string ExchangeName { get; }
+    }
+}

BTCPayServer/Services/Rates/KrakenExchangeRateProvider.cs

@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+using ExchangeSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Services.Rates
+{
+    // Make sure that only one request is sent to kraken in general
+    public class KrakenExchangeRateProvider : IRateProvider, IHasExchangeName
+    {
+        public KrakenExchangeRateProvider()
+        {
+            _Helper = new ExchangeKrakenAPI();
+        }
+        ExchangeKrakenAPI _Helper;
+        public HttpClient HttpClient
+        {
+            get
+            {
+                return _LocalClient ?? _Client;
+            }
+            set
+            {
+                _LocalClient = null;
+            }
+        }
+
+        public string ExchangeName => "kraken";
+
+        HttpClient _LocalClient;
+        static HttpClient _Client = new HttpClient();
+
+        // ExchangeSymbolToGlobalSymbol throws exception which would kill perf
+        ConcurrentDictionary<string, string> notFoundSymbols = new ConcurrentDictionary<string, string>();
+        string[] _Symbols = Array.Empty<string>();
+        DateTimeOffset? _LastSymbolUpdate = null;
+
+        public async Task<ExchangeRates> GetRatesAsync()
+        {
+            var result = new ExchangeRates();
+            var symbols = await GetSymbolsAsync();
+            var normalizedPairsList = symbols.Where(s => !notFoundSymbols.ContainsKey(s)).Select(s => _Helper.NormalizeSymbol(s)).ToList();
+            var csvPairsList = string.Join(",", normalizedPairsList);
+            JToken apiTickers = await MakeJsonRequestAsync<JToken>("/0/public/Ticker", null, new Dictionary<string, object> { { "pair", csvPairsList } });
+            var tickers = new List<KeyValuePair<string, ExchangeTicker>>();
+            foreach (string symbol in symbols)
+            {
+                var ticker = ConvertToExchangeTicker(symbol, apiTickers[symbol]);
+                if (ticker != null)
+                {
+                    try
+                    {
+                        var global = _Helper.ExchangeSymbolToGlobalSymbol(symbol);
+                        if (CurrencyPair.TryParse(global, out var pair))
+                            result.Add(new ExchangeRate("kraken", pair.Inverse(), new BidAsk(ticker.Bid, ticker.Ask)));
+                        else
+                            notFoundSymbols.TryAdd(symbol, symbol);
+                    }
+                    catch (ArgumentException)
+                    {
+                        notFoundSymbols.TryAdd(symbol, symbol);
+                    }
+                }
+            }
+            return result;
+        }
+
+        private static ExchangeTicker ConvertToExchangeTicker(string symbol, JToken ticker)
+        {
+            if (ticker == null)
+                return null;
+            decimal last = ticker["c"][0].ConvertInvariant<decimal>();
+            return new ExchangeTicker
+            {
+                Ask = ticker["a"][0].ConvertInvariant<decimal>(),
+                Bid = ticker["b"][0].ConvertInvariant<decimal>(),
+                Last = last,
+                Volume = new ExchangeVolume
+                {
+                    BaseVolume = ticker["v"][1].ConvertInvariant<decimal>(),
+                    BaseSymbol = symbol,
+                    ConvertedVolume = ticker["v"][1].ConvertInvariant<decimal>() * last,
+                    ConvertedSymbol = symbol,
+                    Timestamp = DateTime.UtcNow
+                }
+            };
+        }
+
+        private async Task<string[]> GetSymbolsAsync()
+        {
+            if (_LastSymbolUpdate != null && DateTimeOffset.UtcNow - _LastSymbolUpdate.Value < TimeSpan.FromDays(0.5))
+            {
+                return _Symbols;
+            }
+            else
+            {
+                JToken json = await MakeJsonRequestAsync<JToken>("/0/public/AssetPairs");
+                var symbols = (from prop in json.Children<JProperty>() where !prop.Name.Contains(".d", StringComparison.OrdinalIgnoreCase) select prop.Name).ToArray();
+                _Symbols = symbols;
+                _LastSymbolUpdate = DateTimeOffset.UtcNow;
+                return symbols;
+            }
+        }
+
+        private async Task<T> MakeJsonRequestAsync<T>(string url, string baseUrl = null, Dictionary<string, object> payload = null, string requestMethod = null)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("https://api.kraken.com");
+            ;
+            sb.Append(url);
+            if (payload != null)
+            {
+                sb.Append("?");
+                sb.Append(String.Join('&', payload.Select(kv => $"{kv.Key}={kv.Value}").OfType<object>().ToArray()));
+            }
+            var request = new HttpRequestMessage(HttpMethod.Get, sb.ToString());
+            var response = await HttpClient.SendAsync(request);
+            string stringResult = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<T>(stringResult);
+            if (result is JToken json)
+            {
+                if (!(json is JArray) && json["error"] is JArray error && error.Count != 0)
+                {
+                    throw new APIException(error[0].ToStringInvariant());
+                }
+                result = (T)(object)(json["result"] ?? json);
+            }
+            return result;
+        }
+    }
+}

BTCPayServer/Services/Rates/NullRateProvider.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class NullRateProvider : IRateProvider
+    {
+        private NullRateProvider()
+        {
+
+        }
+        private static readonly NullRateProvider _Instance = new NullRateProvider();
+        public static NullRateProvider Instance
+        {
+            get
+            {
+                return _Instance;
+            }
+        }
+        public Task<ExchangeRates> GetRatesAsync()
+        {
+            return Task.FromResult(new ExchangeRates());
+        }
+    }
+}

BTCPayServer/Services/Rates/QuadrigacxRateProvider.cs

@@ -9,11 +9,13 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Services.Rates
 {
-    public class QuadrigacxRateProvider : IRateProvider
+    public class QuadrigacxRateProvider : IRateProvider, IHasExchangeName
     {
         public const string QuadrigacxName = "quadrigacx";
         static HttpClient _Client = new HttpClient();
 
+        public string ExchangeName => QuadrigacxName;
+
         private bool TryToBidAsk(JObject p, out BidAsk v)
         {
             v = null;

BTCPayServer/Services/Rates/RateFetcher.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+using ExchangeSharp;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Options;
+using static BTCPayServer.Services.Rates.RateProviderFactory;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class ExchangeException
+    {
+        public Exception Exception { get; set; }
+        public string ExchangeName { get; set; }
+    }
+    public class RateResult
+    {
+        public List<ExchangeException> ExchangeExceptions { get; set; } = new List<ExchangeException>();
+        public string Rule { get; set; }
+        public string EvaluatedRule { get; set; }
+        public HashSet<RateRulesErrors> Errors { get; set; }
+        public BidAsk BidAsk { get; set; }
+        public TimeSpan Latency { get; internal set; }
+    }
+
+    public class RateFetcher
+    {
+        private readonly RateProviderFactory _rateProviderFactory;
+
+        public RateFetcher(RateProviderFactory rateProviderFactory)
+        {
+            _rateProviderFactory = rateProviderFactory;
+        }
+
+        public RateProviderFactory RateProviderFactory => _rateProviderFactory;
+
+        public async Task<RateResult> FetchRate(CurrencyPair pair, RateRules rules)
+        {
+            return await FetchRates(new HashSet<CurrencyPair>(new[] { pair }), rules).First().Value;
+        }
+
+        public Dictionary<CurrencyPair, Task<RateResult>> FetchRates(HashSet<CurrencyPair> pairs, RateRules rules)
+        {
+            if (rules == null)
+                throw new ArgumentNullException(nameof(rules));
+
+            var fetchingRates = new Dictionary<CurrencyPair, Task<RateResult>>();
+            var fetchingExchanges = new Dictionary<string, Task<QueryRateResult>>();
+            var consolidatedRates = new ExchangeRates();
+
+            foreach (var i in pairs.Select(p => (Pair: p, RateRule: rules.GetRuleFor(p))))
+            {
+                var dependentQueries = new List<Task<QueryRateResult>>();
+                foreach (var requiredExchange in i.RateRule.ExchangeRates)
+                {
+                    if (!fetchingExchanges.TryGetValue(requiredExchange.Exchange, out var fetching))
+                    {
+                        fetching = _rateProviderFactory.QueryRates(requiredExchange.Exchange);
+                        fetchingExchanges.Add(requiredExchange.Exchange, fetching);
+                    }
+                    dependentQueries.Add(fetching);
+                }
+                fetchingRates.Add(i.Pair, GetRuleValue(dependentQueries, i.RateRule));
+            }
+            return fetchingRates;
+        }
+
+        private async Task<RateResult> GetRuleValue(List<Task<QueryRateResult>> dependentQueries, RateRule rateRule)
+        {
+            var result = new RateResult();
+            foreach (var queryAsync in dependentQueries)
+            {
+                var query = await queryAsync;
+                result.Latency = query.Latency;
+                if (query.Exception != null)
+                    result.ExchangeExceptions.Add(query.Exception);
+                foreach (var rule in query.ExchangeRates)
+                {
+                    rateRule.ExchangeRates.SetRate(rule.Exchange, rule.CurrencyPair, rule.BidAsk);
+                }
+            }
+            rateRule.Reevaluate();
+            result.BidAsk = rateRule.BidAsk;
+            result.Errors = rateRule.Errors;
+            result.EvaluatedRule = rateRule.ToString(true);
+            result.Rule = rateRule.ToString(false);
+            return result;
+        }
+    }
+}

BTCPayServer/Services/Rates/RateProviderFactory.cs

@@ -0,0 +1,186 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+using ExchangeSharp;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Options;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class RateProviderFactory
+    {
+        class WrapperRateProvider : IRateProvider
+        {
+            private readonly IRateProvider _inner;
+            public Exception Exception { get; private set; }
+            public TimeSpan Latency { get; set; }
+            public WrapperRateProvider(IRateProvider inner)
+            {
+                _inner = inner;
+            }
+            public async Task<ExchangeRates> GetRatesAsync()
+            {
+                DateTimeOffset now = DateTimeOffset.UtcNow;
+                try
+                {
+                    return await _inner.GetRatesAsync();
+                }
+                catch (Exception ex)
+                {
+                    Exception = ex;
+                    return new ExchangeRates();
+                }
+                finally
+                {
+                    Latency = DateTimeOffset.UtcNow - now;
+                }
+            }
+        }
+        public class QueryRateResult
+        {
+            public TimeSpan Latency { get; set; }
+            public ExchangeRates ExchangeRates { get; set; }
+            public ExchangeException Exception { get; internal set; }
+        }
+        public RateProviderFactory(IOptions<MemoryCacheOptions> cacheOptions,
+                                   IHttpClientFactory httpClientFactory,
+                                   CoinAverageSettings coinAverageSettings)
+        {
+            _httpClientFactory = httpClientFactory;
+            _CoinAverageSettings = coinAverageSettings;
+            _CacheOptions = cacheOptions;
+            // We use 15 min because of limits with free version of bitcoinaverage
+            CacheSpan = TimeSpan.FromMinutes(15.0);
+            InitExchanges();
+        }
+        private IOptions<MemoryCacheOptions> _CacheOptions;
+        TimeSpan _CacheSpan;
+        public TimeSpan CacheSpan
+        {
+            get
+            {
+                return _CacheSpan;
+            }
+            set
+            {
+                _CacheSpan = value;
+                InvalidateCache();
+            }
+        }
+        public void InvalidateCache()
+        {
+            var cache = new MemoryCache(_CacheOptions);
+            foreach (var provider in Providers.Select(p => p.Value as CachedRateProvider).Where(p => p != null))
+            {
+                provider.CacheSpan = CacheSpan;
+                provider.MemoryCache = cache;
+            }
+            if (Providers.TryGetValue(CoinAverageRateProvider.CoinAverageName, out var coinAverage) && coinAverage is BackgroundFetcherRateProvider c)
+            {
+                c.RefreshRate = CacheSpan;
+                c.ValidatyTime = CacheSpan + TimeSpan.FromMinutes(1.0);
+            }
+        }
+        CoinAverageSettings _CoinAverageSettings;
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly Dictionary<string, IRateProvider> _DirectProviders = new Dictionary<string, IRateProvider>();
+        public Dictionary<string, IRateProvider> Providers
+        {
+            get
+            {
+                return _DirectProviders;
+            }
+        }
+
+        private void InitExchanges()
+        {
+            // We need to be careful to only add exchanges which OnGetTickers implementation make only 1 request
+            Providers.Add("binance", new ExchangeSharpRateProvider("binance", new ExchangeBinanceAPI(), true));
+            Providers.Add("bittrex", new ExchangeSharpRateProvider("bittrex", new ExchangeBittrexAPI(), true));
+            Providers.Add("poloniex", new ExchangeSharpRateProvider("poloniex", new ExchangePoloniexAPI(), true));
+            Providers.Add("hitbtc", new ExchangeSharpRateProvider("hitbtc", new ExchangeHitbtcAPI(), false));
+            Providers.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
+
+            // Handmade providers
+            Providers.Add("bitpay", new BitpayRateProvider(new NBitpayClient.Bitpay(new NBitcoin.Key(), new Uri("https://bitpay.com/"))));
+            Providers.Add(QuadrigacxRateProvider.QuadrigacxName, new QuadrigacxRateProvider());
+            Providers.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, HttpClient = _httpClientFactory?.CreateClient(), Authenticator = _CoinAverageSettings });
+            Providers.Add("kraken", new KrakenExchangeRateProvider() { HttpClient = _httpClientFactory?.CreateClient() });
+
+            // 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()));
+            //DirectProviders.Add("bitstamp", new ExchangeSharpRateProvider("bitstamp", new ExchangeBitstampAPI()));
+
+            foreach (var provider in Providers.ToArray())
+            {
+                var prov = new BackgroundFetcherRateProvider(Providers[provider.Key]);
+                if(provider.Key == CoinAverageRateProvider.CoinAverageName)
+                {
+                    prov.RefreshRate = CacheSpan;
+                    prov.ValidatyTime = CacheSpan + TimeSpan.FromMinutes(1.0);
+                }
+                else
+                {
+                    prov.RefreshRate = TimeSpan.FromMinutes(1.0);
+                    prov.ValidatyTime = TimeSpan.FromMinutes(5.0);
+                }
+                Providers[provider.Key] = prov;
+            }
+
+            var cache = new MemoryCache(_CacheOptions);
+            foreach (var supportedExchange in GetSupportedExchanges())
+            {
+                if (!Providers.ContainsKey(supportedExchange.Key))
+                {
+                    var coinAverage = new CoinAverageRateProvider()
+                    {
+                        Exchange = supportedExchange.Key,
+                        HttpClient = _httpClientFactory?.CreateClient(),
+                        Authenticator = _CoinAverageSettings
+                    };
+                    var cached = new CachedRateProvider(supportedExchange.Key, coinAverage, cache)
+                    {
+                        CacheSpan = CacheSpan
+                    };
+                    Providers.Add(supportedExchange.Key, cached);
+                }
+            }
+        }
+
+        public CoinAverageExchanges GetSupportedExchanges()
+        {
+            CoinAverageExchanges exchanges = new CoinAverageExchanges();
+            foreach (var exchange in _CoinAverageSettings.AvailableExchanges)
+            {
+                exchanges.Add(exchange.Value);
+            }
+
+            // Add other exchanges supported here
+            exchanges.Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average"));
+            exchanges.Add(new CoinAverageExchange("cryptopia", "Cryptopia"));
+
+            return exchanges;
+        }
+
+        public async Task<QueryRateResult> QueryRates(string exchangeName)
+        {
+            Providers.TryGetValue(exchangeName, out var directProvider);
+            directProvider = directProvider ?? NullRateProvider.Instance;
+
+            var wrapper = new WrapperRateProvider(directProvider);
+            var value = await wrapper.GetRatesAsync();
+            return new QueryRateResult()
+            {
+                Latency = wrapper.Latency,
+                ExchangeRates = value,
+                Exception = wrapper.Exception != null ? new ExchangeException() { Exception = wrapper.Exception, ExchangeName = exchangeName } : null
+            };
+        }
+    }
+}

BTCPayServer/Services/SettingsRepository.cs

@@ -83,7 +83,7 @@ namespace BTCPayServer.Services
         MultiValueDictionary<Type, TaskCompletionSource<bool>> _Subscriptions = new MultiValueDictionary<Type, TaskCompletionSource<bool>>();
         public async Task WaitSettingsChanged<T>(CancellationToken cancellation)
         {
-            var tcs = new TaskCompletionSource<bool>();
+            var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellation.Register(() =>
              {
                  try

BTCPayServer/Services/Wallets/BTCPayWallet.cs

@@ -151,6 +151,11 @@ namespace BTCPayServer.Services.Wallets
             return await completionSource.Task;
         }
 
+        public Task<GetTransactionsResponse> FetchTransactions(DerivationStrategyBase derivationStrategyBase)
+        {
+            return _Client.GetTransactionsAsync(derivationStrategyBase, null, false);
+        }
+
         public Task<BroadcastResult[]> BroadcastTransactionsAsync(List<Transaction> transactions)
         {
             var tasks = transactions.Select(t => _Client.BroadcastAsync(t)).ToArray();

BTCPayServer/Views/Account/Register.cshtml

@@ -16,7 +16,7 @@
                 <hr class="primary">
             </div>
             <div class="col-md-4">
-                <form asp-route-returnUrl="@ViewData["ReturnUrl"]" method="post">
+                <form asp-route-returnUrl="@ViewData["ReturnUrl"]" asp-route-logon="@ViewData["Logon"]" method="post">
                     <h4>Create a new account.</h4>
                     <hr />
                     <div asp-validation-summary="All" class="text-danger"></div>

BTCPayServer/Views/Apps/ListApps.cshtml

@@ -1,4 +1,5 @@
-@model ListAppsViewModel
+@using BTCPayServer.Services.Apps
+@model ListAppsViewModel
 @{
     ViewData["Title"] = "Stores";
 }

BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml

@@ -56,8 +56,7 @@
                         <p><strong>Never</strong> trust anything but <code>id</code>, <strong>ignore</strong> the other fields completely, an attacker can spoof those, they are present only for backward compatibility reason:</p>
                         <p>
                             <ul>
-                                <li><strong>Build the invoice's url by yourself</strong> do not trust the <code>url</code> field, this can be spoofed to use attacker's server.</li>
-                                <li>Send a <code>GET</code> request to the invoice's url with <code>Content-Type: application/json</code></li>
+                                <li>Send a <code>GET</code> request to <code>https://btcpay.example.com/invoices/{invoiceId}</code> with <code>Content-Type: application/json</code></li>
                                 <li>Verify that the <code>orderId</code> is from your backend, that the <code>price</code> is correct and that <code>status</code> is either <code>confirmed</code> or <code>complete</code></li>
                                 <li>You can then ship your order</li>
                             </ul>

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -33,45 +33,52 @@
     </div>
 </div>
 <div class="order-details">
-    @if (Model.AvailableCryptos.Count > 1)
-    {
-        <div class="currency-selection">
-            <div class="single-item-order__left">
-                <div style="font-weight: 600;">
-                    {{$t("Pay with")}}
-                </div>
-            </div>
-            <div class="single-item-order__right">
-                @if (Model.AvailableCryptos.Count > 1)
-                {
-                    <div class="payment__currencies" onclick="openPaymentMethodDialog()">
-                        <img v-bind:src="srvModel.cryptoImage" />
-                        <span class="clickable_underline">{{srvModel.paymentMethodName}} ({{srvModel.cryptoCode}})</span>
-                        <span v-show="srvModel.isLightning">&#9889;</span>
-                        <span class="clickable_indicator fa fa-angle-right"></span>
-                    </div>
-                    <div id="vexPopupDialog">
-                        <ul class="vexmenu">
-                            @foreach (var crypto in Model.AvailableCryptos)
-                            {
-                                <li class="vexmenuitem">
-                                    <a href="@crypto.Link" onclick="return closePaymentMethodDialog('@crypto.PaymentMethodId');">
-                                        <img alt="@crypto.PaymentMethodName" src="@crypto.CryptoImage" />
-                                        @crypto.PaymentMethodName
-                                        @(crypto.IsLightning ? Html.Raw("&#9889;") : null)
-                                        <span>@crypto.CryptoCode</span>
-                                    </a>
-                                </li>
-                            }
-                        </ul>
-                    </div>
-                }
-                <div class="payment__spinner">
-                    <partial name="Checkout-Spinner" />
-                </div>
+    <div class="currency-selection">
+        <div class="single-item-order__left">
+            <div style="font-weight: 600;">
+                {{$t("Pay with")}}
             </div>
         </div>
-    }
+        <div class="single-item-order__right">
+            @if (Model.AvailableCryptos.Count > 1)
+            {
+                <div class="payment__currencies cursorPointer" onclick="openPaymentMethodDialog()">
+                    <img v-bind:src="srvModel.cryptoImage" />
+                    <span class="clickable_underline">{{srvModel.paymentMethodName}} ({{srvModel.cryptoCode}})</span>
+                    <span v-show="srvModel.isLightning">&#9889;</span>
+                    <span class="clickable_indicator fa fa-angle-right"></span>
+                </div>
+                <div id="vexPopupDialog">
+                    <ul class="vexmenu">
+                        @foreach (var crypto in Model.AvailableCryptos)
+                        {
+                            <li class="vexmenuitem">
+                                <a href="@crypto.Link" onclick="return closePaymentMethodDialog('@crypto.PaymentMethodId');">
+                                    <img alt="@crypto.PaymentMethodName" src="@crypto.CryptoImage" />
+                                    @crypto.PaymentMethodName
+                                    @(crypto.IsLightning ? Html.Raw("&#9889;") : null)
+                                    <span>@crypto.CryptoCode</span>
+                                </a>
+                            </li>
+                        }
+                    </ul>
+                </div>
+            }
+            else
+            {
+                <div class="payment__currencies">
+                    <img v-bind:src="srvModel.cryptoImage" />
+                    <span>{{srvModel.paymentMethodName}} ({{srvModel.cryptoCode}})</span>
+                    <span v-show="srvModel.isLightning">&#9889;</span>
+                </div>
+
+            }
+            <div class="payment__spinner">
+                <partial name="Checkout-Spinner" />
+            </div>
+        </div>
+    </div>
+
     <div class="single-item-order buyerTotalLine">
         <div class="single-item-order__left">
             <div class="single-item-order__left__name">
@@ -332,268 +339,4 @@
             </a>
         </div>
     </div>
-
-    @* Obsolete? Start *@
-    <div class="bp-view" id="link-expired" style="padding-top: 3.6rem;">
-        <div class="manual__step-one refund-address-form" novalidate="">
-            <div class="manual__step-one__header" i18n="">Link Expired</div>
-            <div class="manual__step-one__instructions">
-                <span class="initial-label" i18n="">Sorry, this link has expired. Please try requesting another refund by clicking the button below.</span>
-            </div>
-            <div class="input-wrapper">
-                <bp-loading-button i18n="">
-                    <button class="action-button" style="margin-top: 15px;" type="submit">
-                        <span class="button-text" lcl="">Request Refund</span>
-                        <div class="loader-wrapper">
-                            <partial name="Checkout-Spinner" />
-                        </div>
-                    </button>
-                </bp-loading-button>
-            </div>
-        </div>
-    </div>
-    <div class="bp-view confirm-contact-email-view">
-        <form class="manual__step-one refund-address-form contact-email-form ng-untouched ng-pristine" novalidate="">
-            <div class="manual__step-one__header" i18n="">Contact &amp; Refund Email</div>
-            <div class="manual__step-one__instructions">
-                <span class="initial-label" i18n="">If there is an issue with this payment, or a refund needs to be made, we will contact you at this address.</span>
-            </div>
-            <div class="input-wrapper">
-                <input bp-focus="focusEmailInput" class="bp-input email-input ng-untouched ng-pristine" disabled="disabled" name="receiptEmail" placeholder="Your email"
-                       style="opacity: 1;" type="email">
-                <button type="submit" class="action-button" style="margin-top: 15px;">
-                    <span i18n="">Confirm email address</span>
-                </button>
-            </div>
-            <div class="refund-address-form__link" id="wrong-email-button" style="color: #a9a9a9;">
-                <span i18n="">Wrong email?</span>
-            </div>
-        </form>
-    </div>
-    <div class="bp-view wrong-email-view" id="compromised-invoice">
-        <div class="manual__step-one refund-address-form" novalidate="" style="margin-top: -1rem;">
-            <div class="manual__step-one__header">
-                <span i18n="">There seems to be a problem</span>
-            </div>
-            <div class="manual__step-one__instructions">
-                <span class="initial-label" i18n="">
-                    This invoice was previously opened, and the address <strong class="placeholder-refundEmail">{Entered email address}</strong> was submitted as your contact email. If you entered this email, you can still safely make your payment. <br> <br>
-                    If you did not submit the email address, it's possible a thief falsely
-                    submitted this address to steal refunds. Please contact the merchant
-                    about this security incident, and try your payment again.
-                </span>
-            </div>
-            <div class="input-wrapper">
-                <a class="action-button" style="margin-top: 15px;" target="_blank" href="mailto:@Model.StoreEmail">
-                    <span i18n="">Contact {{srvModel.storeName}}</span>
-                </a>
-            </div>
-            <div class="refund-address-form__link">
-                <span i18n="">I understand, continue to payment&nbsp;→</span>
-            </div>
-        </div>
-    </div>
-    <div class="bp-view confirm-bitcoin-address-view" id="confirm-refund-address">
-        <form class="manual__step-one refund-address-form ng-untouched ng-pristine ng-valid" novalidate="" style="padding-top: 1.6rem;">
-            <div><img src="~/imlegacy/mail.svg"></div>
-            <div class="manual__step-one__header">
-                <span i18n="">Please confirm your address</span>
-            </div>
-            <div class="manual__step-one__instructions">
-                <span class="initial-label" i18n="">You should receive an email from us in a moment at <strong class="placeholder-refundEmail">{enterd refund email}</strong>. To ensure your refund is sent to the correct address, please confirm your bitcoin address by clicking the link in the email. </span>
-            </div>
-            <bp-resend-link id="resend-link">
-                <div class="bp-resend__link">
-                    <span class="link-text">
-
-                        <span i18n="">Resend email</span>
-
-                    </span>
-                    <div class="success-text">
-
-                        <img src="~/imlegacy/circle-check.svg">
-
-                        <div i18n="">Email resent</div>
-
-                    </div>
-                </div>
-            </bp-resend-link>
-        </form>
-    </div>
-    <div class="bp-view refund-address-view" id="enter-refund-address">
-        <form class="manual__step-one refund-address-form ng-untouched ng-pristine ng-invalid" name="refundAddressForm" novalidate="" style="margin-top: 28px; margin-bottom: 4rem;">
-            <div class="manual__step-one__header">
-
-                <span i18n="">Please provide a refund address.</span>
-
-            </div>
-            <div class="manual__step-one__instructions">
-                <span class="initial-label">
-
-                    <span i18n="">
-                        To send your refund of {BTC to refund} BTC,
-                        we’ll need a bitcoin address from your wallet. Please open your bitcoin
-                        wallet, copy a receiving address, and paste it below.
-                    </span>
-
-                </span>
-                <span class="submission-error-label" i18n="" id="invalid-bitcoin-address">Please enter a valid bitcoin address.</span>
-            </div>
-            <div class="input-wrapper">
-                <bp-refund-address name="refundAddress" ngmodel="" class="ng-untouched ng-pristine ng-invalid">
-                    <div class="bp-refund-address">
-                        <div class="bitcoin-logo">
-                            <div><img src="@Model.CryptoImage"></div>
-                        </div>
-                        <input class="bp-input {'not-empty': addressValue.length &gt; 0} ng-untouched ng-pristine ng-valid" id="refund-address-input" name="refundAddress" ngclass="{'not-empty': addressValue.length &gt; 0}">
-                    </div>
-                </bp-refund-address>
-                <bp-loading-button i18n="" id="request-refund-button">
-                    <button class="action-button" style="margin-top: 15px;" type="submit">
-                        <span class="button-text" lcl="">Request Refund</span>
-                        <div class="loader-wrapper">
-                            <partial name="Checkout-Spinner" />
-                        </div>
-                    </button>
-                </bp-loading-button>
-            </div>
-            <div class="refund-address-form__cancel">
-                <span i18n="">Cancel</span>
-            </div>
-        </form>
-    </div>
-    <div class="bp-view" id="refund-pending">
-        <div class="status-block">
-            <div class="pending-block" style="position: relative; padding-bottom: 1.6rem;">
-                <img src="~/imlegacy/refund-pending.svg">
-                <div class="pending-block__header" i18n="">Processing Refund</div>
-                <span>
-                    <span class="pending-block__message" i18n="">The amount below will be refunded to you within 1-2 business days. </span>
-                </span>
-            </div>
-        </div>
-        <div class="manual-box" style="margin-bottom: 30px;">
-            <div class="manual-box__amount amount-only">
-                <div class="manual-box__amount__label label">
-                    <span class="initial-label">&nbsp;</span>
-                    <span class="final-label" i18n="">Amount To Be Refunded</span>
-                </div>
-                <div class="manual-box__amount__value">{BTC Amount} BTC</div>
-            </div>
-            <div class="manual-box__address">
-                <div class="flipper">
-                    <div class="back"></div>
-                    <div class="front">
-                        <div class="manual-box__address__arrow"></div>
-                        <div class="manual-box__address__label label" i18n="">Will Be Refunded To</div>
-                        <div class="manual-box__address__wrapper">
-                            <div class="manual-box__address__wrapper__logo">
-                                <img src="~/imlegacy/bitcoin-symbol.svg">
-                            </div>
-                            <div class="manual-box__address__wrapper__value">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="bp-view expired" id="low-fee">
-        <div class="expired__body">
-            <div class="expired__header" i18n="" style="font-weight: 400; font-size: 22px;">Payment Confirming</div>
-            <div class="expired__text" i18n="">This payment was made with a low <a href="https://bitcoin.org/en/glossary/transaction-fee">bitcoin miner fee</a>, which may prevent it from being accepted by the Bitcoin network.</div>
-            <div class="expired__text" i18n="">This is an issue with the configuration of your bitcoin wallet.</div>
-            <div class="expired__text" i18n="">
-                If the transaction
-                doesn't confirm, the funds will be spendable again in your wallet.
-                Depending on the wallet, this may take 48-72 hours.
-            </div>
-            <low-fee-timeline>
-                <div class="timeline">
-                    <div class="timeline__item">
-                        <div class="timeline__item__icon timeline__item__icon--complete">
-                            <img src="~/imlegacy/checkmark-small.svg">
-                        </div>
-                        <div class="timeline__item__name" i18n="">Transaction created</div>
-                    </div>
-                    <div class="timeline__item">
-                        <div class="timeline__item__icon timeline__item__icon--pending">
-                            <img src="~/imlegacy/pending.svg">
-                        </div>
-                        <div class="timeline__item__name">
-                            <span i18n="">Transaction confirming — funds have not yet moved</span>
-                        </div>
-                    </div>
-                    <div class="timeline__item">
-                        <div class="timeline__item__icon"></div>
-                        <div class="timeline__item__name" i18n="">Payment received by {{srvModel.storeName}}</div>
-                    </div>
-                </div>
-            </low-fee-timeline>
-        </div>
-        <button class="action-button" style="margin-top: .75rem;">
-            <bp-done-text>
-                <span i18n="">Return to {{srvModel.storeName}}</span>
-            </bp-done-text>
-        </button>
-    </div>
-    <div class="bp-view" id="refund-complete">
-        <div class="status-block">
-            <div class="success-block" style="opacity: 1;">
-                <div class="status-icon">
-                    <div class="status-icon__wrapper">
-                        <div class="inner-wrapper">
-                            <div class="status-icon__wrapper__icon">
-                                <img src="~/imlegacy/checkmark.svg">
-                            </div>
-                            <div class="status-icon__wrapper__outline" style="height: 117px; width: 117px;"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="success-message">
-                    <span>
-                        <span i18n="">Refund Complete</span>
-                    </span>
-                </div>
-            </div>
-        </div>
-        <div class="manual-box">
-            <div class="manual-box__amount amount-only">
-                <div class="manual-box__amount__label label">
-                    <span class="initial-label" i18n="">Overpaid By</span>
-                    <span class="final-label">
-                        <span i18n="">Amount Refunded</span>
-                    </span>
-                </div>
-                <div class="manual-box__amount__value">{BTC amount} BTC</div>
-            </div>
-            <div class="manual-box__address">
-                <div class="flipper flipped-initially">
-                    <div class="back"></div>
-                    <div class="front">
-                        <div class="manual-box__address__arrow"></div>
-                        <div class="manual-box__address__label label" i18n="">Refunded To</div>
-                        <div class="manual-box__address__wrapper">
-                            <div class="manual-box__address__wrapper__logo">
-                                <img src="~/imlegacy/bitcoin-symbol.svg">
-                            </div>
-                            <div class="manual-box__address__wrapper__value">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <button class="action-button finished" style="margin-top: 23px;">
-            <bp-done-text>
-                <span>{{$t("Return to StoreName", srvModel)}}</span>
-            </bp-done-text>
-        </button>
-    </div>
-    <div class="footer-button enter-different-address-button">
-        <bp-done-text>
-            <span>{{$t("Return to StoreName", srvModel)}}</span>
-        </bp-done-text>
-    </div>
-    @* Obsolete? End *@
 </div>

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -64,7 +64,7 @@
                             </div>
                         </div>
                     </div>
-                    <div style="margin-top: 10px; text-align: right;">
+                    <div style="margin-top: 10px; text-align: center;">
                         @* Not working because of nsSeparator: false, keySeparator: false,
                             {{$t("nested.lang")}} >>
                         *@
@@ -92,7 +92,7 @@
                             });
                         </script>
                     </div>
-                    <div style="margin-top: 10px; text-align: right;" class="form-text small text-muted">
+                    <div style="margin-top: 10px; text-align: center;" class="form-text small text-muted">
                         <span>Powered by <a target="_blank" href="https://github.com/btcpayserver/btcpayserver">BTCPay Server</a></span>
                     </div>
                 </div>

BTCPayServer/Views/Server/LNDGRPCServices.cshtml

@@ -17,7 +17,7 @@
     <div class="col-md-8">
         <div class="form-group">
             <p>
-                <span>BTCPay exposes gRPC services for outside consumption, you will find connection informaiton here.<br /></span>
+                <span>BTCPay exposes gRPC services for outside consumption, you will find connection information here.<br /></span>
             </p>
         </div>
 

BTCPayServer/Views/Server/ListUsers.cshtml

@@ -7,7 +7,7 @@
 <h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="StatusMessage" />
 
-
+<a asp-controller="Account" asp-action="Register" asp-route-returnUrl="@Context.Request.GetCurrentPath()" asp-route-logon="false" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new user</a>
 <table class="table table-sm table-responsive-md">
     <thead>
         <tr>

BTCPayServer/Views/Server/Maintenance.cshtml

@@ -0,0 +1,71 @@
+@model BTCPayServer.Models.ServerViewModels.MaintenanceViewModel
+@{
+    ViewData.SetActivePageAndTitle(ServerNavPages.Maintenance);
+}
+
+
+<h4>@ViewData["Title"]</h4>
+<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+
+<div class="row">
+
+    <div class="col-md-8">
+        <form method="post">
+            @if(!Model.ExposedSSH)
+            {
+                <div class="form-group">
+                    <h5>SSH Settings</h5>
+                    <span>For changing any settings, you need to enter your SSH credentials:</span>
+                </div>
+                <div class="form-group">
+                    <label asp-for="UserName"></label>
+                    <input asp-for="UserName" class="form-control" />
+                    <span asp-validation-for="UserName" class="text-danger"></span>
+                </div>
+
+                <div class="form-group">
+                    <label asp-for="Password"></label>
+                    <input asp-for="Password" class="form-control" />
+                    <span asp-validation-for="Password" class="text-danger"></span>
+                </div>
+            }
+            else
+            {
+                <input asp-for="Password" type="hidden" class="form-control" />
+                <span asp-validation-for="Password" class="text-danger"></span>
+                <input asp-for="UserName" type="hidden" class="form-control" />
+                <span asp-validation-for="UserName" class="text-danger"></span>
+            }
+            <div class="form-group">
+                <h5>Change domain name</h5>
+                <span>You can change the domain name of your server by following <a href="https://github.com/btcpayserver/btcpayserver-doc/blob/master/ChangeDomain.md">this guide</a></span>
+            </div>
+
+            <div class="form-group">
+                <div class="input-group">
+                    <input asp-for="DNSDomain" class="form-control" />
+                    <span class="input-group-btn">
+                        <button name="command" type="submit" class="btn btn-primary" value="changedomain" title="Change domain">
+                            <span class="fa fa-check"></span> Confirm
+                        </button>
+                    </span>
+                </div>
+                <span asp-validation-for="DNSDomain" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <h5>Update</h5>
+                <span>Click here to update your server</span>
+            </div>
+            <div class="form-group">
+                <div class="input-group">
+                    <button name="command" type="submit" class="btn btn-primary" value="update">Update</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @await Html.PartialAsync("_ValidationScriptsPartial")
+}

BTCPayServer/Views/Server/SSHService.cshtml

@@ -0,0 +1,50 @@
+@model BTCPayServer.Models.ServerViewModels.SSHServiceViewModel
+@{
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+}
+
+
+<h4>SSH settings</h4>
+<partial name="_StatusMessage" for="@TempData["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-8">
+        <div class="form-group">
+            <p>
+                <span>SSH servies are used by the maintenance operations<br /></span>
+            </p>
+        </div>
+
+
+        <div class="form-group">
+            <div class="form-group">
+                <label asp-for="CommandLine"></label>
+                <input asp-for="CommandLine" readonly class="form-control" />
+            </div>
+            @if(!string.IsNullOrEmpty(Model.Password))
+            {
+                <div class="form-group">
+                    <label asp-for="Password"></label>
+                    <input asp-for="Password" readonly class="form-control" />
+                </div>
+            }
+            @if(!string.IsNullOrEmpty(Model.KeyFilePassword))
+            {
+                <div class="form-group">
+                    <label asp-for="KeyFilePassword"></label>
+                    <input asp-for="KeyFilePassword" readonly class="form-control" />
+                </div>
+            }
+            @if(Model.HasKeyFile)
+            {
+                <a class="btn btn-primary form-control" asp-action="SSHService" asp-route-downloadKeyFile="true">Download Key File</a>
+            }
+        </div>
+    </div>
+</div>

BTCPayServer/Views/Server/ServerNavPages.cs

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

BTCPayServer/Views/Server/Services.cshtml

@@ -5,7 +5,7 @@
 
 
 <h4>@ViewData["Title"]</h4>
-<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
+<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
 <div class="row">
     <div class="col-md-6">
         <div asp-validation-summary="All" class="text-danger"></div>
@@ -13,39 +13,46 @@
 </div>
 
 <div class="row">
-    @if(Model.LNDServices.Count != 0)
-    {
-        <div class="col-md-8">
-            <div class="form-group">
-                <h5>LND nodes</h5>
-                <span>You can get access to internal LND services here. For gRPC, only BTC is supported.</span>
-            </div>
 
-            <div class="form-group">
-                <table class="table table-sm table-responsive-md">
-                    <thead>
-                        <tr>
-                            <th>Crypto</th>
-                            <th>Access Type</th>
-                            <th style="text-align:right">Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach(var lnd in Model.LNDServices)
-                        {
-                            <tr>
-                                <td>@lnd.Crypto</td>
-                                <td>@lnd.Type</td>
-                                <td style="text-align:right">
-                                    <a asp-action="LNDGRPCServices" asp-route-cryptoCode="@lnd.Crypto" asp-route-index="@lnd.Index">See information</a>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
+    <div class="col-md-8">
+        <div class="form-group">
+            <span>You can get access here to LND-gRPC or SSH services exposed by your server</span>
         </div>
-    }
+
+        <div class="form-group">
+            <table class="table table-sm table-responsive-md">
+                <thead>
+                    <tr>
+                        <th>Crypto</th>
+                        <th>Access Type</th>
+                        <th style="text-align:right">Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach(var lnd in Model.LNDServices)
+                    {
+                        <tr>
+                            <td>@lnd.Crypto</td>
+                            <td>@lnd.Type</td>
+                            <td style="text-align:right">
+                                <a asp-action="LNDGRPCServices" asp-route-cryptoCode="@lnd.Crypto" asp-route-index="@lnd.Index">See information</a>
+                            </td>
+                        </tr>
+                    }
+                    @if(Model.HasSSH)
+                    {
+                        <tr>
+                            <td>None</td>
+                            <td>SSH</td>
+                            <td style="text-align:right">
+                                <a asp-action="SSHService">See information</a>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div>
 
 @section Scripts {

BTCPayServer/Views/Server/_Nav.cshtml

@@ -5,6 +5,7 @@
     <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Policies)" asp-action="Policies">Policies</a>
     <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Services)" asp-action="Services">Services</a>
     <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.Hangfire)" href="~/hangfire" target="_blank">Hangfire</a>
 </div>
 

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -26,6 +26,8 @@
 
     @* JS *@
     <bundle name="wwwroot/bundles/main-bundle.min.js" />
+
+    @RenderSection("HeadScripts", required: false)
 </head>
 
 <body id="page-top">
@@ -61,6 +63,7 @@
                         }
                         <li class="nav-item"><a asp-area="" asp-controller="UserStores" asp-action="ListStores" class="nav-link js-scroll-trigger">Stores</a></li>
                         <li class="nav-item"><a asp-area="" asp-controller="Apps" asp-action="ListApps" class="nav-link js-scroll-trigger">Apps</a></li>
+                        <li class="nav-item"><a asp-area="" asp-controller="Wallets" asp-action="ListWallets" class="nav-link js-scroll-trigger">Wallets</a></li>
                         <li class="nav-item"><a asp-area="" asp-controller="Invoice" asp-action="ListInvoices" class="nav-link js-scroll-trigger">Invoices</a></li>
                         <li class="nav-item">
                             <a asp-area="" asp-controller="Manage" asp-action="Index" title="Manage" class="nav-link js-scroll-trigger">My settings</a>

BTCPayServer/Views/Shared/_NavLayout.cshtml

@@ -3,7 +3,6 @@
     ViewBag.ShowMenu = ViewBag.ShowMenu ?? true;
 }
 
-
 <section>
     <div class="container">
         <div class="row">
@@ -16,7 +15,7 @@
         <div>
             <div class="row">
                 <div class="col-md-3">
-                    @if(ViewBag.ShowMenu)
+                    @if (ViewBag.ShowMenu)
                     {
                         @await Html.PartialAsync("_Nav")
                     }
@@ -28,6 +27,10 @@
         </div>
     </div>
 </section>
+@section HeadScripts {
+    @RenderSection("HeadScripts", required: false)
+}
+
 @section Scripts {
     @RenderSection("Scripts", required: false)
 }

BTCPayServer/Views/Stores/AddDerivationScheme.cshtml

@@ -1,8 +1,7 @@
 @model DerivationSchemeViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Add derivation scheme";
-    ViewData.AddActivePage(BTCPayServer.Views.Stores.StoreNavPages.Index);
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, $"{Model.CryptoCode} Derivation scheme");
 }
 
 <partial name="_StatusMessage" for="StatusMessage" />
@@ -16,7 +15,7 @@
 <div class="row">
     <div class="col-md-8">
         <form method="post">
-            @if (!Model.Confirmation)
+            @if(!Model.Confirmation)
             {
                 <div class="form-group">
                     <h5>Derivation Scheme</h5>
@@ -33,7 +32,7 @@
                     <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?</span>
                         <ul>
-                            @for (int i = 0; i < 4; i++)
+                            @for(int i = 0; i < 4; i++)
                             {
                                 <li><a class="ledger-info-recommended" data-ledgeraccount="@i" href="#">Account @i (<span>@Model.RootKeyPath.Derive(i, true)</span>)</a></li>
                             }
@@ -77,7 +76,11 @@
                         </tbody>
                     </table>
                 </div>
-                <button name="command" type="submit" class="btn btn-primary">Continue</button>
+                <div class="form-group">
+                    <label asp-for="Enabled"></label>
+                    <input asp-for="Enabled" type="checkbox" class="form-check" />
+                </div>
+                <button name="command" type="submit" class="btn btn-primary" value="save">Continue</button>
             }
             else
             {
@@ -87,6 +90,7 @@
                 </div>
                 <input type="hidden" asp-for="Confirmation" />
                 <input type="hidden" asp-for="DerivationScheme" />
+                <input type="hidden" asp-for="Enabled" />
                 <div class="form-group">
                     <table class="table table-sm table-responsive-md">
                         <thead>
@@ -96,7 +100,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach (var sample in Model.AddressSamples)
+                            @foreach(var sample in Model.AddressSamples)
                             {
                                 <tr>
                                     <td>@sample.KeyPath</td>
@@ -116,7 +120,7 @@
                     <input asp-for="HintAddress" class="form-control" />
                     <span asp-validation-for="HintAddress" class="text-danger"></span>
                 </div>
-                <button name="command" type="submit" class="btn btn-primary">Confirm</button>
+                <button name="command" type="submit" class="btn btn-primary" value="save">Confirm</button>
             }
         </form>
     </div>

BTCPayServer/Views/Stores/AddLightningNode.cshtml

@@ -1,8 +1,7 @@
 @model LightningNodeViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Add lightning node (Experimental)";
-    ViewData.AddActivePage(BTCPayServer.Views.Stores.StoreNavPages.Index);
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Add lightning node (Experimental)");
 }
 
 <h4>@ViewData["Title"]</h4>
@@ -62,6 +61,10 @@
                     </p>
                 }
             </div>
+            <div class="form-group">
+                <label asp-for="Enabled"></label>
+                <input asp-for="Enabled" type="checkbox" class="form-check" />
+            </div>
             <button name="command" type="submit" value="save" class="btn btn-primary">Submit</button>
             <button name="command" type="submit" value="test" class="btn btn-secondary">Test connection</button>
         </form>

BTCPayServer/Views/Stores/CheckoutExperience.cshtml

@@ -1,8 +1,7 @@
 @model CheckoutExperienceViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Checkout experience";
-    ViewData.AddActivePage(BTCPayServer.Views.Stores.StoreNavPages.Checkout);
+    ViewData.SetActivePageAndTitle(StoreNavPages.Checkout, "Checkout experience");
 }
 
 <h4>@ViewData["Title"]</h4>