bump

BTCPayServer.Common/BTCPayNetworkProvider.cs

@@ -22,13 +22,14 @@ namespace BTCPayServer
             }
         }
 
-        BTCPayNetworkProvider(BTCPayNetworkProvider filtered, string[] cryptoCodes)
+        BTCPayNetworkProvider(BTCPayNetworkProvider unfiltered, string[] cryptoCodes)
         {
-            NetworkType = filtered.NetworkType;
-            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(filtered.NetworkType);
+            UnfilteredNetworks = unfiltered.UnfilteredNetworks ?? unfiltered;
+            NetworkType = unfiltered.NetworkType;
+            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(unfiltered.NetworkType);
             _Networks = new Dictionary<string, BTCPayNetworkBase>();
             cryptoCodes = cryptoCodes.Select(c => c.ToUpperInvariant()).ToArray();
-            foreach (var network in filtered._Networks)
+            foreach (var network in unfiltered._Networks)
             {
                 if(cryptoCodes.Contains(network.Key))
                 {
@@ -37,9 +38,12 @@ namespace BTCPayServer
             }
         }
 
+        public BTCPayNetworkProvider UnfilteredNetworks { get; }
+
         public NetworkType NetworkType { get; private set; }
         public BTCPayNetworkProvider(NetworkType networkType)
         {
+            UnfilteredNetworks = this;
             _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(networkType);
             NetworkType = networkType;
             InitBitcoin();
@@ -102,9 +106,14 @@ namespace BTCPayServer
         {
             return _Networks.ContainsKey(cryptoCode.ToUpperInvariant());
         }
-
+        public BTCPayNetworkBase GetNetwork(string cryptoCode)
+        {
+            return GetNetwork<BTCPayNetworkBase>(cryptoCode);
+        }
         public T GetNetwork<T>(string cryptoCode) where T: BTCPayNetworkBase
         {
+            if (cryptoCode == null)
+                throw new ArgumentNullException(nameof(cryptoCode));
             if(!_Networks.TryGetValue(cryptoCode.ToUpperInvariant(), out BTCPayNetworkBase network))
             {
                 if (cryptoCode == "XBT")

BTCPayServer.Tests/UnitTest1.cs

@@ -107,7 +107,7 @@ namespace BTCPayServer.Tests
                 new BitcoinLikePaymentHandler(null, networkProvider, null, null),
                 new LightningLikePaymentHandler(null, null, networkProvider, null),
             });
-            InvoiceEntity invoiceEntity = new InvoiceEntity() { PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary};
+            InvoiceEntity invoiceEntity = new InvoiceEntity();
             invoiceEntity.Payments = new System.Collections.Generic.List<PaymentEntity>();
             invoiceEntity.ProductInformation = new ProductInformation() {Price = 100};
             PaymentMethodDictionary paymentMethods = new PaymentMethodDictionary();
@@ -123,7 +123,7 @@ namespace BTCPayServer.Tests
                 }));
             invoiceEntity.SetPaymentMethods(paymentMethods);
 
-            var btc = invoiceEntity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike), null);
+            var btc = invoiceEntity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike));
             var accounting = btc.Calculate();
 
             invoiceEntity.Payments.Add(
@@ -131,8 +131,7 @@ namespace BTCPayServer.Tests
                     {
                         Accounted = true,
                         CryptoCode = "BTC",
-                        NetworkFee = 0.00000100m,
-                        PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary
+                        NetworkFee = 0.00000100m
                     }
                     .SetCryptoPaymentData(new BitcoinLikePaymentData()
                     {
@@ -144,8 +143,7 @@ namespace BTCPayServer.Tests
                     {
                         Accounted = true,
                         CryptoCode = "BTC",
-                        NetworkFee = 0.00000100m,
-                        PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary
+                        NetworkFee = 0.00000100m
                     }
                     .SetCryptoPaymentData(new BitcoinLikePaymentData()
                     {
@@ -155,14 +153,14 @@ namespace BTCPayServer.Tests
             Assert.Equal(Money.Zero, accounting.Due);
             Assert.Equal(Money.Zero, accounting.DueUncapped);
 
-            var ltc = invoiceEntity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike), null);
+            var ltc = invoiceEntity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = ltc.Calculate();
 
             Assert.Equal(Money.Zero, accounting.Due);
             // LTC might have over paid due to BTC paying above what it should (round 1 satoshi up)
             Assert.True(accounting.DueUncapped < Money.Zero);
 
-            var paymentMethod = InvoiceWatcher.GetNearestClearedPayment(paymentMethods, out var accounting2, null);
+            var paymentMethod = InvoiceWatcher.GetNearestClearedPayment(paymentMethods, out var accounting2);
             Assert.Equal(btc.CryptoCode, paymentMethod.CryptoCode);
 #pragma warning restore CS0618
         }
@@ -216,7 +214,7 @@ namespace BTCPayServer.Tests
                 new BitcoinLikePaymentHandler(null, networkProvider, null, null),
                 new LightningLikePaymentHandler(null, null, networkProvider, null),
             });
-            var entity = new InvoiceEntity() {PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary};
+            var entity = new InvoiceEntity();
 #pragma warning disable CS0618
             entity.Payments = new System.Collections.Generic.List<PaymentEntity>();
             entity.SetPaymentMethod(new PaymentMethod()
@@ -234,8 +232,7 @@ namespace BTCPayServer.Tests
             {
                 Output = new TxOut(Money.Coins(0.5m), new Key()),
                 Accounted = true,
-                NetworkFee = 0.1m,
-                PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary
+                NetworkFee = 0.1m
             });
 
             accounting = paymentMethod.Calculate();
@@ -247,8 +244,7 @@ namespace BTCPayServer.Tests
             {
                 Output = new TxOut(Money.Coins(0.2m), new Key()),
                 Accounted = true,
-                NetworkFee = 0.1m,
-                PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary
+                NetworkFee = 0.1m
             });
 
             accounting = paymentMethod.Calculate();
@@ -259,8 +255,7 @@ namespace BTCPayServer.Tests
             {
                 Output = new TxOut(Money.Coins(0.6m), new Key()),
                 Accounted = true,
-                NetworkFee = 0.1m,
-                PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary
+                NetworkFee = 0.1m
             });
 
             accounting = paymentMethod.Calculate();
@@ -270,15 +265,14 @@ namespace BTCPayServer.Tests
             entity.Payments.Add(new PaymentEntity()
             {
                 Output = new TxOut(Money.Coins(0.2m), new Key()),
-                Accounted = true,
-                PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary
+                Accounted = true
             });
 
             accounting = paymentMethod.Calculate();
             Assert.Equal(Money.Zero, accounting.Due);
             Assert.Equal(Money.Coins(1.3m), accounting.TotalDue);
 
-            entity = new InvoiceEntity() {PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary};
+            entity = new InvoiceEntity();
             entity.ProductInformation = new ProductInformation() {Price = 5000};
             PaymentMethodDictionary paymentMethods = new PaymentMethodDictionary();
             paymentMethods.Add(
@@ -287,11 +281,11 @@ namespace BTCPayServer.Tests
                 new PaymentMethod() {CryptoCode = "LTC", Rate = 500, NextNetworkFee = Money.Coins(0.01m)});
             entity.SetPaymentMethods(paymentMethods);
             entity.Payments = new List<PaymentEntity>();
-            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike), null);
+            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
             Assert.Equal(Money.Coins(5.1m), accounting.Due);
 
-            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike), null);
+            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
 
             Assert.Equal(Money.Coins(10.01m), accounting.TotalDue);
@@ -301,11 +295,10 @@ namespace BTCPayServer.Tests
                 CryptoCode = "BTC",
                 Output = new TxOut(Money.Coins(1.0m), new Key()),
                 Accounted = true,
-                NetworkFee = 0.1m,
-                PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary
+                NetworkFee = 0.1m
             });
 
-            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike), null);
+            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
             Assert.Equal(Money.Coins(4.2m), accounting.Due);
             Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
@@ -313,7 +306,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(Money.Coins(5.2m), accounting.TotalDue);
             Assert.Equal(2, accounting.TxRequired);
 
-            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike), null);
+            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
             Assert.Equal(Money.Coins(10.01m + 0.1m * 2 - 2.0m /* 8.21m */), accounting.Due);
             Assert.Equal(Money.Coins(0.0m), accounting.CryptoPaid);
@@ -325,11 +318,10 @@ namespace BTCPayServer.Tests
                 CryptoCode = "LTC",
                 Output = new TxOut(Money.Coins(1.0m), new Key()),
                 Accounted = true,
-                NetworkFee = 0.01m,
-                PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary
+                NetworkFee = 0.01m
             });
 
-            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike), null);
+            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
             Assert.Equal(Money.Coins(4.2m - 0.5m + 0.01m / 2), accounting.Due);
             Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
@@ -337,7 +329,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(Money.Coins(5.2m + 0.01m / 2), accounting.TotalDue); // The fee for LTC added
             Assert.Equal(2, accounting.TxRequired);
 
-            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike), null);
+            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
             Assert.Equal(Money.Coins(8.21m - 1.0m + 0.01m), accounting.Due);
             Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
@@ -351,11 +343,10 @@ namespace BTCPayServer.Tests
                 CryptoCode = "BTC",
                 Output = new TxOut(remaining, new Key()),
                 Accounted = true,
-                NetworkFee = 0.1m,
-                PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary
+                NetworkFee = 0.1m
             });
 
-            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike), null);
+            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
             Assert.Equal(Money.Zero, accounting.Due);
             Assert.Equal(Money.Coins(1.0m) + remaining, accounting.CryptoPaid);
@@ -364,7 +355,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(accounting.Paid, accounting.TotalDue);
             Assert.Equal(2, accounting.TxRequired);
 
-            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike), null);
+            paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
             Assert.Equal(Money.Zero, accounting.Due);
             Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
@@ -423,7 +414,7 @@ namespace BTCPayServer.Tests
                 new BitcoinLikePaymentHandler(null, networkProvider, null, null),
                 new LightningLikePaymentHandler(null, null, networkProvider, null),
             });
-            var entity = new InvoiceEntity() {PaymentMethodHandlerDictionary = paymentMethodHandlerDictionary};
+            var entity = new InvoiceEntity();
 #pragma warning disable CS0618
             entity.Payments = new List<PaymentEntity>();
             entity.SetPaymentMethod(new PaymentMethod()
@@ -2666,27 +2657,28 @@ donation:
         {
             var unusedUri = new Uri("https://toto.com");
             Assert.True(ExternalConnectionString.TryParse("server=/test", out var connStr, out var error));
-            var expanded = await connStr.Expand(new Uri("https://toto.com"), ExternalServiceTypes.Charge);
+            var expanded = await connStr.Expand(new Uri("https://toto.com"), ExternalServiceTypes.Charge, NetworkType.Mainnet);
             Assert.Equal(new Uri("https://toto.com/test"), expanded.Server);
-            expanded = await connStr.Expand(new Uri("http://toto.onion"), ExternalServiceTypes.Charge);
+            expanded = await connStr.Expand(new Uri("http://toto.onion"), ExternalServiceTypes.Charge, NetworkType.Mainnet);
             Assert.Equal(new Uri("http://toto.onion/test"), expanded.Server);
-            await Assert.ThrowsAsync<SecurityException>(() => connStr.Expand(new Uri("http://toto.com"), ExternalServiceTypes.Charge));
+            await Assert.ThrowsAsync<SecurityException>(() => connStr.Expand(new Uri("http://toto.com"), ExternalServiceTypes.Charge, NetworkType.Mainnet));
+            await connStr.Expand(new Uri("http://toto.com"), ExternalServiceTypes.Charge, NetworkType.Testnet);
 
             // Make sure absolute paths are not expanded
             Assert.True(ExternalConnectionString.TryParse("server=https://tow/test", out connStr, out error));
-            expanded = await connStr.Expand(new Uri("https://toto.com"), ExternalServiceTypes.Charge);
+            expanded = await connStr.Expand(new Uri("https://toto.com"), ExternalServiceTypes.Charge, NetworkType.Mainnet);
             Assert.Equal(new Uri("https://tow/test"), expanded.Server);
 
             // Error if directory not exists
             Assert.True(ExternalConnectionString.TryParse($"server={unusedUri};macaroondirectorypath=pouet", out connStr, out error));
-            await Assert.ThrowsAsync<DirectoryNotFoundException>(() => connStr.Expand(unusedUri, ExternalServiceTypes.LNDGRPC));
-            await Assert.ThrowsAsync<DirectoryNotFoundException>(() => connStr.Expand(unusedUri, ExternalServiceTypes.LNDRest));
-            await connStr.Expand(unusedUri, ExternalServiceTypes.Charge);
+            await Assert.ThrowsAsync<DirectoryNotFoundException>(() => connStr.Expand(unusedUri, ExternalServiceTypes.LNDGRPC, NetworkType.Mainnet));
+            await Assert.ThrowsAsync<DirectoryNotFoundException>(() => connStr.Expand(unusedUri, ExternalServiceTypes.LNDRest, NetworkType.Mainnet));
+            await connStr.Expand(unusedUri, ExternalServiceTypes.Charge, NetworkType.Mainnet);
 
             var macaroonDirectory = CreateDirectory();
             Assert.True(ExternalConnectionString.TryParse($"server={unusedUri};macaroondirectorypath={macaroonDirectory}", out connStr, out error));
-            await connStr.Expand(unusedUri, ExternalServiceTypes.LNDGRPC);
-            expanded = await connStr.Expand(unusedUri, ExternalServiceTypes.LNDRest);
+            await connStr.Expand(unusedUri, ExternalServiceTypes.LNDGRPC, NetworkType.Mainnet);
+            expanded = await connStr.Expand(unusedUri, ExternalServiceTypes.LNDRest, NetworkType.Mainnet);
             Assert.NotNull(expanded.Macaroons);
             Assert.Null(expanded.MacaroonFilePath);
             Assert.Null(expanded.Macaroons.AdminMacaroon);
@@ -2696,7 +2688,7 @@ donation:
             File.WriteAllBytes($"{macaroonDirectory}/admin.macaroon", new byte[] { 0xaa });
             File.WriteAllBytes($"{macaroonDirectory}/invoice.macaroon", new byte[] { 0xab });
             File.WriteAllBytes($"{macaroonDirectory}/readonly.macaroon", new byte[] { 0xac });
-            expanded = await connStr.Expand(unusedUri, ExternalServiceTypes.LNDRest);
+            expanded = await connStr.Expand(unusedUri, ExternalServiceTypes.LNDRest, NetworkType.Mainnet);
             Assert.NotNull(expanded.Macaroons.AdminMacaroon);
             Assert.NotNull(expanded.Macaroons.InvoiceMacaroon);
             Assert.Equal("ab", expanded.Macaroons.InvoiceMacaroon.Hex);
@@ -2705,7 +2697,7 @@ donation:
 
             Assert.True(ExternalConnectionString.TryParse($"server={unusedUri};cookiefilepath={macaroonDirectory}/charge.cookie", out connStr, out error));
             File.WriteAllText($"{macaroonDirectory}/charge.cookie", "apitoken");
-            expanded = await connStr.Expand(unusedUri, ExternalServiceTypes.Charge);
+            expanded = await connStr.Expand(unusedUri, ExternalServiceTypes.Charge, NetworkType.Mainnet);
             Assert.Equal("apitoken", expanded.APIToken);
         }
 

BTCPayServer/Configuration/ExternalConnectionString.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
+using NBitcoin;
 
 namespace BTCPayServer.Configuration
 {
@@ -30,13 +31,16 @@ namespace BTCPayServer.Configuration
         /// Return a connectionString which does not depends on external resources or information like relative path or file path
         /// </summary>
         /// <returns></returns>
-        public async Task<ExternalConnectionString> Expand(Uri absoluteUrlBase, ExternalServiceTypes serviceType)
+        public async Task<ExternalConnectionString> Expand(Uri absoluteUrlBase, ExternalServiceTypes serviceType, NetworkType network)
         {
             var connectionString = this.Clone();
             // Transform relative URI into absolute URI
             var serviceUri = connectionString.Server.IsAbsoluteUri ? connectionString.Server : ToRelative(absoluteUrlBase, connectionString.Server.ToString());
-            if (!serviceUri.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase) &&
-               !serviceUri.DnsSafeHost.EndsWith(".onion", StringComparison.OrdinalIgnoreCase))
+            var isSecure = network != NetworkType.Mainnet ||
+                       serviceUri.Scheme == "https" ||
+                       serviceUri.DnsSafeHost.EndsWith(".onion", StringComparison.OrdinalIgnoreCase) ||
+                       Extensions.IsLocalNetwork(serviceUri.DnsSafeHost);
+            if (!isSecure)
             {
                 throw new System.Security.SecurityException($"Insecure transport protocol to access this service, please use HTTPS or TOR");
             }

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -111,23 +111,18 @@ namespace BTCPayServer.Controllers
 
             foreach (var payment in invoice.GetPayments())
             {
-                var paymentNetwork = _NetworkProvider.GetNetwork<BTCPayNetwork>(payment.GetCryptoCode());
-                if (paymentNetwork == null)
-                {
-                    continue;
-                }
                 var paymentData = payment.GetCryptoPaymentData();
                 //TODO: abstract
                 if (paymentData is Payments.Bitcoin.BitcoinLikePaymentData onChainPaymentData)
                 {
                     var m = new InvoiceDetailsModel.Payment();
                     m.Crypto = payment.GetPaymentMethodId().CryptoCode;
-                    m.DepositAddress = onChainPaymentData.GetDestination(paymentNetwork);
+                    m.DepositAddress = onChainPaymentData.GetDestination();
 
                     int confirmationCount = onChainPaymentData.ConfirmationCount;
-                    if (confirmationCount >= paymentNetwork.MaxTrackedConfirmation)
+                    if (confirmationCount >= payment.Network.MaxTrackedConfirmation)
                     {
-                        m.Confirmations = "At least " + (paymentNetwork.MaxTrackedConfirmation);
+                        m.Confirmations = "At least " + (payment.Network.MaxTrackedConfirmation);
                     }
                     else
                     {
@@ -136,7 +131,7 @@ namespace BTCPayServer.Controllers
 
                     m.TransactionId = onChainPaymentData.Outpoint.Hash.ToString();
                     m.ReceivedTime = payment.ReceivedTime;
-                    m.TransactionLink = string.Format(CultureInfo.InvariantCulture, paymentNetwork.BlockExplorerLink, m.TransactionId);
+                    m.TransactionLink = string.Format(CultureInfo.InvariantCulture, payment.Network.BlockExplorerLink, m.TransactionId);
                     m.Replaced = !payment.Accounted;
                     model.OnChainPayments.Add(m);
                 }
@@ -145,7 +140,7 @@ namespace BTCPayServer.Controllers
                     var lightningPaymentData = (LightningLikePaymentData)paymentData;
                     model.OffChainPayments.Add(new InvoiceDetailsModel.OffChainPayment()
                     {
-                        Crypto = paymentNetwork.CryptoCode,
+                        Crypto = payment.Network.CryptoCode,
                         BOLT11 = lightningPaymentData.BOLT11
                     });
                 }
@@ -242,7 +237,7 @@ namespace BTCPayServer.Controllers
                 paymentMethodId = paymentMethodTemp.GetId();
             }
 
-            var paymentMethod = invoice.GetPaymentMethod(paymentMethodId, _NetworkProvider);
+            var paymentMethod = invoice.GetPaymentMethod(paymentMethodId);
             var paymentMethodDetails = paymentMethod.GetPaymentMethodDetails();
             var dto = invoice.EntityToDTO();
             var cryptoInfo = dto.CryptoInfo.First(o => o.GetpaymentMethodId() == paymentMethodId);
@@ -266,7 +261,8 @@ namespace BTCPayServer.Controllers
                    (1m + (changelly.AmountMarkupPercentage / 100m)))
                 : (decimal?)null;
 
-            var paymentMethodHandler = invoice.PaymentMethodHandlerDictionary[paymentMethodId];
+            
+            var paymentMethodHandler = _paymentMethodHandlerDictionary[paymentMethodId];
             var model = new PaymentModel()
             {
                 CryptoCode = network.CryptoCode,
@@ -314,8 +310,7 @@ namespace BTCPayServer.Controllers
                                           .Select(kv =>
                                           {
                                               var availableCryptoPaymentMethodId = kv.GetId();
-                                              var availableCryptoHandler =
-                                                  invoice.PaymentMethodHandlerDictionary[availableCryptoPaymentMethodId];
+                                              var availableCryptoHandler = _paymentMethodHandlerDictionary[availableCryptoPaymentMethodId];
                                               return new PaymentModel.AvailableCrypto()
                                               {
                                                   PaymentMethodId = kv.GetId().ToString(),
@@ -499,7 +494,7 @@ namespace BTCPayServer.Controllers
         [BitpayAPIConstraint(false)]
         public async Task<IActionResult> Export(string format, string searchTerm = null, int timezoneOffset = 0)
         {
-            var model = new InvoiceExport(_NetworkProvider, _CurrencyNameTable);
+            var model = new InvoiceExport(_CurrencyNameTable);
 
             InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm, timezoneOffset);
             invoiceQuery.Skip = 0;

BTCPayServer/Controllers/InvoiceController.cs

@@ -67,6 +67,7 @@ namespace BTCPayServer.Controllers
         {
             if (!store.HasClaim(Policies.CanCreateInvoice.Key))
                 throw new UnauthorizedAccessException();
+            invoice.Currency = invoice.Currency?.ToUpperInvariant() ?? "USD";
             InvoiceLogs logs = new InvoiceLogs();
             logs.Write("Creation of invoice starting");
             var entity = _InvoiceRepository.CreateNewInvoice();
@@ -158,7 +159,7 @@ namespace BTCPayServer.Controllers
             var fetchingByCurrencyPair = _RateProvider.FetchRates(currencyPairsToFetch, rateRules, cancellationToken);
             var fetchingAll = WhenAllFetched(logs, fetchingByCurrencyPair);
             var supportedPaymentMethods = store.GetSupportedPaymentMethods(_NetworkProvider)
-                                               .Where(s => !excludeFilter.Match(s.PaymentId))
+                                               .Where(s => !excludeFilter.Match(s.PaymentId) && _paymentMethodHandlerDictionary.Support(s.PaymentId))
                                                .Select(c =>
                                                 (Handler: _paymentMethodHandlerDictionary[c.PaymentId],
                                                 SupportedPaymentMethod: c,

BTCPayServer/Controllers/ServerController.cs

@@ -604,7 +604,7 @@ namespace BTCPayServer.Controllers
                         ServiceLink = service.ConnectionString.Server.AbsoluteUri.WithoutEndingSlash()
                     });
                 }
-                var connectionString = await service.ConnectionString.Expand(this.Request.GetAbsoluteUriNoPathBase(), service.Type);
+                var connectionString = await service.ConnectionString.Expand(this.Request.GetAbsoluteUriNoPathBase(), service.Type, _Options.NetworkType);
                 switch (service.Type)
                 {
                     case ExternalServiceTypes.Charge:
@@ -720,7 +720,7 @@ namespace BTCPayServer.Controllers
             ExternalConnectionString connectionString = null;
             try
             {
-                connectionString = await service.ConnectionString.Expand(this.Request.GetAbsoluteUriNoPathBase(), service.Type);
+                connectionString = await service.ConnectionString.Expand(this.Request.GetAbsoluteUriNoPathBase(), service.Type, _Options.NetworkType);
             }
             catch (Exception ex)
             {

BTCPayServer/Controllers/StoresController.cs

@@ -35,7 +35,7 @@ namespace BTCPayServer.Controllers
 {
     [Route("stores")]
     [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
-    [Authorize(Policy = Policies.CanModifyStoreSettings.Key)]
+    [Authorize(Policy = Policies.CanModifyStoreSettings.Key, AuthenticationSchemes = Policies.CookieAuthentication)]
     [AutoValidateAntiforgeryToken]
     public partial class StoresController : Controller
     {
@@ -479,7 +479,7 @@ namespace BTCPayServer.Controllers
             {
                  switch (paymentMethodId.PaymentType)
                 {
-                    case PaymentTypes.BTCLike:
+                    case BitcoinPaymentType _:
                         var strategy = derivationByCryptoCode.TryGet(paymentMethodId.CryptoCode);
                         vm.DerivationSchemes.Add(new StoreViewModel.DerivationScheme()
                         {
@@ -489,7 +489,7 @@ namespace BTCPayServer.Controllers
                             Enabled = !excludeFilters.Match(paymentMethodId)
                         });
                         break;
-                    case PaymentTypes.LightningLike:
+                    case LightningPaymentType _:
                         var lightning = lightningByCryptoCode.TryGet(paymentMethodId.CryptoCode);
                         vm.LightningNodes.Add(new StoreViewModel.LightningNode()
                         {

BTCPayServer/Controllers/WalletsController.cs

@@ -488,7 +488,7 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("{walletId}/rescan")]
-        [Authorize(Policy = Policies.CanModifyServerSettings.Key)]
+        [Authorize(Policy = Policies.CanModifyServerSettings.Key, AuthenticationSchemes = Policies.CookieAuthentication)]
         public async Task<IActionResult> WalletRescan(
             [ModelBinder(typeof(WalletIdModelBinder))]
             WalletId walletId, RescanWalletModel vm)

BTCPayServer/Data/StoreData.cs

@@ -28,9 +28,6 @@ namespace BTCPayServer.Data
 {
     public class StoreData
     {
-        [NotMapped]
-        [JsonIgnore]
-        public PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary { get; set; }
         public string Id
         {
             get;
@@ -67,17 +64,15 @@ namespace BTCPayServer.Data
         }
         public IEnumerable<ISupportedPaymentMethod> GetSupportedPaymentMethods(BTCPayNetworkProvider networks)
         {
+            networks = networks.UnfilteredNetworks;
 #pragma warning disable CS0618
             bool btcReturned = false;
 
             // Legacy stuff which should go away
             if (!string.IsNullOrEmpty(DerivationStrategy))
             {
-                if (networks.BTC != null)
-                {
-                    btcReturned = true;
-                    yield return DerivationSchemeSettings.Parse(DerivationStrategy, networks.BTC);
-                }
+                btcReturned = true;
+                yield return DerivationSchemeSettings.Parse(DerivationStrategy, networks.BTC);
             }
 
 
@@ -95,8 +90,7 @@ namespace BTCPayServer.Data
                         if (strat.Value.Type == JTokenType.Null)
                             continue;
                         yield return
-                            PaymentMethodHandlerDictionary[paymentMethodId]
-                                .DeserializeSupportedPaymentMethod(paymentMethodId, strat.Value);
+                            paymentMethodId.PaymentType.DeserializeSupportedPaymentMethod(network, strat.Value);
                     }
                 }
             }

BTCPayServer/Extensions.cs

@@ -81,7 +81,7 @@ namespace BTCPayServer
         }
         public static PaymentMethodId GetpaymentMethodId(this InvoiceCryptoInfo info)
         {
-            return new PaymentMethodId(info.CryptoCode, Enum.Parse<PaymentTypes>(info.PaymentType));
+            return new PaymentMethodId(info.CryptoCode, PaymentTypes.Parse(info.PaymentType));
         }
         public static async Task CloseSocket(this WebSocket webSocket)
         {

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -36,18 +36,15 @@ namespace BTCPayServer.HostedServices
 
         InvoiceRepository _InvoiceRepository;
         EventAggregator _EventAggregator;
-        BTCPayNetworkProvider _NetworkProvider;
         ExplorerClientProvider _ExplorerClientProvider;
 
         public InvoiceWatcher(
-            BTCPayNetworkProvider networkProvider,
             InvoiceRepository invoiceRepository,
             EventAggregator eventAggregator,
             ExplorerClientProvider explorerClientProvider)
         {
             _InvoiceRepository = invoiceRepository ?? throw new ArgumentNullException(nameof(invoiceRepository));
             _EventAggregator = eventAggregator ?? throw new ArgumentNullException(nameof(eventAggregator));
-            _NetworkProvider = networkProvider;
             _ExplorerClientProvider = explorerClientProvider;
         }
         CompositeDisposable leases = new CompositeDisposable();
@@ -69,10 +66,9 @@ namespace BTCPayServer.HostedServices
 
             var payments = invoice.GetPayments().Where(p => p.Accounted).ToArray();
             var allPaymentMethods = invoice.GetPaymentMethods();
-            var paymentMethod = GetNearestClearedPayment(allPaymentMethods, out var accounting, _NetworkProvider);
+            var paymentMethod = GetNearestClearedPayment(allPaymentMethods, out var accounting);
             if (paymentMethod == null)
                 return;
-            var network = _NetworkProvider.GetNetwork<BTCPayNetworkBase>(paymentMethod.GetId().CryptoCode);
             if (invoice.Status == InvoiceStatus.New || invoice.Status == InvoiceStatus.Expired)
             {
                 if (accounting.Paid >= accounting.MinimumTotalDue)
@@ -125,7 +121,7 @@ namespace BTCPayServer.HostedServices
 
             if (invoice.Status == InvoiceStatus.Paid)
             {
-                var confirmedAccounting = paymentMethod.Calculate(p => p.GetCryptoPaymentData().PaymentConfirmed(p, invoice.SpeedPolicy, network));
+                var confirmedAccounting = paymentMethod.Calculate(p => p.GetCryptoPaymentData().PaymentConfirmed(p, invoice.SpeedPolicy));
 
                 if (// Is after the monitoring deadline
                    (invoice.MonitoringExpiration < DateTimeOffset.UtcNow)
@@ -149,7 +145,7 @@ namespace BTCPayServer.HostedServices
 
             if (invoice.Status == InvoiceStatus.Confirmed)
             {
-                var completedAccounting = paymentMethod.Calculate(p => p.GetCryptoPaymentData().PaymentCompleted(p, network));
+                var completedAccounting = paymentMethod.Calculate(p => p.GetCryptoPaymentData().PaymentCompleted(p));
                 if (completedAccounting.Paid >= accounting.MinimumTotalDue)
                 {
                     context.Events.Add(new InvoiceEvent(invoice, 1006, InvoiceEvent.Completed));
@@ -160,15 +156,13 @@ namespace BTCPayServer.HostedServices
 
         }
 
-        public static PaymentMethod GetNearestClearedPayment(PaymentMethodDictionary allPaymentMethods, out PaymentMethodAccounting accounting, BTCPayNetworkProvider networkProvider)
+        public static PaymentMethod GetNearestClearedPayment(PaymentMethodDictionary allPaymentMethods, out PaymentMethodAccounting accounting)
         {
             PaymentMethod result = null;
             accounting = null;
             decimal nearestToZero = 0.0m;
             foreach (var paymentMethod in allPaymentMethods)
             {
-                if (networkProvider != null && networkProvider.GetNetwork<BTCPayNetworkBase>(paymentMethod.GetId().CryptoCode) == null)
-                    continue;
                 var currentAccounting = paymentMethod.Calculate();
                 var distanceFromZero = Math.Abs(currentAccounting.DueUncapped.ToDecimal(MoneyUnit.BTC));
                 if (result == null || distanceFromZero < nearestToZero)
@@ -318,12 +312,11 @@ namespace BTCPayServer.HostedServices
                 .GetPayments()
                 .Select<PaymentEntity, Task<PaymentEntity>>(async payment =>
                 {
-                    var paymentNetwork = _NetworkProvider.GetNetwork<BTCPayNetwork>(payment.GetCryptoCode());
                     var paymentData = payment.GetCryptoPaymentData();
                     if (paymentData is Payments.Bitcoin.BitcoinLikePaymentData onChainPaymentData)
                     {
                         // Do update if confirmation count in the paymentData is not up to date
-                        if ((onChainPaymentData.ConfirmationCount < paymentNetwork.MaxTrackedConfirmation && payment.Accounted)
+                        if ((onChainPaymentData.ConfirmationCount < payment.Network.MaxTrackedConfirmation && payment.Accounted)
                             && (onChainPaymentData.Legacy || invoice.MonitoringExpiration < DateTimeOffset.UtcNow))
                         {
                             var transactionResult = await _ExplorerClientProvider.GetExplorerClient(payment.GetCryptoCode())?.GetTransactionAsync(onChainPaymentData.Outpoint.Hash);
@@ -332,7 +325,7 @@ namespace BTCPayServer.HostedServices
                             payment.SetCryptoPaymentData(onChainPaymentData);
 
                             // we want to extend invoice monitoring until we reach max confirmations on all onchain payment methods
-                            if (confirmationCount < paymentNetwork.MaxTrackedConfirmation)
+                            if (confirmationCount < payment.Network.MaxTrackedConfirmation)
                                 extendInvoiceMonitoring = true;
                             
                             return payment;

BTCPayServer/HostedServices/MigratorHostedService.cs

@@ -93,7 +93,6 @@ namespace BTCPayServer.HostedServices
                 foreach (var store in await ctx.Stores.ToArrayAsync())
                 {
 #pragma warning disable CS0618 // Type or member is obsolete
-                    _StoreRepository.PrepareEntity(store);
                     var blob = store.GetStoreBlob();
                     if (blob.WalletKeyPathRoots == null)
                         continue;
@@ -139,7 +138,6 @@ namespace BTCPayServer.HostedServices
             {
                 foreach (var store in await ctx.Stores.ToArrayAsync())
                 {
-                    _StoreRepository.PrepareEntity(store);
                     var blob = store.GetStoreBlob();
 #pragma warning disable CS0618 // Type or member is obsolete
                     if (blob.NetworkFeeDisabled != null)
@@ -160,7 +158,6 @@ namespace BTCPayServer.HostedServices
             {
                 foreach (var store in await ctx.Stores.ToArrayAsync())
                 {
-                    _StoreRepository.PrepareEntity(store);
                     var blob = store.GetStoreBlob();
 #pragma warning disable CS0612 // Type or member is obsolete
                     decimal multiplier = 1.0m;
@@ -191,7 +188,6 @@ namespace BTCPayServer.HostedServices
             {
                 foreach (var store in await ctx.Stores.ToArrayAsync())
                 {
-                    _StoreRepository.PrepareEntity(store);
                     foreach (var method in store.GetSupportedPaymentMethods(_NetworkProvider).OfType<Payments.Lightning.LightningSupportedPaymentMethod>())
                     {
                         var lightning = method.GetLightningUrl();

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -71,12 +71,10 @@ namespace BTCPayServer.Hosting
             {
                 var opts = o.GetRequiredService<BTCPayServerOptions>();
                 var dbContext = o.GetRequiredService<ApplicationDbContextFactory>();
-                var paymentMethodHandlerDictionary = o.GetService<PaymentMethodHandlerDictionary>();
                 var dbpath = Path.Combine(opts.DataDir, "InvoiceDB");
                 if (!Directory.Exists(dbpath))
                     Directory.CreateDirectory(dbpath);
-                return new InvoiceRepository(dbContext, dbpath, o.GetRequiredService<BTCPayNetworkProvider>(),
-                    paymentMethodHandlerDictionary);
+                return new InvoiceRepository(dbContext, dbpath, o.GetRequiredService<BTCPayNetworkProvider>());
             });
             services.AddSingleton<BTCPayServerEnvironment>();
             services.TryAddSingleton<TokenRepository>();

BTCPayServer/PaymentRequest/PaymentRequestService.cs

@@ -110,11 +110,11 @@ namespace BTCPayServer.PaymentRequest
                         var paymentMethodId = paymentEntity.GetPaymentMethodId();
 
                         string txId = paymentData.GetPaymentId();
-                        string link = paymentEntity.PaymentMethodHandlerDictionary[paymentMethodId].GetTransactionLink(paymentMethodId, txId);
+                        string link = GetTransactionLink(paymentMethodId, txId);
                         return new ViewPaymentRequestViewModel.PaymentRequestInvoicePayment()
                         {
                             Amount = paymentData.GetValue(),
-                            PaymentMethod = paymentEntity.GetPaymentMethodId().ToString(),
+                            PaymentMethod = paymentMethodId.ToString(),
                             Link = link,
                             Id = txId
                         };
@@ -122,5 +122,13 @@ namespace BTCPayServer.PaymentRequest
                 }).ToList()
             };
         }
+
+        private string GetTransactionLink(PaymentMethodId paymentMethodId, string txId)
+        {
+            var network = _BtcPayNetworkProvider.GetNetwork(paymentMethodId.CryptoCode);
+            if (network == null)
+                return null;
+            return paymentMethodId.PaymentType.GetTransactionLink(network, txId);
+        }
     }
 }

BTCPayServer/Payments/Bitcoin/BitcoinLikeOnChainPaymentMethod.cs

@@ -10,10 +10,7 @@ namespace BTCPayServer.Payments.Bitcoin
 {
     public class BitcoinLikeOnChainPaymentMethod : IPaymentMethodDetails
     {
-        public PaymentTypes GetPaymentType()
-        {
-            return PaymentTypes.BTCLike;
-        }
+        public PaymentType GetPaymentType() => PaymentTypes.BTCLike;
 
         public string GetPaymentDestination()
         {

BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentData.cs

@@ -11,7 +11,7 @@ namespace BTCPayServer.Payments.Bitcoin
 
     public class BitcoinLikePaymentData : CryptoPaymentData
     {
-        public PaymentTypes GetPaymentType()
+        public PaymentType GetPaymentType()
         {
             return PaymentTypes.BTCLike;
         }
@@ -27,6 +27,8 @@ namespace BTCPayServer.Payments.Bitcoin
             RBF = rbf;
         }
         [JsonIgnore]
+        public BTCPayNetworkBase Network { get; set; }
+        [JsonIgnore]
         public OutPoint Outpoint { get; set; }
         [JsonIgnore]
         public TxOut Output { get; set; }
@@ -54,12 +56,12 @@ namespace BTCPayServer.Payments.Bitcoin
             return Output.Value.ToDecimal(MoneyUnit.BTC);
         }
 
-        public bool PaymentCompleted(PaymentEntity entity, BTCPayNetworkBase network)
+        public bool PaymentCompleted(PaymentEntity entity)
         {
-            return ConfirmationCount >= network.MaxTrackedConfirmation;
+            return ConfirmationCount >= Network.MaxTrackedConfirmation;
         }
 
-        public bool PaymentConfirmed(PaymentEntity entity, SpeedPolicy speedPolicy, BTCPayNetworkBase network)
+        public bool PaymentConfirmed(PaymentEntity entity, SpeedPolicy speedPolicy)
         {
             if (speedPolicy == SpeedPolicy.HighSpeed)
             {
@@ -80,14 +82,14 @@ namespace BTCPayServer.Payments.Bitcoin
             return false;
         }
 
-        public BitcoinAddress GetDestination(BTCPayNetworkBase network)
+        public BitcoinAddress GetDestination()
         {
-            return Output.ScriptPubKey.GetDestinationAddress(((BTCPayNetwork)network).NBitcoinNetwork);
+            return Output.ScriptPubKey.GetDestinationAddress(((BTCPayNetwork)Network).NBitcoinNetwork);
         }
 
-        string CryptoPaymentData.GetDestination(BTCPayNetworkBase network)
+        string CryptoPaymentData.GetDestination()
         {
-            return GetDestination(network).ToString();
+            return GetDestination().ToString();
         }
     }
 }

BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs

@@ -104,14 +104,6 @@ namespace BTCPayServer.Payments.Bitcoin
             return network.DisplayName;
         }
 
-
-        public override string GetTransactionLink(PaymentMethodId paymentMethodId, params object[] args)
-        {
-
-            var network = _networkProvider.GetNetwork<BTCPayNetwork>(paymentMethodId.CryptoCode);
-            return string.Format(CultureInfo.InvariantCulture, network.BlockExplorerLink, args);
-        }
-
         public override object PreparePayment(DerivationSchemeSettings supportedPaymentMethod, StoreData store,
             BTCPayNetworkBase network)
         {
@@ -123,7 +115,7 @@ namespace BTCPayServer.Payments.Bitcoin
             };
         }
 
-        public override PaymentTypes PaymentType => PaymentTypes.BTCLike;
+        public override PaymentType PaymentType => PaymentTypes.BTCLike;
 
         public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(
             DerivationSchemeSettings supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store,
@@ -149,48 +141,5 @@ namespace BTCPayServer.Payments.Bitcoin
             onchainMethod.DepositAddress = (await prepare.ReserveAddress).ToString();
             return onchainMethod;
         }
-
-        public override void PrepareInvoiceDto(InvoiceResponse invoiceResponse, InvoiceEntity invoiceEntity,
-            InvoiceCryptoInfo invoiceCryptoInfo,
-            PaymentMethodAccounting accounting, PaymentMethod info)
-        {
-            var scheme = info.Network.UriScheme;
-
-            var minerInfo = new MinerFeeInfo();
-            minerInfo.TotalFee = accounting.NetworkFee.Satoshi;
-            minerInfo.SatoshiPerBytes = ((BitcoinLikeOnChainPaymentMethod)info.GetPaymentMethodDetails()).FeeRate
-                .GetFee(1).Satoshi;
-            invoiceResponse.MinerFees.TryAdd(invoiceCryptoInfo.CryptoCode, minerInfo);
-            invoiceCryptoInfo.PaymentUrls = new NBitpayClient.InvoicePaymentUrls()
-            {
-                BIP21 = $"{scheme}:{invoiceCryptoInfo.Address}?amount={invoiceCryptoInfo.Due}",
-            };
-
-#pragma warning disable 618
-            if (info.CryptoCode == "BTC")
-            {
-                invoiceResponse.BTCPrice = invoiceCryptoInfo.Price;
-                invoiceResponse.Rate = invoiceCryptoInfo.Rate;
-                invoiceResponse.ExRates = invoiceCryptoInfo.ExRates;
-                invoiceResponse.BitcoinAddress = invoiceCryptoInfo.Address;
-                invoiceResponse.BTCPaid = invoiceCryptoInfo.Paid;
-                invoiceResponse.BTCDue = invoiceCryptoInfo.Due;
-                invoiceResponse.PaymentUrls = invoiceCryptoInfo.PaymentUrls;
-            }
-#pragma warning restore 618
-        }
-
-        public override ISupportedPaymentMethod DeserializeSupportedPaymentMethod(PaymentMethodId paymentMethodId, JToken value)
-        {
-            var network = _networkProvider.GetNetwork<BTCPayNetwork>(paymentMethodId.CryptoCode);
-            if (value is JObject jobj)
-            {
-                var scheme = network.NBXplorerNetwork.Serializer.ToObject<DerivationSchemeSettings>(jobj);
-                scheme.Network = network;
-                return scheme;
-            }
-            // Legacy
-            return DerivationSchemeSettings.Parse(((JValue)value).Value<string>(), network);
-        }
     }
 }

BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs

@@ -361,7 +361,7 @@ namespace BTCPayServer.Payments.Bitcoin
             invoice = (await UpdatePaymentStates(wallet, invoice.Id));
             if (invoice == null)
                 return null;
-            var paymentMethod = invoice.GetPaymentMethod(wallet.Network, PaymentTypes.BTCLike, _ExplorerClients.NetworkProviders);
+            var paymentMethod = invoice.GetPaymentMethod(wallet.Network, PaymentTypes.BTCLike);
             if (paymentMethod != null &&
                 paymentMethod.GetPaymentMethodDetails() is BitcoinLikeOnChainPaymentMethod btc &&
                 btc.GetDepositAddress(wallet.Network.NBitcoinNetwork).ScriptPubKey == paymentData.Output.ScriptPubKey &&

BTCPayServer/Payments/IPaymentMethodDetails.cs

@@ -16,7 +16,7 @@ namespace BTCPayServer.Payments
         /// </summary>
         /// <returns></returns>
         string GetPaymentDestination();
-        PaymentTypes GetPaymentType();
+        PaymentType GetPaymentType();
         /// <summary>
         /// Returns fee that the merchant charge to the customer for the next payment
         /// </summary>

BTCPayServer/Payments/IPaymentMethodHandler.cs

@@ -39,11 +39,6 @@ namespace BTCPayServer.Payments
         /// <returns></returns>
         object PreparePayment(ISupportedPaymentMethod supportedPaymentMethod, StoreData store, BTCPayNetworkBase network);
 
-        void PrepareInvoiceDto(InvoiceResponse invoiceResponse, InvoiceEntity invoiceEntity,
-            InvoiceCryptoInfo invoiceCryptoInfo,
-            PaymentMethodAccounting accounting, PaymentMethod info);
-
-
         void PreparePaymentModel(PaymentModel model, InvoiceResponse invoiceResponse);
         string GetCryptoImage(PaymentMethodId paymentMethodId);
         string GetPaymentMethodName(PaymentMethodId paymentMethodId);
@@ -53,9 +48,6 @@ namespace BTCPayServer.Payments
             Money amount, PaymentMethodId paymentMethodId);
 
         IEnumerable<PaymentMethodId> GetSupportedPaymentMethods();
-
-        ISupportedPaymentMethod DeserializeSupportedPaymentMethod(PaymentMethodId paymentMethodId, JToken value);
-        string GetTransactionLink(PaymentMethodId paymentMethodId, params object[] args);
     }
 
     public interface IPaymentMethodHandler<TSupportedPaymentMethod, TBTCPayNetwork> : IPaymentMethodHandler
@@ -71,15 +63,12 @@ namespace BTCPayServer.Payments
         where TSupportedPaymentMethod : ISupportedPaymentMethod
         where TBTCPayNetwork : BTCPayNetworkBase
     {
-        public abstract PaymentTypes PaymentType { get; }
+        public abstract PaymentType PaymentType { get; }
 
         public abstract Task<IPaymentMethodDetails> CreatePaymentMethodDetails(
             TSupportedPaymentMethod supportedPaymentMethod,
             PaymentMethod paymentMethod, StoreData store, TBTCPayNetwork network, object preparePaymentObject);
 
-        public abstract void PrepareInvoiceDto(InvoiceResponse invoiceResponse, InvoiceEntity invoiceEntity,
-            InvoiceCryptoInfo invoiceCryptoInfo, PaymentMethodAccounting accounting, PaymentMethod info);
-
         public abstract void PreparePaymentModel(PaymentModel model, InvoiceResponse invoiceResponse);
         public abstract string GetCryptoImage(PaymentMethodId paymentMethodId);
         public abstract string GetPaymentMethodName(PaymentMethodId paymentMethodId);
@@ -89,10 +78,6 @@ namespace BTCPayServer.Payments
 
         public abstract IEnumerable<PaymentMethodId> GetSupportedPaymentMethods();
 
-        public abstract ISupportedPaymentMethod DeserializeSupportedPaymentMethod(PaymentMethodId paymentMethodId, JToken value);
-        public abstract string GetTransactionLink(PaymentMethodId paymentMethodId, params object[] args);
-
-
         public virtual object PreparePayment(TSupportedPaymentMethod supportedPaymentMethod, StoreData store,
             BTCPayNetworkBase network)
         {

BTCPayServer/Payments/Lightning/LightningLikePaymentData.cs

@@ -14,13 +14,15 @@ namespace BTCPayServer.Payments.Lightning
 {
     public class LightningLikePaymentData : CryptoPaymentData
     {
+        [JsonIgnore]
+        public BTCPayNetworkBase Network { get; set; }
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
         public string BOLT11 { get; set; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.UInt256JsonConverter))]
         public uint256 PaymentHash { get; set; }
 
-        public string GetDestination(BTCPayNetworkBase network)
+        public string GetDestination()
         {
             return BOLT11;
         }
@@ -34,7 +36,7 @@ namespace BTCPayServer.Payments.Lightning
             return PaymentHash?.ToString() ?? BOLT11;
         }
 
-        public PaymentTypes GetPaymentType()
+        public PaymentType GetPaymentType()
         {
             return PaymentTypes.LightningLike;
         }
@@ -49,12 +51,12 @@ namespace BTCPayServer.Payments.Lightning
             return Amount.ToDecimal(LightMoneyUnit.BTC);
         }
 
-        public bool PaymentCompleted(PaymentEntity entity, BTCPayNetworkBase network)
+        public bool PaymentCompleted(PaymentEntity entity)
         {
             return true;
         }
 
-        public bool PaymentConfirmed(PaymentEntity entity, SpeedPolicy speedPolicy, BTCPayNetworkBase network)
+        public bool PaymentConfirmed(PaymentEntity entity, SpeedPolicy speedPolicy)
         {
             return true;
         }

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -40,7 +40,7 @@ namespace BTCPayServer.Payments.Lightning
             _socketFactory = socketFactory;
         }
 
-        public override PaymentTypes PaymentType => PaymentTypes.LightningLike;
+        public override PaymentType PaymentType => PaymentTypes.LightningLike;
         public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(
             LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store,
             BTCPayNetwork network, object preparePaymentObject)
@@ -168,25 +168,6 @@ namespace BTCPayServer.Payments.Lightning
             return "The amount of the invoice is too high to be paid with lightning";
         }
 
-        public override ISupportedPaymentMethod DeserializeSupportedPaymentMethod(PaymentMethodId paymentMethodId, JToken value)
-        { 
-            return JsonConvert.DeserializeObject<LightningSupportedPaymentMethod>(value.ToString());
-        }
-    
-        public override string GetTransactionLink(PaymentMethodId paymentMethodId, params object[] args)
-        {
-            return null;
-        }
-
-        public override void PrepareInvoiceDto(InvoiceResponse invoiceResponse, InvoiceEntity invoiceEntity,
-            InvoiceCryptoInfo invoiceCryptoInfo, PaymentMethodAccounting accounting, PaymentMethod info)
-        {
-            invoiceCryptoInfo.PaymentUrls = new InvoicePaymentUrls()
-            {
-                BOLT11 = $"lightning:{invoiceCryptoInfo.Address}"
-            };
-        }
-
         public override void PreparePaymentModel(PaymentModel model, InvoiceResponse invoiceResponse)
         {
             var paymentMethodId = new PaymentMethodId(model.CryptoCode, PaymentTypes.LightningLike);

BTCPayServer/Payments/Lightning/LightningLikePaymentMethodDetails.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer.Payments.Lightning
             return BOLT11;
         }
 
-        public PaymentTypes GetPaymentType()
+        public PaymentType GetPaymentType()
         {
             return PaymentTypes.LightningLike;
         }

BTCPayServer/Payments/PaymentMethodId.cs

@@ -11,10 +11,12 @@ namespace BTCPayServer.Payments
     /// </summary>
     public class PaymentMethodId
     {
-        public PaymentMethodId(string cryptoCode, PaymentTypes paymentType)
+        public PaymentMethodId(string cryptoCode, PaymentType paymentType)
         {
             if (cryptoCode == null)
                 throw new ArgumentNullException(nameof(cryptoCode));
+            if (paymentType == null)
+                throw new ArgumentNullException(nameof(paymentType));
             PaymentType = paymentType;
             CryptoCode = cryptoCode.ToUpperInvariant();
         }
@@ -29,7 +31,7 @@ namespace BTCPayServer.Payments
         }
 
         public string CryptoCode { get; private set; }
-        public PaymentTypes PaymentType { get; private set; }
+        public PaymentType PaymentType { get; private set; }
 
 
         public override bool Equals(object obj)
@@ -66,22 +68,9 @@ namespace BTCPayServer.Payments
             return PaymentType == PaymentTypes.BTCLike ? CryptoCode : $"{CryptoCode}_{PaymentType}";
         }
 
-        public string ToPrettyPaymentType()
-        {
-            switch (PaymentType)
-            {
-                case PaymentTypes.BTCLike:
-                    return "On-Chain";
-                case PaymentTypes.LightningLike:
-                    return "Off-Chain";
-                default:
-                    return PaymentType.ToString();
-            }
-        }
-
         public string ToPrettyString()
         {
-            return $"{CryptoCode} ({ToPrettyPaymentType()})";
+            return $"{CryptoCode} ({PaymentType.ToPrettyString()})";
         }
 
         public static bool TryParse(string str, out PaymentMethodId paymentMethodId)
@@ -90,28 +79,11 @@ namespace BTCPayServer.Payments
             var parts = str.Split('_', StringSplitOptions.RemoveEmptyEntries);
             if (parts.Length == 0 || parts.Length > 2)
                 return false;
-            PaymentTypes type = PaymentTypes.BTCLike;
+            PaymentType type = PaymentTypes.BTCLike;
             if (parts.Length == 2)
             {
-                var typePart = parts[1].ToLowerInvariant();
-                switch (typePart)
-                {
-                    case "btclike":
-                    case "onchain":
-                        type = PaymentTypes.BTCLike;
-                        break;
-                    case "lightninglike":
-                    case "offchain":
-                        type = PaymentTypes.LightningLike;
-                        break;
-                    default:
-                        if (!Enum.TryParse(typePart, true, out type ))
-                        {
-                            return false;
-                        }
-
-                        break;
-                }
+                if (!PaymentTypes.TryParse(parts[1], out type))
+                    return false;
             }
             paymentMethodId = new PaymentMethodId(parts[0], type);
             return true;

BTCPayServer/Payments/PaymentTypes.Bitcoin.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Payments.Bitcoin;
+using BTCPayServer.Services.Invoices;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Payments
+{
+    public class BitcoinPaymentType : PaymentType
+    {
+        public static BitcoinPaymentType Instance { get; } = new BitcoinPaymentType();
+        private BitcoinPaymentType()
+        {
+
+        }
+
+        public override string ToPrettyString() => "On-Chain";
+        public override string GetId() => "BTCLike";
+
+        public override CryptoPaymentData DeserializePaymentData(string str)
+        {
+            return JsonConvert.DeserializeObject<BitcoinLikePaymentData>(str);
+        }
+
+        public override IPaymentMethodDetails DeserializePaymentMethodDetails(string str)
+        {
+            return JsonConvert.DeserializeObject<Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod>(str);
+        }
+
+        public override ISupportedPaymentMethod DeserializeSupportedPaymentMethod(BTCPayNetworkBase network, JToken value)
+        {
+            if (network == null)
+                throw new ArgumentNullException(nameof(network));
+            if (value == null)
+                throw new ArgumentNullException(nameof(value));
+            var net = (BTCPayNetwork)network;
+            if (value is JObject jobj)
+            {
+                var scheme = net.NBXplorerNetwork.Serializer.ToObject<DerivationSchemeSettings>(jobj);
+                scheme.Network = net;
+                return scheme;
+            }
+            // Legacy
+            return DerivationSchemeSettings.Parse(((JValue)value).Value<string>(), net);
+        }
+
+        public override string GetTransactionLink(BTCPayNetworkBase network, string txId)
+        {
+            if (txId == null)
+                throw new ArgumentNullException(nameof(txId));
+            if (network?.BlockExplorerLink == null)
+                return null;
+            return string.Format(CultureInfo.InvariantCulture, network.BlockExplorerLink, txId);
+        }
+    }
+}

BTCPayServer/Payments/PaymentTypes.Lightning.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Payments.Lightning;
+using BTCPayServer.Services.Invoices;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Payments
+{
+    public class LightningPaymentType : PaymentType
+    {
+        public static LightningPaymentType Instance { get; } = new LightningPaymentType();
+        private LightningPaymentType()
+        {
+
+        }
+
+        public override string ToPrettyString() => "Off-Chain";
+        public override string GetId() => "LightningLike";
+
+        public override CryptoPaymentData DeserializePaymentData(string str)
+        {
+            return JsonConvert.DeserializeObject<Payments.Lightning.LightningLikePaymentData>(str);
+        }
+
+        public override IPaymentMethodDetails DeserializePaymentMethodDetails(string str)
+        {
+            return JsonConvert.DeserializeObject<Payments.Lightning.LightningLikePaymentMethodDetails>(str);
+        }
+
+        public override ISupportedPaymentMethod DeserializeSupportedPaymentMethod(BTCPayNetworkBase network, JToken value)
+        {
+            return JsonConvert.DeserializeObject<LightningSupportedPaymentMethod>(value.ToString());
+        }
+
+        public override string GetTransactionLink(BTCPayNetworkBase network, string txId)
+        {
+            return null;
+        }
+    }
+}

BTCPayServer/Payments/PaymentTypes.cs

@@ -2,21 +2,64 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Invoices;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Payments
 {
     /// <summary>
     /// The different ways to pay an invoice
     /// </summary>
-    public enum PaymentTypes
+    public static class PaymentTypes
     {
         /// <summary>
         /// On-Chain UTXO based, bitcoin compatible
         /// </summary>
-        BTCLike,
+        public static BitcoinPaymentType BTCLike => BitcoinPaymentType.Instance;
         /// <summary>
         /// Lightning payment
         /// </summary>
-        LightningLike
+        public static LightningPaymentType LightningLike => LightningPaymentType.Instance;
+
+        public static bool TryParse(string paymentType, out PaymentType type)
+        {
+            switch (paymentType.ToLowerInvariant())
+            {
+                case "btclike":
+                case "onchain":
+                    type = PaymentTypes.BTCLike;
+                    break;
+                case "lightninglike":
+                case "offchain":
+                    type = PaymentTypes.LightningLike;
+                    break;
+                default:
+                    type = null;
+                    return false;
+            }
+            return true;
+        }
+        public static PaymentType Parse(string paymentType)
+        {
+            if (!TryParse(paymentType, out var result))
+                throw new FormatException("Invalid payment type");
+            return result;
+        }
+    }
+
+    public abstract class PaymentType
+    {
+        public abstract string ToPrettyString();
+        public override string ToString()
+        {
+            return GetId();
+        }
+
+        public abstract string GetId();
+        public abstract CryptoPaymentData DeserializePaymentData(string str);
+        public abstract IPaymentMethodDetails DeserializePaymentMethodDetails(string str);
+        public abstract ISupportedPaymentMethod DeserializeSupportedPaymentMethod(BTCPayNetworkBase network, JToken value);
+
+        public abstract string GetTransactionLink(BTCPayNetworkBase network, string txId);
     }
 }

BTCPayServer/Security/AuthenticationExtensions.cs

@@ -0,0 +1,15 @@
+using System;
+using BTCPayServer.Security.Bitpay;
+using Microsoft.AspNetCore.Authentication;
+
+namespace BTCPayServer.Security
+{
+    public static class AuthenticationExtensions
+    {
+        public static AuthenticationBuilder AddBitpayAuthentication(this AuthenticationBuilder builder)
+        {
+            builder.AddScheme<BitpayAuthenticationOptions, BitpayAuthenticationHandler>(Policies.BitpayAuthentication, o => { });
+            return builder;
+        }
+    }
+} 

BTCPayServer/Security/BTCPayClaimsFilter.cs

@@ -29,12 +29,9 @@ namespace BTCPayServer.Security
 
         public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
         {
-            var principal = context.HttpContext.User;
-            if (context.HttpContext.GetIsBitpayAPI())
-            {
+            if (context.HttpContext.User?.Identity?.AuthenticationType != Policies.CookieAuthentication)
                 return;
-            }
-
+            var principal = context.HttpContext.User;
             var identity = ((ClaimsIdentity)principal.Identity);
             if (principal.IsInRole(Roles.ServerAdmin))
             {

BTCPayServer/Security/Bitpay/BitpayAuthenticationHandler.cs

@@ -0,0 +1,172 @@
+using System;
+using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.Http.Extensions;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+using BTCPayServer.Authentication;
+using BTCPayServer.Services;
+using BTCPayServer.Services.Stores;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+using NBitcoin;
+using NBitcoin.DataEncoders;
+using NBitpayClient;
+using NBitpayClient.Extensions;
+using Newtonsoft.Json.Linq;
+using BTCPayServer.Logging;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Authentication;
+using System.Text.Encodings.Web;
+
+
+namespace BTCPayServer.Security.Bitpay
+{
+    public class BitpayAuthenticationHandler : AuthenticationHandler<BitpayAuthenticationOptions>
+    {
+        StoreRepository _StoreRepository;
+        TokenRepository _TokenRepository;
+        public BitpayAuthenticationHandler(
+            TokenRepository tokenRepository,
+            StoreRepository storeRepository,
+            IOptionsMonitor<BitpayAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
+        {
+            _TokenRepository = tokenRepository;
+            _StoreRepository = storeRepository;
+        }
+
+        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
+        {
+            List<Claim> claims = new List<Claim>();
+            var bitpayAuth = Context.Request.HttpContext.GetBitpayAuth();
+            string storeId = null;
+            bool anonymous = true;
+            bool? success = null;
+            if (!string.IsNullOrEmpty(bitpayAuth.Signature) && !string.IsNullOrEmpty(bitpayAuth.Id))
+            {
+                var result = await CheckBitId(Context.Request.HttpContext, bitpayAuth.Signature, bitpayAuth.Id, claims);
+                storeId = result.StoreId;
+                success = result.SuccessAuth;
+                anonymous = false;
+            }
+            else if (!string.IsNullOrEmpty(bitpayAuth.Authorization))
+            {
+                storeId = await CheckLegacyAPIKey(Context.Request.HttpContext, bitpayAuth.Authorization);
+                success = storeId != null;
+                anonymous = false;
+            }
+            else
+            {
+                if (Context.Request.HttpContext.Request.Query.TryGetValue("storeId", out var storeIdStringValues))
+                {
+                    storeId = storeIdStringValues.FirstOrDefault() ?? string.Empty;
+                    success = true;
+                    anonymous = true;
+                }
+            }
+
+            if (success is true)
+            {
+                if (storeId != null)
+                {
+                    claims.Add(new Claim(Policies.CanCreateInvoice.Key, storeId));
+                    var store = await _StoreRepository.FindStore(storeId);
+                    if (store == null ||
+                       (anonymous && !store.GetStoreBlob().AnyoneCanInvoice))
+                    {
+                        return AuthenticateResult.Fail("Invalid credentials");
+                    }
+                    store.AdditionalClaims.AddRange(claims);
+                    Context.Request.HttpContext.SetStoreData(store);
+                }
+                return AuthenticateResult.Success(new AuthenticationTicket(new ClaimsPrincipal(new ClaimsIdentity(claims, Policies.BitpayAuthentication)), Policies.BitpayAuthentication));
+            }
+            else if (success is false)
+            {
+                return AuthenticateResult.Fail("Invalid credentials");
+            }
+            return AuthenticateResult.NoResult();
+        }
+
+        private async Task<(string StoreId, bool SuccessAuth)> CheckBitId(HttpContext httpContext, string sig, string id, List<Claim> claims)
+        {
+            httpContext.Request.EnableRewind();
+
+            string storeId = null;
+            string body = string.Empty;
+            if (httpContext.Request.ContentLength != 0 && httpContext.Request.Body != null)
+            {
+                using (StreamReader reader = new StreamReader(httpContext.Request.Body, Encoding.UTF8, true, 1024, true))
+                {
+                    body = reader.ReadToEnd();
+                }
+                httpContext.Request.Body.Position = 0;
+            }
+
+            var url = httpContext.Request.GetEncodedUrl();
+            try
+            {
+                var key = new PubKey(id);
+                if (BitIdExtensions.CheckBitIDSignature(key, sig, url, body))
+                {
+                    var sin = key.GetBitIDSIN();
+                    claims.Add(new Claim(Claims.SIN, sin));
+
+                    string token = null;
+                    if (httpContext.Request.Query.TryGetValue("token", out var tokenValues))
+                    {
+                        token = tokenValues[0];
+                    }
+
+                    if (token == null && !String.IsNullOrEmpty(body) && httpContext.Request.Method == "POST")
+                    {
+                        try
+                        {
+                            token = JObject.Parse(body)?.Property("token", StringComparison.OrdinalIgnoreCase)?.Value?.Value<string>();
+                        }
+                        catch { }
+                    }
+
+                    if (token != null)
+                    {
+                        var bitToken = (await _TokenRepository.GetTokens(sin)).FirstOrDefault();
+                        if (bitToken == null)
+                        {
+                            return (null, false);
+                        }
+                        storeId = bitToken.StoreId;
+                    }
+                }
+                else
+                {
+                    return (storeId, false);
+                }
+            }
+            catch (FormatException) { }
+            return (storeId, true);
+        }
+
+        private async Task<string> CheckLegacyAPIKey(HttpContext httpContext, string auth)
+        {
+            var splitted = auth.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+            if (splitted.Length != 2 || !splitted[0].Equals("Basic", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            string apiKey = null;
+            try
+            {
+                apiKey = Encoders.ASCII.EncodeData(Encoders.Base64.DecodeData(splitted[1]));
+            }
+            catch
+            {
+                return null;
+            }
+            return await _TokenRepository.GetStoreIdFromAPIKey(apiKey);
+        }
+    }
+}

BTCPayServer/Security/Bitpay/BitpayAuthenticationOptions.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+
+namespace BTCPayServer.Security.Bitpay
+{
+    public class BitpayAuthenticationOptions : AuthenticationSchemeOptions
+    {
+    }
+}

BTCPayServer/Security/BitpayAuthentication.cs

@@ -1,187 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Http.Extensions;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using BTCPayServer.Authentication;
-using BTCPayServer.Services;
-using BTCPayServer.Services.Stores;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
-using NBitcoin;
-using NBitcoin.DataEncoders;
-using NBitpayClient;
-using NBitpayClient.Extensions;
-using Newtonsoft.Json.Linq;
-using BTCPayServer.Logging;
-using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNetCore.Authentication;
-using System.Text.Encodings.Web;
-
-namespace BTCPayServer.Security
-{
-    public class BitpayAuthentication
-    {
-        public class BitpayAuthOptions : AuthenticationSchemeOptions
-        {
-
-        }
-        class BitpayAuthHandler : AuthenticationHandler<BitpayAuthOptions>
-        {
-            StoreRepository _StoreRepository;
-            TokenRepository _TokenRepository;
-            public BitpayAuthHandler(
-                TokenRepository tokenRepository,
-                StoreRepository storeRepository,
-                IOptionsMonitor<BitpayAuthOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
-            {
-                _TokenRepository = tokenRepository;
-                _StoreRepository = storeRepository;
-            }
-
-            protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
-            {
-                if (Context.Request.HttpContext.GetIsBitpayAPI())
-                {
-                    List<Claim> claims = new List<Claim>();
-                    var bitpayAuth = Context.Request.HttpContext.GetBitpayAuth();
-                    string storeId = null;
-                    bool anonymous = true;
-                    bool? success = null;
-                    if (!string.IsNullOrEmpty(bitpayAuth.Signature) && !string.IsNullOrEmpty(bitpayAuth.Id))
-                    {
-                        var result = await CheckBitId(Context.Request.HttpContext, bitpayAuth.Signature, bitpayAuth.Id, claims);
-                        storeId = result.StoreId;
-                        success = result.SuccessAuth;
-                        anonymous = false;
-                    }
-                    else if (!string.IsNullOrEmpty(bitpayAuth.Authorization))
-                    {
-                        storeId = await CheckLegacyAPIKey(Context.Request.HttpContext, bitpayAuth.Authorization);
-                        success = storeId != null;
-                        anonymous = false;
-                    }
-                    else
-                    {
-                        if (Context.Request.HttpContext.Request.Query.TryGetValue("storeId", out var storeIdStringValues))
-                        {
-                            storeId = storeIdStringValues.FirstOrDefault() ?? string.Empty;
-                            success = true;
-                            anonymous = true;
-                        }
-                    }
-
-                    if (success is true)
-                    {
-                        if (storeId != null)
-                        {
-                            claims.Add(new Claim(Policies.CanCreateInvoice.Key, storeId));
-                            var store = await _StoreRepository.FindStore(storeId);
-                            if (store == null ||
-                               (anonymous && !store.GetStoreBlob().AnyoneCanInvoice))
-                            {
-                                return AuthenticateResult.Fail("Invalid credentials");
-                            }
-                            store.AdditionalClaims.AddRange(claims);
-                            Context.Request.HttpContext.SetStoreData(store);
-                        }
-                        return AuthenticateResult.Success(new AuthenticationTicket(new ClaimsPrincipal(new ClaimsIdentity(claims, Policies.BitpayAuthentication)), Policies.BitpayAuthentication));
-                    }
-                    else if (success is false)
-                    {
-                        return AuthenticateResult.Fail("Invalid credentials");
-                    }
-                    // else if (success is null)
-                }
-                return AuthenticateResult.NoResult();
-            }
-
-            private async Task<(string StoreId, bool SuccessAuth)> CheckBitId(HttpContext httpContext, string sig, string id, List<Claim> claims)
-            {
-                httpContext.Request.EnableRewind();
-
-                string storeId = null;
-                string body = string.Empty;
-                if (httpContext.Request.ContentLength != 0 && httpContext.Request.Body != null)
-                {
-                    using (StreamReader reader = new StreamReader(httpContext.Request.Body, Encoding.UTF8, true, 1024, true))
-                    {
-                        body = reader.ReadToEnd();
-                    }
-                    httpContext.Request.Body.Position = 0;
-                }
-
-                var url = httpContext.Request.GetEncodedUrl();
-                try
-                {
-                    var key = new PubKey(id);
-                    if (BitIdExtensions.CheckBitIDSignature(key, sig, url, body))
-                    {
-                        var sin = key.GetBitIDSIN();
-                        claims.Add(new Claim(Claims.SIN, sin));
-
-                        string token = null;
-                        if (httpContext.Request.Query.TryGetValue("token", out var tokenValues))
-                        {
-                            token = tokenValues[0];
-                        }
-
-                        if (token == null && !String.IsNullOrEmpty(body) && httpContext.Request.Method == "POST")
-                        {
-                            try
-                            {
-                                token = JObject.Parse(body)?.Property("token", StringComparison.OrdinalIgnoreCase)?.Value?.Value<string>();
-                            }
-                            catch { }
-                        }
-
-                        if (token != null)
-                        {
-                            var bitToken = (await _TokenRepository.GetTokens(sin)).FirstOrDefault();
-                            if (bitToken == null)
-                            {
-                                return (null, false);
-                            }
-                            storeId = bitToken.StoreId;
-                        }
-                    }
-                    else
-                    {
-                        return (storeId, false);
-                    }
-                }
-                catch (FormatException) { }
-                return (storeId, true);
-            }
-
-            private async Task<string> CheckLegacyAPIKey(HttpContext httpContext, string auth)
-            {
-                var splitted = auth.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-                if (splitted.Length != 2 || !splitted[0].Equals("Basic", StringComparison.OrdinalIgnoreCase))
-                {
-                    return null;
-                }
-
-                string apiKey = null;
-                try
-                {
-                    apiKey = Encoders.ASCII.EncodeData(Encoders.Base64.DecodeData(splitted[1]));
-                }
-                catch
-                {
-                    return null;
-                }
-                return await _TokenRepository.GetStoreIdFromAPIKey(apiKey);
-            }
-        }
-        public static void AddAuthentication(AuthenticationBuilder builder, Action<BitpayAuthOptions> bitpayAuth = null)
-        {
-            bitpayAuth = bitpayAuth ?? new Action<BitpayAuthOptions>((o) => { });
-            builder.AddScheme<BitpayAuthOptions, BitpayAuthHandler>(Policies.BitpayAuthentication, bitpayAuth);
-        }
-    }
-}

BTCPayServer/Security/BitpayAuthenticationExtensions.cs

@@ -1,15 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Authentication;
-
-namespace BTCPayServer.Security
-{
-    public static class BitpayAuthenticationExtensions
-    {
-        public static AuthenticationBuilder AddBitpayAuthentication(this AuthenticationBuilder builder,
-            Action<BitpayAuthentication.BitpayAuthOptions> bitpayAuth = null)
-        {
-            BitpayAuthentication.AddAuthentication(builder,bitpayAuth);
-            return builder;
-        }
-    }
-} 

BTCPayServer/Services/Apps/AppService.cs

@@ -37,11 +37,9 @@ namespace BTCPayServer.Services.Apps
         CurrencyNameTable _Currencies;
         private readonly StoreRepository _storeRepository;
         private readonly HtmlSanitizer _HtmlSanitizer;
-        private readonly BTCPayNetworkProvider _Networks;
         public CurrencyNameTable Currencies => _Currencies;
         public AppService(ApplicationDbContextFactory contextFactory,
                           InvoiceRepository invoiceRepository,
-                          BTCPayNetworkProvider networks,
                           CurrencyNameTable currencies,
                           StoreRepository storeRepository,
                           HtmlSanitizer htmlSanitizer)
@@ -51,7 +49,6 @@ namespace BTCPayServer.Services.Apps
             _Currencies = currencies;
             _storeRepository = storeRepository;
             _HtmlSanitizer = htmlSanitizer;
-            _Networks = networks;
         }
 
         public async Task<object> GetAppInfo(string appId)
@@ -325,7 +322,7 @@ namespace BTCPayServer.Services.Apps
                                  var paymentMethodContribution = new Contribution();
                                  paymentMethodContribution.PaymentMehtodId = pay.GetPaymentMethodId();
                                  paymentMethodContribution.Value = pay.GetCryptoPaymentData().GetValue() - pay.NetworkFee;
-                                 var rate = p.GetPaymentMethod(paymentMethodContribution.PaymentMehtodId, _Networks).Rate;
+                                 var rate = p.GetPaymentMethod(paymentMethodContribution.PaymentMehtodId).Rate;
                                  paymentMethodContribution.CurrencyValue =  rate * paymentMethodContribution.Value;
                                  return paymentMethodContribution;
                              })

BTCPayServer/Services/Invoices/Export/InvoiceExport.cs

@@ -16,9 +16,8 @@ namespace BTCPayServer.Services.Invoices.Export
         public BTCPayNetworkProvider Networks { get; }
         public CurrencyNameTable Currencies { get; }
 
-        public InvoiceExport(BTCPayNetworkProvider networks, CurrencyNameTable currencies)
+        public InvoiceExport(CurrencyNameTable currencies)
         {
-            Networks = networks;
             Currencies = currencies;
         }
         public string Process(InvoiceEntity[] invoices, string fileFormat)
@@ -68,7 +67,7 @@ namespace BTCPayServer.Services.Invoices.Export
                 var cryptoCode = payment.GetPaymentMethodId().CryptoCode;
                 var pdata = payment.GetCryptoPaymentData();
 
-                var pmethod = invoice.GetPaymentMethod(payment.GetPaymentMethodId(), Networks);
+                var pmethod = invoice.GetPaymentMethod(payment.GetPaymentMethodId());
                 var paidAfterNetworkFees = pdata.GetValue() - payment.NetworkFee;
                 invoiceDue -=  paidAfterNetworkFees * pmethod.Rate;
 
@@ -78,8 +77,8 @@ namespace BTCPayServer.Services.Invoices.Export
                     PaymentId = pdata.GetPaymentId(),
                     CryptoCode = cryptoCode,
                     ConversionRate = pmethod.Rate,
-                    PaymentType = payment.GetPaymentMethodId().ToPrettyPaymentType(),
-                    Destination = payment.GetCryptoPaymentData().GetDestination(Networks.GetNetwork<BTCPayNetworkBase>(cryptoCode)),
+                    PaymentType = payment.GetPaymentMethodId().PaymentType.ToPrettyString(),
+                    Destination = pdata.GetDestination(),
                     Paid = pdata.GetValue().ToString(CultureInfo.InvariantCulture),
                     PaidCurrency = Math.Round(pdata.GetValue() * pmethod.Rate, currency.NumberDecimalDigits).ToString(CultureInfo.InvariantCulture),
                     // Adding NetworkFee because Paid doesn't take into account network fees

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -15,6 +15,7 @@ using NBXplorer.DerivationStrategy;
 using BTCPayServer.Payments;
 using NBitpayClient;
 using BTCPayServer.Payments.Bitcoin;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace BTCPayServer.Services.Invoices
 {
@@ -114,9 +115,6 @@ namespace BTCPayServer.Services.Invoices
     }
     public class InvoiceEntity
     {
-        
-        [JsonIgnore]
-        public PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary { get; set; }
         [JsonIgnore]
         public BTCPayNetworkProvider Networks { get; set; }
         public const int InternalTagSupport_Version = 1;
@@ -222,8 +220,7 @@ namespace BTCPayServer.Services.Invoices
                     {
                         if (network == Networks.BTC && paymentMethodId.PaymentType == PaymentTypes.BTCLike)
                             btcReturned = true;
-                        yield return PaymentMethodHandlerDictionary[paymentMethodId]
-                            .DeserializeSupportedPaymentMethod(paymentMethodId, strat.Value);
+                        yield return paymentMethodId.PaymentType.DeserializeSupportedPaymentMethod(network, strat.Value);
                     }
                 }
             }
@@ -436,15 +433,49 @@ namespace BTCPayServer.Services.Invoices
                         Id = data.GetPaymentId(),
                         Fee = entity.NetworkFee,
                         Value = data.GetValue(),
-                        Completed = data.PaymentCompleted(entity, info.Network),
-                        Confirmed = data.PaymentConfirmed(entity, SpeedPolicy, info.Network),
-                        Destination = data.GetDestination(info.Network),
+                        Completed = data.PaymentCompleted(entity),
+                        Confirmed = data.PaymentConfirmed(entity, SpeedPolicy),
+                        Destination = data.GetDestination(),
                         PaymentType = data.GetPaymentType().ToString(),
                         ReceivedDate = entity.ReceivedTime.DateTime
                     };
                 }).ToList();
                 
-                PaymentMethodHandlerDictionary[paymentId].PrepareInvoiceDto(dto, this, cryptoInfo, accounting, info);
+
+                if (paymentId.PaymentType == PaymentTypes.LightningLike)
+                {
+                    cryptoInfo.PaymentUrls = new InvoicePaymentUrls()
+                    {
+                        BOLT11 = $"lightning:{cryptoInfo.Address}"
+                    };
+                }
+                else if (paymentId.PaymentType == PaymentTypes.BTCLike)
+                {
+                    var scheme = info.Network.UriScheme;
+
+                    var minerInfo = new MinerFeeInfo();
+                    minerInfo.TotalFee = accounting.NetworkFee.Satoshi;
+                    minerInfo.SatoshiPerBytes = ((BitcoinLikeOnChainPaymentMethod)info.GetPaymentMethodDetails()).FeeRate
+                        .GetFee(1).Satoshi;
+                    dto.MinerFees.TryAdd(cryptoInfo.CryptoCode, minerInfo);
+                    cryptoInfo.PaymentUrls = new NBitpayClient.InvoicePaymentUrls()
+                    {
+                        BIP21 = $"{scheme}:{cryptoInfo.Address}?amount={cryptoInfo.Due}",
+                    };
+
+#pragma warning disable 618
+                    if (info.CryptoCode == "BTC")
+                    {
+                        dto.BTCPrice = cryptoInfo.Price;
+                        dto.Rate = cryptoInfo.Rate;
+                        dto.ExRates = cryptoInfo.ExRates;
+                        dto.BitcoinAddress = cryptoInfo.Address;
+                        dto.BTCPaid = cryptoInfo.Paid;
+                        dto.BTCDue = cryptoInfo.Due;
+                        dto.PaymentUrls = cryptoInfo.PaymentUrls;
+                    }
+#pragma warning restore 618
+                }
                 
                 dto.CryptoInfo.Add(cryptoInfo);
                 dto.PaymentCodes.Add(paymentId.ToString(), cryptoInfo.PaymentUrls);
@@ -489,14 +520,14 @@ namespace BTCPayServer.Services.Invoices
             return rates.TryGet(paymentMethodId) != null;
         }
 
-        public PaymentMethod GetPaymentMethod(PaymentMethodId paymentMethodId, BTCPayNetworkProvider networkProvider)
+        public PaymentMethod GetPaymentMethod(PaymentMethodId paymentMethodId)
         {
             GetPaymentMethods().TryGetValue(paymentMethodId, out var data);
             return data;
         }
-        public PaymentMethod GetPaymentMethod(BTCPayNetworkBase network, PaymentTypes paymentType, BTCPayNetworkProvider networkProvider)
+        public PaymentMethod GetPaymentMethod(BTCPayNetworkBase network, PaymentType paymentType)
         {
-            return GetPaymentMethod(new PaymentMethodId(network.CryptoCode, paymentType), networkProvider);
+            return GetPaymentMethod(new PaymentMethodId(network.CryptoCode, paymentType));
         }
 
         public PaymentMethodDictionary GetPaymentMethods()
@@ -513,7 +544,7 @@ namespace BTCPayServer.Services.Invoices
                     r.CryptoCode = paymentMethodId.CryptoCode;
                     r.PaymentType = paymentMethodId.PaymentType.ToString();
                     r.ParentEntity = this;
-                    r.Network = Networks?.GetNetwork<BTCPayNetworkBase>(r.CryptoCode);
+                    r.Network = Networks?.UnfilteredNetworks.GetNetwork<BTCPayNetworkBase>(r.CryptoCode);
                     paymentMethods.Add(r);
                 }
             }
@@ -722,7 +753,7 @@ namespace BTCPayServer.Services.Invoices
         public PaymentMethodId GetId()
         {
 #pragma warning disable CS0618 // Type or member is obsolete
-            return new PaymentMethodId(CryptoCode, string.IsNullOrEmpty(PaymentType) ? PaymentTypes.BTCLike : Enum.Parse<PaymentTypes>(PaymentType));
+            return new PaymentMethodId(CryptoCode, string.IsNullOrEmpty(PaymentType) ? PaymentTypes.BTCLike : PaymentTypes.Parse(PaymentType));
 #pragma warning restore CS0618 // Type or member is obsolete
         }
 
@@ -755,16 +786,7 @@ namespace BTCPayServer.Services.Invoices
             }
             else
             {
-                var paymentType = GetId().PaymentType;
-                IPaymentMethodDetails details = null;
-                if (paymentType == PaymentTypes.BTCLike)
-                {
-                    details = JsonConvert.DeserializeObject<Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod>(PaymentMethodDetails.ToString());
-                }
-                else
-                {
-                    details = JsonConvert.DeserializeObject<Payments.Lightning.LightningLikePaymentMethodDetails>(PaymentMethodDetails.ToString());
-                }
+                IPaymentMethodDetails details = GetId().PaymentType.DeserializePaymentMethodDetails(PaymentMethodDetails.ToString());
                 if (details is Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod btcLike)
                 {
                     btcLike.NextNetworkFee = NextNetworkFee;
@@ -877,8 +899,9 @@ namespace BTCPayServer.Services.Invoices
 
     public class PaymentEntity
     {
+        [NotMapped]
         [JsonIgnore]
-        public PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary { get; set; }
+        public BTCPayNetwork Network { get; set; }
         public int Version { get; set; }
         public DateTimeOffset ReceivedTime
         {
@@ -918,37 +941,33 @@ namespace BTCPayServer.Services.Invoices
 
         public CryptoPaymentData GetCryptoPaymentData()
         {
-            var paymentMethodId = GetPaymentMethodId();
-            if (paymentMethodId.PaymentType == PaymentTypes.LightningLike)
+            CryptoPaymentData paymentData = null;
 #pragma warning disable CS0618 // Type or member is obsolete
-                return JsonConvert.DeserializeObject<Payments.Lightning.LightningLikePaymentData>(CryptoPaymentData);
-#pragma warning restore CS0618 // Type or member is obsolete
+            if (string.IsNullOrEmpty(CryptoPaymentData))
+            {
+                // For invoices created when CryptoPaymentDataType was not existing, we just consider that it is a RBFed payment for safety
+                var bitcoin = new BitcoinLikePaymentData();
+                bitcoin.Network = Network;
+                bitcoin.Outpoint = Outpoint;
+                bitcoin.Output = Output;
+                bitcoin.RBF = true;
+                bitcoin.ConfirmationCount = 0;
+                bitcoin.Legacy = true;
+                bitcoin.Output = Output;
+                bitcoin.Outpoint = Outpoint;
+                paymentData = bitcoin;
+            }
             else
             {
-#pragma warning disable CS0618
-
-                BitcoinLikePaymentData paymentData;
-                if (string.IsNullOrEmpty(CryptoPaymentDataType))
+                paymentData = GetPaymentMethodId().PaymentType.DeserializePaymentData(CryptoPaymentData);
+                paymentData.Network = Network;
+                if (paymentData is BitcoinLikePaymentData bitcoin)
                 {
-                    // For invoices created when CryptoPaymentDataType was not existing, we just consider that it is a RBFed payment for safety
-                    paymentData = new BitcoinLikePaymentData();
-                    paymentData.Outpoint = Outpoint;
-                    paymentData.Output = Output;
-                    paymentData.RBF = true;
-                    paymentData.ConfirmationCount = 0;
-                    paymentData.Legacy = true;
-                    return paymentData;
+                    bitcoin.Output = Output;
+                    bitcoin.Outpoint = Outpoint;
                 }
-
-                paymentData =
-                    JsonConvert.DeserializeObject<BitcoinLikePaymentData>(CryptoPaymentData);
-                // legacy
-                paymentData.Output = Output;
-                paymentData.Outpoint = Outpoint;
-#pragma warning restore CS0618
-                return paymentData;
             }
-
+            return paymentData;
         }
 
         public PaymentEntity SetCryptoPaymentData(CryptoPaymentData cryptoPaymentData)
@@ -985,7 +1004,7 @@ namespace BTCPayServer.Services.Invoices
         public PaymentMethodId GetPaymentMethodId()
         {
 #pragma warning disable CS0618 // Type or member is obsolete
-            return new PaymentMethodId(CryptoCode ?? "BTC", string.IsNullOrEmpty(CryptoPaymentDataType) ? PaymentTypes.BTCLike : Enum.Parse<PaymentTypes>(CryptoPaymentDataType));
+            return new PaymentMethodId(CryptoCode ?? "BTC", string.IsNullOrEmpty(CryptoPaymentDataType) ? PaymentTypes.BTCLike : PaymentTypes.Parse(CryptoPaymentDataType));
 #pragma warning restore CS0618 // Type or member is obsolete
         }
 
@@ -1001,6 +1020,8 @@ namespace BTCPayServer.Services.Invoices
     /// </summary>
     public interface CryptoPaymentData
     {
+        [JsonIgnore]
+        BTCPayNetworkBase Network { get; set; }
         /// <summary>
         /// Returns an identifier which uniquely identify the payment
         /// </summary>
@@ -1017,10 +1038,10 @@ namespace BTCPayServer.Services.Invoices
         /// </summary>
         /// <returns>The amount paid</returns>
         decimal GetValue();
-        bool PaymentCompleted(PaymentEntity entity, BTCPayNetworkBase network);
-        bool PaymentConfirmed(PaymentEntity entity, SpeedPolicy speedPolicy, BTCPayNetworkBase network);
+        bool PaymentCompleted(PaymentEntity entity);
+        bool PaymentConfirmed(PaymentEntity entity, SpeedPolicy speedPolicy);
 
-        PaymentTypes GetPaymentType();
-        string GetDestination(BTCPayNetworkBase network);
+        PaymentType GetPaymentType();
+        string GetDestination();
     }
 }

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -38,11 +38,10 @@ namespace BTCPayServer.Services.Invoices
 
         private ApplicationDbContextFactory _ContextFactory;
         private readonly BTCPayNetworkProvider _Networks;
-        private readonly PaymentMethodHandlerDictionary _paymentMethodHandlerDictionary;
         private CustomThreadPool _IndexerThread;
 
         public InvoiceRepository(ApplicationDbContextFactory contextFactory, string dbreezePath,
-            BTCPayNetworkProvider networks, PaymentMethodHandlerDictionary paymentMethodHandlerDictionary)
+            BTCPayNetworkProvider networks)
         {
             int retryCount = 0;
 retry:
@@ -53,15 +52,13 @@ retry:
             catch when (retryCount++ < 5) { goto retry; }
             _IndexerThread = new CustomThreadPool(1, "Invoice Indexer");
             _ContextFactory = contextFactory;
-            _Networks = networks;
-            _paymentMethodHandlerDictionary = paymentMethodHandlerDictionary;
+            _Networks = networks.UnfilteredNetworks;
         }
 
         public InvoiceEntity CreateNewInvoice()
         {
             return new InvoiceEntity()
             {
-                PaymentMethodHandlerDictionary = _paymentMethodHandlerDictionary,
                 Networks = _Networks,
                 Version = InvoiceEntity.Lastest_Version,
                 InvoiceTime = DateTimeOffset.UtcNow,
@@ -153,7 +150,6 @@ retry:
         {
             List<string> textSearch = new List<string>();
             invoice = ToObject(ToBytes(invoice));
-           invoice.PaymentMethodHandlerDictionary = _paymentMethodHandlerDictionary;
             invoice.Networks = _Networks;
             invoice.Id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(16));
 #pragma warning disable CS0618
@@ -252,7 +248,7 @@ retry:
                     return false;
 
                 var invoiceEntity = ToObject(invoice.Blob);
-                var currencyData = invoiceEntity.GetPaymentMethod(network, paymentMethod.GetPaymentType(), null);
+                var currencyData = invoiceEntity.GetPaymentMethod(network, paymentMethod.GetPaymentType());
                 if (currencyData == null)
                     return false;
 
@@ -445,8 +441,8 @@ retry:
             entity.Payments = invoice.Payments.Select(p =>
             {
                 var paymentEntity = ToObject<PaymentEntity>(p.Blob, null);
+                paymentEntity.Network = _Networks.GetNetwork<BTCPayNetwork>(paymentEntity.CryptoCode);
                 paymentEntity.Accounted = p.Accounted;
-                paymentEntity.PaymentMethodHandlerDictionary = _paymentMethodHandlerDictionary;
                 // PaymentEntity on version 0 does not have their own fee, because it was assumed that the payment method have fixed fee.
                 // We want to hide this legacy detail in InvoiceRepository, so we fetch the fee from the PaymentMethod and assign it to the PaymentEntity.
                 if (paymentEntity.Version == 0)
@@ -651,8 +647,7 @@ retry:
                 if (invoice == null)
                     return null;
                 InvoiceEntity invoiceEntity = ToObject(invoice.Blob);
-                invoiceEntity.PaymentMethodHandlerDictionary = _paymentMethodHandlerDictionary;
-                PaymentMethod paymentMethod = invoiceEntity.GetPaymentMethod(new PaymentMethodId(network.CryptoCode, paymentData.GetPaymentType()), null);
+                PaymentMethod paymentMethod = invoiceEntity.GetPaymentMethod(new PaymentMethodId(network.CryptoCode, paymentData.GetPaymentType()));
                 IPaymentMethodDetails paymentMethodDetails = paymentMethod.GetPaymentMethodDetails();
                 PaymentEntity entity = new PaymentEntity
                 {
@@ -663,7 +658,7 @@ retry:
                     ReceivedTime = date.UtcDateTime,
                     Accounted = accounted,
                     NetworkFee = paymentMethodDetails.GetNextNetworkFee(),
-                    PaymentMethodHandlerDictionary = _paymentMethodHandlerDictionary
+                    Network = network as BTCPayNetwork
                 };
                 entity.SetCryptoPaymentData(paymentData);
 
@@ -720,7 +715,6 @@ retry:
         private InvoiceEntity ToObject(byte[] value)
         {
             var entity = NBitcoin.JsonConverters.Serializer.ToObject<InvoiceEntity>(ZipUtils.Unzip(value), null);
-            entity.PaymentMethodHandlerDictionary = _paymentMethodHandlerDictionary;
             entity.Networks = _Networks;
             return entity;
         }

BTCPayServer/Services/Invoices/PaymentMethodDictionary.cs

@@ -62,7 +62,7 @@ namespace BTCPayServer.Services.Invoices
             _Inner.TryGetValue(paymentMethodId, out var value);
             return value;
         }
-        public PaymentMethod TryGet(string network, PaymentTypes paymentType)
+        public PaymentMethod TryGet(string network, PaymentType paymentType)
         {
             if (network == null)
                 throw new ArgumentNullException(nameof(network));

BTCPayServer/Services/Invoices/PaymentMethodHandlerDictionary.cs

@@ -21,6 +21,7 @@ namespace BTCPayServer.Services.Invoices
         }
 
         public IPaymentMethodHandler this[PaymentMethodId index] => _mappedHandlers[index];
+        public bool Support(PaymentMethodId paymentMethod) => _mappedHandlers.ContainsKey(paymentMethod);
         public IEnumerator<IPaymentMethodHandler> GetEnumerator()
         {
             return _mappedHandlers.Values.GetEnumerator();

BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs

@@ -61,11 +61,6 @@ namespace BTCPayServer.Services.PaymentRequests
                         string.IsNullOrEmpty(userId) ||
                         (data.StoreData != null && data.StoreData.UserStores.Any(u => u.ApplicationUserId == userId)))
                     .SingleOrDefaultAsync(x => x.Id == id, cancellationToken);
-                if (result != null)
-                {
-                    result.StoreData = _storeRepository.PrepareEntity(result.StoreData);
-                }
-
                 return result;
             }
         }

BTCPayServer/Services/Rates/CurrencyNameTable.cs

@@ -99,7 +99,7 @@ namespace BTCPayServer.Services.Rates
                         AddCurrency(_CurrencyProviders, network.CryptoCode, 8, network.CryptoCode);
                     }
                 }
-                return _CurrencyProviders.TryGet(currency);
+                return _CurrencyProviders.TryGet(currency.ToUpperInvariant());
             }
         }
 

BTCPayServer/Services/Stores/StoreRepository.cs

@@ -14,12 +14,10 @@ namespace BTCPayServer.Services.Stores
     public class StoreRepository
     {
         private ApplicationDbContextFactory _ContextFactory;
-        private readonly PaymentMethodHandlerDictionary _paymentMethodHandlerDictionary;
 
-        public StoreRepository(ApplicationDbContextFactory contextFactory, PaymentMethodHandlerDictionary paymentMethodHandlerDictionary)
+        public StoreRepository(ApplicationDbContextFactory contextFactory)
         {
             _ContextFactory = contextFactory ?? throw new ArgumentNullException(nameof(contextFactory));
-            _paymentMethodHandlerDictionary = paymentMethodHandlerDictionary;
         }
 
         public async Task<StoreData> FindStore(string storeId)
@@ -29,7 +27,7 @@ namespace BTCPayServer.Services.Stores
             using (var ctx = _ContextFactory.CreateContext())
             {
                 var result =  await ctx.FindAsync<StoreData>(storeId).ConfigureAwait(false);
-                return PrepareEntity(result);
+                return result;
             }
         }
 
@@ -52,7 +50,7 @@ namespace BTCPayServer.Services.Stores
 #pragma warning disable CS0612 // Type or member is obsolete
                         us.Store.Role = us.Role;
 #pragma warning restore CS0612 // Type or member is obsolete
-                        return PrepareEntity(us.Store);
+                        return us.Store;
                     }).FirstOrDefault();
             }
         }
@@ -94,7 +92,7 @@ namespace BTCPayServer.Services.Stores
 #pragma warning disable CS0612 // Type or member is obsolete
                         u.StoreData.Role = u.Role;
 #pragma warning restore CS0612 // Type or member is obsolete
-                        return PrepareEntity(u.StoreData);
+                        return u.StoreData;
                     }).ToArray();
             }
         }
@@ -186,7 +184,7 @@ namespace BTCPayServer.Services.Stores
                 ctx.Add(store);
                 ctx.Add(userStore);
                 await ctx.SaveChangesAsync().ConfigureAwait(false);
-                return PrepareEntity(store);
+                return store;
             }
         }
 
@@ -235,12 +233,5 @@ namespace BTCPayServer.Services.Stores
                 return ctx.Database.SupportDropForeignKey();
             }
         }
-
-        public StoreData PrepareEntity(StoreData storeData)
-        {
-            if(storeData != null)
-                storeData.PaymentMethodHandlerDictionary = _paymentMethodHandlerDictionary;
-            return storeData;
-        }
     }
 }

BTCPayServer/Views/Account/ForgotPassword.cshtml

@@ -5,11 +5,14 @@
 
 <section>
     <div class="container">
+        @if (TempData.ContainsKey("StatusMessage"))
+        {
         <div class="row">
             <div class="col-lg-12 text-center">
                 <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
             </div>
         </div>
+        }
         <div class="row">
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading">@ViewData["Title"]</h2>

BTCPayServer/Views/Account/ResetPassword.cshtml

@@ -5,11 +5,14 @@
 
 <section>
     <div class="container">
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
+        @if (TempData.ContainsKey("StatusMessage"))
+        {
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
+                </div>
             </div>
-        </div>
+        }
         <div class="row">
             <div class="col-md-4">
                 <form method="post">

BTCPayServer/Views/Apps/ListApps.cshtml

@@ -3,16 +3,16 @@
 @{
     ViewData["Title"] = "Apps";
 }
-
 <section>
     <div class="container">
-
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+        @if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
+        {
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+                </div>
             </div>
-        </div>
-
+        }
         <div class="row">
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading">@ViewData["Title"]</h2>

BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml

@@ -30,11 +30,14 @@
                 <hr class="primary">
             </div>
         </div>
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+        @if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
+        {
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+                </div>
             </div>
-        </div>
+        }
         <div class="row">
             <div class="col-lg-12">
                 <form method="post">
@@ -44,7 +47,6 @@
                         <input asp-for="Title" class="form-control" />
                         <span asp-validation-for="Title" class="text-danger"></span>
                     </div>
-
                     <div class="form-group">
                         <label asp-for="Tagline" class="control-label"></label>
                         <input asp-for="Tagline" class="form-control" />
@@ -82,7 +84,6 @@
                     <div class="form-group">
                         <label asp-for="ResetEvery" class="control-label"></label>
                         <div class="input-group">
-
                             <input type="number" asp-for="ResetEveryAmount" placeholder="Amount" class="form-control">
                             <select class="custom-select" asp-for="ResetEvery">
                                 @foreach (var opt in Model.ResetEveryValues)
@@ -142,7 +143,6 @@
                         <span asp-validation-for="NotificationUrl" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-
                         <label asp-for="NotificationEmail" class="control-label"></label>
                         @if (Model.NotificationEmailWarning)
                         {
@@ -181,7 +181,6 @@
                         <input asp-for="SoundsEnabled" type="checkbox" class="form-check" />
                         <span asp-validation-for="SoundsEnabled" class="text-danger"></span>
                     </div>
-
                     <div class="form-group">
                         <label asp-for="Sounds"></label>
                         <textarea asp-for="Sounds" class="form-control"></textarea>
@@ -192,7 +191,6 @@
                         <input asp-for="AnimationsEnabled" type="checkbox" class="form-check" />
                         <span asp-validation-for="AnimationsEnabled" class="text-danger"></span>
                     </div>
-
                     <div class="form-group">
                         <label asp-for="AnimationColors"></label>
                         <textarea asp-for="AnimationColors" class="form-control"></textarea>
@@ -208,7 +206,6 @@
                         <input asp-for="DisqusShortname" class="form-control" />
                         <span asp-validation-for="DisqusShortname" class="text-danger"></span>
                     </div>
-
                     <input type="hidden" asp-for="NotificationEmailWarning" />
                     <div class="form-group">
                         <input type="submit" class="btn btn-primary" value="Save Settings" id="SaveSettings" />
@@ -216,19 +213,15 @@
                         <a class="btn btn-secondary" target="_blank" asp-action="ViewCrowdfund" asp-controller="AppsPublic" asp-route-appId="@Model.AppId" id="ViewApp">View App</a>
                         <a class="btn btn-secondary" target="_blank" asp-action="ListApps">Back to the app list</a>
                     </div>
-
                 </form>
             </div>
         </div>
     </div>
 </section>
-
 @section Scripts {
-
     <script src="~/vendor/moment/moment.js"></script>
     <bundle name="wwwroot/bundles/crowdfund-admin-bundle.min.js"></bundle>
     <bundle name="wwwroot/bundles/crowdfund-admin-bundle.min.css"></bundle>
-
     <script id="template-product-item" type="text/template">
         <div class="col-sm-4 col-md-3 mb-3">
             <div class="card">
@@ -241,7 +234,6 @@
             </div>
         </div>
     </script>
-
     <script id="template-product-content" type="text/template">
         <div class="mb-3">
             <input class="js-product-id" type="hidden" name="id" value="{id}">
@@ -277,4 +269,3 @@
         </div>
     </script>
 }
-

BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml

@@ -22,7 +22,6 @@
             </div>
         </div>
     </div>
-
     <div class="container">
         <div class="row">
             <div class="col-lg-12 text-center">
@@ -30,11 +29,14 @@
                 <hr class="primary">
             </div>
         </div>
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+        @if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
+        {
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+                </div>
             </div>
-        </div>
+        }
         <div class="row">
             <div class="col-lg-12">
                 <form method="post">
@@ -141,7 +143,6 @@
                                         </button>
                                     </h2>
                                 </div>
-
                                 <div id="accordian-dev-info-embed-payment-button" class="collapse" aria-labelledby="accordian-dev-info-embed-payment-button-header" data-parent="#accordian-dev-info">
                                     <div class="card-body">
                                         <p>You can host point of sale buttons in an external website with the following code.</p>
@@ -201,22 +202,18 @@
                                 </div>
                             </div>
                         </div>
-
                     </div>
                 </form>
                 <a asp-action="ListApps">Back to the app list</a>
 
-
             </div>
         </div>
     </div>
 </section>
-
 @section Scripts {
     <link rel="stylesheet" href="~/vendor/highlightjs/default.min.css">
     <script src="~/vendor/highlightjs/highlight.min.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-
     <script id="template-product-item" type="text/template">
         <div class="col-sm-4 col-md-3 mb-3">
             <div class="card">
@@ -229,7 +226,6 @@
             </div>
         </div>
     </script>
-
     <script id="template-product-content" type="text/template">
         <div class="mb-3">
             <input class="js-product-id" type="hidden" name="id" value="{id}">
@@ -264,8 +260,6 @@
             </div>
         </div>
     </script>
-
     <script src="~/products/js/products.js"></script>
     <script src="~/products/js/products.jquery.js"></script>
 }
-

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -5,8 +5,8 @@
 @section HeaderContent{
     <META NAME="robots" CONTENT="noindex,nofollow">
 }
-
 <style type="text/css">
+
     .linethrough {
         text-decoration: line-through;
     }
@@ -15,15 +15,16 @@
         width: 140px;
     }
 </style>
-
 <section>
     <div class="container">
-
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="StatusMessage" />
+        @if (!string.IsNullOrEmpty(Model.StatusMessage))
+        {
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <partial name="_StatusMessage" for="StatusMessage" />
+                </div>
             </div>
-        </div>
+        }
 
         <div class="row">
             <div class="col-lg-12 text-center">
@@ -90,7 +91,6 @@
                     </tr>
                 </table>
             </div>
-
             <div class="col-md-6">
                 <h3>Buyer information</h3>
                 <table class="table table-sm table-responsive-md removetopborder">

BTCPayServer/Views/Invoice/ListInvoices.cshtml

@@ -2,20 +2,20 @@
 @{
     ViewData["Title"] = "Invoices";
 }
-
 @section HeadScripts {
     <script src="~/modal/btcpay.js"></script>
 }
-
-@Html.HiddenFor(a=>a.Count)
+@Html.HiddenFor(a => a.Count)
 <section>
     <div class="container">
-
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="StatusMessage" />
+        @if (!string.IsNullOrEmpty(Model.StatusMessage))
+        {
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <partial name="_StatusMessage" for="StatusMessage" />
+                </div>
             </div>
-        </div>
+        }
 
         <div class="row">
             <div class="col-lg-12 text-center">
@@ -48,7 +48,6 @@
         <div class="row no-gutter" style="margin-bottom: 5px;">
             <div class="col-lg-6">
                 <a asp-action="CreateInvoice" class="btn btn-primary" role="button" id="CreateNewInvoice"><span class="fa fa-plus"></span> Create a new invoice</a>
-
                 <a class="btn btn-primary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     Export
                 </a>
@@ -60,7 +59,6 @@
                     <a asp-action="Export" asp-route-timezoneoffset="0" asp-route-format="json" asp-route-searchTerm="@Model.SearchTerm" class="dropdown-item export-link" target="_blank">JSON</a>
                 </div>
             </div>
-
             <div class="col-lg-6">
                 <div class="form-group">
                     <form asp-action="ListInvoices" method="get" style="float:right;">
@@ -274,7 +272,6 @@
                     }
                 </tbody>
             </table>
-
             <nav aria-label="..." class="w-100">
                 <ul class="pagination float-left">
                     <li class="page-item @(Model.Skip == 0 ? "disabled" : null)">
@@ -287,7 +284,6 @@
                         <a class="page-link" href="@listInvoices(1, Model.Count)">&raquo;</a>
                     </li>
                 </ul>
-
                 <ul class="pagination float-right">
                     <li class="page-item disabled">
                         <span class="page-link">Page Size:</span>
@@ -328,7 +324,6 @@
         </div>
 
     </div>
-
     <script type="text/javascript">
         $(function () {
             var timezoneOffset = new Date().getTimezoneOffset();
@@ -378,8 +373,8 @@
                 });
         }
     </script>
-
     <style type="text/css">
+
         .invoice-payments h3 {
             font-size: 15px;
             font-weight: bold;

BTCPayServer/Views/Manage/ChangePassword.cshtml

@@ -3,7 +3,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.ChangePassword, "Change password");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="StatusMessage" />
 <div class="row">
     <div class="col-md-6">

BTCPayServer/Views/Manage/EnableAuthenticator.cshtml

@@ -3,7 +3,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.TwoFactorAuthentication, "Enable authenticator");
 }
 
-<h4>@ViewData["Title"]</h4>
 <div>
     <p>To use an authenticator app go through the following steps:</p>
     <ol class="list">

BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml

@@ -3,7 +3,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.TwoFactorAuthentication, "Recovery codes");
 }
 
-<h4>@ViewData["Title"]</h4>
 <div class="alert alert-warning" role="alert">
     <p>
         <span class="fa fa-warning"></span>

BTCPayServer/Views/Manage/Index.cshtml

@@ -3,7 +3,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.Index, "Profile");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="StatusMessage" />
 
 <div class="row">

BTCPayServer/Views/Manage/ResetAuthenticator.cshtml

@@ -2,7 +2,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.TwoFactorAuthentication, "Reset authenticator key");
 }
 
-<h4>@ViewData["Title"]</h4>
 <div class="alert alert-warning" role="alert">
     <p>
         <span class="fa fa-warning"></span>

BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml

@@ -3,7 +3,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.TwoFactorAuthentication, "Two-factor authentication");
 }
 
-<h4>@ViewData["Title"]</h4>
 @if(Model.Is2faEnabled)
 {
     if(Model.RecoveryCodesLeft == 0)

BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml

@@ -2,7 +2,6 @@
 @using System.Globalization
 @model BTCPayServer.Models.PaymentRequestViewModels.UpdatePaymentRequestViewModel
 @addTagHelper *, BundlerMinifier.TagHelpers
-
 <section>
     <div class="container">
         <div class="row">
@@ -11,40 +10,40 @@
                 <hr class="primary">
             </div>
         </div>
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="StatusMessage"/>
+        @if (!string.IsNullOrEmpty(Model.StatusMessage))
+        {
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <partial name="_StatusMessage" for="StatusMessage" />
+                </div>
             </div>
-        </div>
+        }
         <div class="row">
             <div class="col-lg-12">
                 <form method="post" action="@Url.Action("EditPaymentRequest", "PaymentRequest", new { id = Model.Id}, Context.Request.Scheme)">
-                    <input type="hidden" name="Id" value="@Model.Id"/>
+                    <input type="hidden" name="Id" value="@Model.Id" />
                     <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                     <div class="form-group">
                         <label asp-for="Title" class="control-label"></label>*
-                        <input asp-for="Title" class="form-control"/>
+                        <input asp-for="Title" class="form-control" />
                         <span asp-validation-for="Title" class="text-danger"></span>
                     </div>
-
                     <div class="form-group">
                         <label asp-for="Amount" class="control-label"></label>*
-                        <input type="number" step="any" asp-for="Amount" class="form-control"/>
+                        <input type="number" step="any" asp-for="Amount" class="form-control" />
                         <span asp-validation-for="Amount" class="text-danger"></span>
                     </div>
-
                     <div class="form-group">
                         <label asp-for="Currency" class="control-label"></label>*
-                        <input  asp-for="Currency" class="form-control"/>
+                        <input asp-for="Currency" class="form-control" />
                         <span asp-validation-for="Currency" class="text-danger"></span>
                     </div>
                     <div class="form-group">
                         <label asp-for="AllowCustomPaymentAmounts"></label>
-                        <input asp-for="AllowCustomPaymentAmounts" type="checkbox" class="form-check"/>
+                        <input asp-for="AllowCustomPaymentAmounts" type="checkbox" class="form-check" />
                         <span asp-validation-for="AllowCustomPaymentAmounts" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-
                         <label asp-for="StoreId" class="control-label"></label>
                         @if (string.IsNullOrEmpty(Model.Id))
                         {
@@ -52,12 +51,10 @@
                         }
                         else
                         {
-                            <input type="hidden" asp-for="StoreId" value="@Model.StoreId"/>
-                            <input type="text" class="form-control" value="@Model.Stores.Single(item => item.Value == Model.StoreId).Text" readonly/>
+                            <input type="hidden" asp-for="StoreId" value="@Model.StoreId" />
+                            <input type="text" class="form-control" value="@Model.Stores.Single(item => item.Value == Model.StoreId).Text" readonly />
                         }
-
                         <span asp-validation-for="StoreId" class="text-danger"></span>
-
                     </div>
                     <div class="form-group">
                         <label asp-for="Email" class="control-label"></label>
@@ -67,12 +64,10 @@
                     <div class="form-group">
                         <label asp-for="ExpiryDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="ExpiryDate" 
-                                   
+                            <input asp-for="ExpiryDate"
                                    value="@( Model.ExpiryDate?.ToString("u", CultureInfo.InvariantCulture))"
-                                   class="form-control flatdtpicker" min="today" placeholder="No expiry date has been set for this payment request"/>
+                                   class="form-control flatdtpicker" min="today" placeholder="No expiry date has been set for this payment request" />
                             <div class="input-group-append">
-
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
                                 </button>
@@ -90,7 +85,7 @@
                         <a href="https://docs.btcpayserver.org/development/theme#bootstrap-themes" target="_blank">
                             <span class="fa fa-question-circle-o" title="More information..."></span>
                         </a>
-                        <input asp-for="CustomCSSLink" class="form-control"/>
+                        <input asp-for="CustomCSSLink" class="form-control" />
                         <span asp-validation-for="CustomCSSLink" class="text-danger"></span>
                     </div>
                     <div class="form-group">
@@ -98,18 +93,17 @@
                         <textarea asp-for="EmbeddedCSS" rows="10" cols="40" class="form-control"></textarea>
                         <span asp-validation-for="EmbeddedCSS" class="text-danger"></span>
                     </div>
-
                     <div class="form-group">
                         <button type="submit" class="btn btn-primary" id="SaveButton">Save</button>
                         @if (!string.IsNullOrEmpty(Model.Id))
                         {
                             <a class="btn btn-secondary" target="_blank" asp-action="ViewPaymentRequest" id="@Model.Id" name="ViewAppButton">View</a>
-                            <a class="btn btn-secondary" 
+                            <a class="btn btn-secondary"
                                target="_blank"
                                asp-action="ListInvoices"
-                               asp-controller="Invoice" 
+                               asp-controller="Invoice"
                                asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(Model.Id)}")">Invoices</a>
-                            <a class="btn btn-secondary" asp-action="ClonePaymentRequest" id="@Model.Id">Clone</a>                                                                              
+                            <a class="btn btn-secondary" asp-action="ClonePaymentRequest" id="@Model.Id">Clone</a>
                         }
                         <a class="btn btn-secondary" target="_blank" asp-action="GetPaymentRequests">Back to list</a>
                     </div>
@@ -118,9 +112,8 @@
         </div>
     </div>
 </section>
-
 @section Scripts {
-    <script src= "~/vendor/moment/moment.js"></script>
+    <script src="~/vendor/moment/moment.js"></script>
     <bundle name="wwwroot/bundles/payment-request-admin-bundle.min.js"></bundle>
     <bundle name="wwwroot/bundles/payment-request-admin-bundle.min.css"></bundle>
 }

BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml

@@ -1,69 +1,66 @@
 @using BTCPayServer.Services.PaymentRequests
 @model BTCPayServer.Models.PaymentRequestViewModels.ListPaymentRequestsViewModel
-
 @{
     Layout = "_Layout";
 }
-
 <section>
     <div class="container">
-
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="StatusMessage"/>
+        @if (!string.IsNullOrEmpty(Model.StatusMessage))
+        {
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <partial name="_StatusMessage" for="StatusMessage" />
+                </div>
             </div>
-        </div>
-
+        }
         <div class="row">
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading">Payment Requests</h2>
             </div>
         </div>
-
         <div class="row no-gutter" style="margin-bottom: 5px;">
             <div class="col-lg-6">
                 <a asp-action="EditPaymentRequest" class="btn btn-primary" role="button" id="CreatePaymentRequest"><span class="fa fa-plus"></span> Create a new payment request</a>
                 <a href="https://docs.btcpayserver.org/features/paymentrequests" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
             </div>
         </div>
-
         <div class="row">
             <table class="table table-sm table-responsive-md">
                 <thead>
-                <tr>
-                    <th>Title</th>
-                    <th>Expiry</th>
-                    <th class="text-right">Price</th>
-                    <th class="text-right">Status</th>
-                    <th class="text-right">Actions</th>
-                </tr>
+                    <tr>
+                        <th>Title</th>
+                        <th>Expiry</th>
+                        <th class="text-right">Price</th>
+                        <th class="text-right">Status</th>
+                        <th class="text-right">Actions</th>
+                    </tr>
                 </thead>
                 <tbody>
-                @foreach (var item in Model.Items)
-                {
-                    <tr>
-                        <td>@item.Title</td>
-                        <td>@(item.ExpiryDate?.ToString("g") ?? "No Expiry")</td>
-                        <td class="text-right">@item.Amount @item.Currency</td>
-                        <td class="text-right">@item.Status</td>
-                        <td class="text-right">
-                            <a asp-action="EditPaymentRequest" asp-route-id="@item.Id">Edit</a>
-                            <span> - </span>
-                            <a asp-action="ViewPaymentRequest" asp-route-id="@item.Id">View</a>
-                            <span> - </span>
-                            <a target="_blank" asp-action="ListInvoices" asp-controller="Invoice" asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(item.Id)}")">Invoices</a>
-                            <span> - </span>
-                            <a target="_blank" asp-action="PayPaymentRequest" asp-route-id="@item.Id">Pay</a>
-                            <span> - </span>
-                            <a target="_blank" asp-action="ClonePaymentRequest" asp-route-id="@item.Id">Clone</a>
-                            <span> - </span>
-                            <a asp-action="RemovePaymentRequestPrompt" asp-route-id="@item.Id">Remove</a>
-                        </td>
-                    </tr>
-                }
+                    @foreach (var item in Model.Items)
+                    {
+                        <tr>
+                            <td>@item.Title</td>
+                            <td>@(item.ExpiryDate?.ToString("g") ?? "No Expiry")</td>
+                            <td class="text-right">@item.Amount @item.Currency</td>
+                            <td class="text-right">@item.Status</td>
+                            <td class="text-right">
+                                <a asp-action="EditPaymentRequest" asp-route-id="@item.Id">Edit</a>
+                                <span> - </span>
+                                <a asp-action="ViewPaymentRequest" asp-route-id="@item.Id">View</a>
+                                <span> - </span>
+                                <a target="_blank" asp-action="ListInvoices" asp-controller="Invoice" asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(item.Id)}")">Invoices</a>
+                                <span> - </span>
+                                <a target="_blank" asp-action="PayPaymentRequest" asp-route-id="@item.Id">Pay</a>
+                                <span> - </span>
+                                <a target="_blank" asp-action="ClonePaymentRequest" asp-route-id="@item.Id">Clone</a>
+                                <span> - </span>
+                                <a asp-action="RemovePaymentRequestPrompt" asp-route-id="@item.Id">Remove</a>
+                            </td>
+                        </tr>
+                    }
                 </tbody>
             </table>
-            
+
             <nav aria-label="...">
                 <ul class="pagination">
                     <li class="page-item  @(Model.Skip == 0 ? "disabled" : null)">
@@ -86,6 +83,5 @@
                 </ul>
             </nav>
         </div>
-
     </div>
 </section>

BTCPayServer/Views/Server/CreateTemporaryFileUrl.cshtml

@@ -6,7 +6,6 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]"/>
 <div class="row">
     <div class="col-lg-6">

BTCPayServer/Views/Server/EditAmazonS3StorageProvider.cshtml

@@ -4,7 +4,6 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
 <div class="row">
     <div class="col-lg-6">

BTCPayServer/Views/Server/EditAzureBlobStorageStorageProvider.cshtml

@@ -4,7 +4,6 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
 <div class="row">
     <div class="col-lg-6">

BTCPayServer/Views/Server/EditFilesystemStorageProvider.cshtml

@@ -3,7 +3,6 @@
     ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Storage - Local Filesystem");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
 <div class="row">
     <div class="col-lg-6">

BTCPayServer/Views/Server/EditGoogleCloudStorageStorageProvider.cshtml

@@ -3,7 +3,6 @@
     ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Storage - Google Cloud Storage");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
 <div class="row">
     <div class="col-lg-6">

BTCPayServer/Views/Server/Files.cshtml

@@ -4,7 +4,6 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]"/>
 
 

BTCPayServer/Views/Server/ListUsers.cshtml

@@ -7,7 +7,7 @@
 
 <div class="row">
     <div class="col">
-        <h4>@ViewData["Title"]</h4>
+
     </div>
     <div class="col text-right">
         <a 

BTCPayServer/Views/Server/Logs.cshtml

@@ -3,7 +3,6 @@
     ViewData.SetActivePageAndTitle(ServerNavPages.Logs);
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="StatusMessage"/>
 
 <div class="row">

BTCPayServer/Views/Server/Maintenance.cshtml

@@ -4,7 +4,6 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
 
 <div class="row">

BTCPayServer/Views/Server/Policies.cshtml

@@ -4,13 +4,15 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
+@if (!this.ViewContext.ModelState.IsValid)
+{
 <div class="row">
     <div class="col-lg-6">
         <div asp-validation-summary="All" class="text-danger"></div>
     </div>
 </div>
+}
 <div class="row">
     <div class="col-lg-6">
         <form method="post">

BTCPayServer/Views/Server/Rates.cshtml

@@ -4,7 +4,6 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
 
 

BTCPayServer/Views/Server/Services.cshtml

@@ -4,7 +4,6 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]"/>
 <div class="row">
     <div class="col-md-6">

BTCPayServer/Views/Server/Storage.cshtml

@@ -5,7 +5,6 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]"/>
 @if (Model.ShowChangeWarning)
 {

BTCPayServer/Views/Server/Theme.cshtml

@@ -4,7 +4,6 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
 <div class="row">
     <div class="col-lg-6">

BTCPayServer/Views/Shared/EmailsBody.cshtml

@@ -1,7 +1,6 @@
 @model BTCPayServer.Models.ServerViewModels.EmailsViewModel
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="StatusMessage" />
 
 <div class="row">

BTCPayServer/Views/Shared/_NavLayout.cshtml

@@ -7,7 +7,7 @@ ViewBag.ShowMenu = ViewBag.ShowMenu ?? true;
     <div class="container">
         <div class="row">
             <div class="col-lg-12">
-                <h2 class="section-heading">@ViewData["MainTitle"]</h2>
+                <h4 class="section-heading">@ViewData["MainTitle"]: @ViewData["Title"]</h4>
                 <hr class="primary ml-0">
             </div>
         </div>
@@ -33,4 +33,4 @@ ViewBag.ShowMenu = ViewBag.ShowMenu ?? true;
 
 @section Scripts {
 @RenderSection("Scripts", required: false)
-}
+}

BTCPayServer/Views/Stores/AddDerivationScheme.cshtml

@@ -13,7 +13,6 @@
 }
 
 <partial name="_StatusMessage" for="StatusMessage" />
-<h4>@ViewData["Title"]</h4>
 <div class="row">
     <div class="col-md-6">
         <div asp-validation-summary="All" class="text-danger"></div>

BTCPayServer/Views/Stores/AddLightningNode.cshtml

@@ -4,7 +4,6 @@
     ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Add lightning node (Experimental)");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="StatusMessage" />
 
 <div class="alert alert-warning alert-dismissible" role="alert">

BTCPayServer/Views/Stores/CheckoutExperience.cshtml

@@ -4,7 +4,6 @@
     ViewData.SetActivePageAndTitle(StoreNavPages.Checkout, "Checkout experience");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
 
 <div class="row">
@@ -17,11 +16,13 @@
         <form method="post">
             <div class="form-group">
                 <label asp-for="CustomLogo"></label>
+                <a href="https://docs.btcpayserver.org/development/theme#checkout-page-theme" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
                 <input asp-for="CustomLogo" class="form-control" />
                 <span asp-validation-for="CustomLogo" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="CustomCSS"></label>
+                <a href="https://docs.btcpayserver.org/development/theme#checkout-page-theme" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
                 <input asp-for="CustomCSS" class="form-control" />
                 <span asp-validation-for="CustomCSS" class="text-danger"></span>
             </div>

BTCPayServer/Views/Stores/CreateToken.cshtml

@@ -6,7 +6,6 @@
     ViewBag.ShowStores = ViewBag.ShowStores ?? false;
 }
 
-<h4>@ViewData["Title"]</h4>
 
 <div class="row">
     <div class="col-md-6">

BTCPayServer/Views/Stores/PayButtonEnable.cshtml

@@ -4,7 +4,6 @@
     ViewBag.MainTitle = "Pay Button";
 }
 
-<h4>@ViewData["Title"]</h4>
 
 <div class="row">
     <div class="col-md-10">

BTCPayServer/Views/Stores/Rates.cshtml

@@ -4,7 +4,6 @@
     ViewData.SetActivePageAndTitle(StoreNavPages.Rates, "Rates");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
 
 <div class="row">

BTCPayServer/Views/Stores/StoreUsers.cshtml

@@ -4,7 +4,6 @@
     ViewData.SetActivePageAndTitle(StoreNavPages.Users, "Manage users");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
 
 <div class="row">

BTCPayServer/Views/Stores/UpdateChangellySettings.cshtml

@@ -5,7 +5,6 @@
     ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Update Store Changelly Settings");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="StatusMessage"/>
 
 <div class="row">

BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml

@@ -5,7 +5,6 @@
     ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Update Store CoinSwitch Settings");
 }
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="StatusMessage"/>
 
 <div class="row">

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -17,7 +17,6 @@
 </style>
 
 
-<h4>@ViewData["Title"]</h4>
 <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
 
 <div class="row">

BTCPayServer/Views/UserStores/ListStores.cshtml

@@ -5,13 +5,14 @@
 
 <section>
     <div class="container">
-
+        @if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
+        {
         <div class="row">
             <div class="col-lg-12 text-center">
                 <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
             </div>
         </div>
-
+        }
         <div class="row">
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading">@ViewData["Title"]</h2>

BTCPayServer/Views/Wallets/ListWallets.cshtml

@@ -5,12 +5,14 @@
 
 <section>
     <div class="container">
-
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+        @if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
+        {
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+                </div>
             </div>
-        </div>
+        }
 
         <div class="row">
             <div class="col-lg-12 text-center">
@@ -31,23 +33,23 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach(var wallet in Model.Wallets)
+                    @foreach (var wallet in Model.Wallets)
                     {
-                    <tr>
-                        @if(wallet.IsOwner)
-                        {
-                            <td><a asp-action="UpdateStore" asp-controller="Stores" asp-route-storeId="@wallet.StoreId">@wallet.StoreName</a></td>
-                        }
-                        else
-                        {
-                            <td>@wallet.StoreName</td>
-                        }
-                        <td>@wallet.CryptoCode</td>
-                        <td>@wallet.Balance</td>
-                        <td style="text-align:right">
-                            <a asp-action="WalletTransactions" asp-route-walletId="@wallet.Id">Manage</a>
-                        </td>
-                    </tr>
+                        <tr>
+                            @if (wallet.IsOwner)
+                            {
+                                <td><a asp-action="UpdateStore" asp-controller="Stores" asp-route-storeId="@wallet.StoreId">@wallet.StoreName</a></td>
+                            }
+                            else
+                            {
+                                <td>@wallet.StoreName</td>
+                            }
+                            <td>@wallet.CryptoCode</td>
+                            <td>@wallet.Balance</td>
+                            <td style="text-align:right">
+                                <a asp-action="WalletTransactions" asp-route-walletId="@wallet.Id">Manage</a>
+                            </td>
+                        </tr>
                     }
                 </tbody>
             </table>

BTCPayServer/Views/Wallets/WalletPSBT.cshtml

@@ -4,12 +4,14 @@
     ViewData["Title"] = "PSBT";
     ViewData.SetActivePageAndTitle(WalletsNavPages.PSBT);
 }
-
-<div class="row">
-    <div class="col-md-10 text-center">
-        <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+@if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
+{
+    <div class="row">
+        <div class="col-md-10 text-center">
+            <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+        </div>
     </div>
-</div>
+}
 <div class="row">
     <div class="col-md-10">
         @if (Model.Errors != null && Model.Errors.Count != 0)

BTCPayServer/Views/Wallets/WalletRescan.cshtml

@@ -5,7 +5,6 @@
     ViewData.SetActivePageAndTitle(WalletsNavPages.Rescan);
 }
 
-<h4>@ViewData["Title"]</h4>
 
 @if (!Model.Ok)
 {

BTCPayServer/Views/Wallets/WalletSend.cshtml

@@ -6,8 +6,6 @@
     ViewData.SetActivePageAndTitle(WalletsNavPages.Send);
 }
 
-<h4>@ViewData["Title"]</h4>
-
 <div class="row no-gutters">
     <div class="@(Model.Outputs.Count==1? "col-lg-6 transaction-output-form": "col-lg-8")">
         <form method="post">

BTCPayServer/Views/Wallets/WalletSettings.cshtml

@@ -4,14 +4,15 @@
     ViewData["Title"] = "Wallet settings";
     ViewData.SetActivePageAndTitle(WalletsNavPages.Settings);
 }
-
-<div class="row">
-    <div class="col-md-10 text-center">
-        <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+@if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
+{
+    <div class="row">
+        <div class="col-md-10 text-center">
+            <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+        </div>
     </div>
-</div>
+}
 
-<h4>@ViewData["Title"]</h4>
 <div class="row">
     <div class="col-md-10">
         <p>
@@ -40,7 +41,6 @@
                     <span asp-validation-for="DerivationSchemeInput" class="text-danger"></span>
                 </div>
             }
-
             @for (int i = 0; i < Model.AccountKeys.Count; i++)
             {
                 <hr />
@@ -68,7 +68,6 @@
                     </div>
                 }
             }
-
             <div class="form-group">
                 <button name="command" type="submit" class="btn btn-primary">Save</button>
             </div>

BTCPayServer/Views/Wallets/WalletTransactions.cshtml

@@ -4,8 +4,8 @@
     ViewData["Title"] = "Manage wallet";
     ViewData.SetActivePageAndTitle(WalletsNavPages.Transactions);
 }
-
 <style type="text/css">
+
     .smMaxWidth {
         max-width: 200px;
     }
@@ -20,13 +20,14 @@
         opacity: 0.5;
     }
 </style>
-
-<div class="row">
-    <div class="col-md-10 text-center">
-        <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+@if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
+{
+    <div class="row">
+        <div class="col-md-10 text-center">
+            <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+        </div>
     </div>
-</div>
-<h4>@ViewData["Title"]</h4>
+}
 <div class="row">
     <div class="col-md-12">
         If BTCPay Server shows you an invalid balance, <a asp-action="WalletRescan">rescan your wallet</a>. <br />

BTCPayServer/wwwroot/locales/am-ET.json

@@ -0,0 +1,51 @@
+{
+  "NOTICE_WARN": "THIS CODE HAS BEEN AUTOMATICALLY GENERATED FROM TRANSIFEX, IF YOU WISH TO HELP TRANSLATION COME ON THE SLACK http://slack.btcpayserver.org TO REQUEST PERMISSION TO https://www.transifex.com/btcpayserver/btcpayserver/",
+  "code": "am-ET",
+  "currentLanguage": "እንግሊዝኛ",
+  "lang": "ቋንቋ",
+  "Awaiting Payment...": "በመጠባበቅ ላይ ያለ ክፍያ ",
+  "Pay with": "ይክፈሉ",
+  "Contact and Refund Email": "ለማነጋገር እና ገንዘብ ተመላሽ  ኢሜል",
+  "Contact_Body": "እባክዎ ከዚህ በታች የኢሜይል አድራሻ ያቅርቡ. ክፍያዎ ላይ ችግር ካለ በዚህ አድራሻ ላይ እናገኝዎታለን.",
+  "Your email": "የእርስዎ ኢሜይል",
+  "Continue": "ይቀጥሉ",
+  "Please enter a valid email address": "እባክዎ ልክ የሆነ የኢሜይል አድራሻ ያስገቡ",
+  "Order Amount": "የትዕዛዝ መጠን",
+  "Network Cost": "የአውታረ መረብ ወጪ",
+  "Already Paid": "አስቀድሞ ተከፍሏል",
+  "Due": "የሚከፈል",
+  "Scan": "ቃኝ",
+  "Copy": "ቅጂ",
+  "Conversion": "ልወጣ",
+  "Open in wallet": "ውስጣዊ wallet ይክፈቱ",
+  "CompletePay_Body": "ክፍያዎን ለማጠናቀቅ እባክዎ {{btcDue}} {{cryptoCode}} ከዚህ በታች ባለው አድራሻ ይላኩ",
+  "Amount": "መጠን",
+  "Address": "አድራሻ",
+  "Copied": "ተቀድቷል",
+  "ConversionTab_BodyTop": "ከሌሎች ነጋዴዎች በቀጥታ የሚደግፉ altcoin በመጠቀም {{btcDue}} {{cryptoCode}} መክፈል ይችላሉ",
+  "ConversionTab_BodyDesc": "ይህ አገልግሎት በ 3 ኛ ወገን ይቀርባል. እባክዎን ምን ያህል አገልግሎት ሰጪዎች ገንዘቡን እንደሚልኩ መቆጣጠር አለመቻላችንን ያስታውሱ. ደረሰኝ የተቆረጠለት ገንዘብ ከተቀበለ በኋላ ብቻ ነው  {{cryptoCode}} Blockchain.",
+  "ConversionTab_CalculateAmount_Error": "እንደገና ሞክር",
+  "ConversionTab_LoadCurrencies_Error": "እንደገና ሞክር",
+  "ConversionTab_Lightning": "ለ Lightning አውታረ መረብ ክፍያዎች ምንም የልወጣ አቅራቢዎች አይገኙም.",
+  "ConversionTab_CurrencyList_Select_Option": "እባክዎ የሚቀየር አንድ ምንዛሬ ይምረጡ",
+  "Invoice expiring soon...": "ይህ ደረሰኝ  በቅርቡ ጊዜው ያልፍበታል",
+  "Invoice expired": "ደረሰኝ ጊዜው አልፎበታል",
+  "What happened?": "ምን ተፈጠረ?",
+  "InvoiceExpired_Body_1": "ይህ ደረሰኝ ጊዜው አልፎበታል. ደረሰኝ ለ {{maxTimeMinutes}}   ደቂቃ ብቻ ነው የሚሰራው.\nክፍያዎን እንደገና ለማስገባት የሚፈልጉ ከሆነ ወደ {{storeName}}  መመለስ ይችላሉ.",
+  "InvoiceExpired_Body_2": "ክፍያ ለመላክ ከሞከሩ, ገና በአውታረ መረቡ ተቀባይነት አላገኘም. ገንዘብዎን ገና አልተቀበልንም.",
+  "InvoiceExpired_Body_3": "በኋላ ላይ ከደረሰን, የተመላሽ ገንዘብን ለማዘጋጀት ትዕዛዝዎን እንሰራለን ወይም እርስዎን ያነጋግሩን",
+  "Invoice ID": "ደረሰኝ መታወቂያ",
+  "Order ID": "የትዕዛዝ መታወቂያ",
+  "Return to StoreName": "ወደ  {{storeName}}",
+  "This invoice has been paid": "ይህ ደረሰኝ ተከፍሏል",
+  "This invoice has been archived": "ይህ ደረሰኝ ተመዝግቧል",
+  "Archived_Body": "እባክዎ ለማዘዝ ለሽርሽር መረጃ ወይም ለእርዳታ ያነጋግሩ",
+  "BOLT 11 Invoice": "BOLT 11 ክፍያ መጠየቂያ",
+  "Node Info": "Node መረጃ",
+  "txCount": "{{count}} ግብይት",
+  "txCount_plural": "{{count}} ግብይቶች",
+  "Pay with CoinSwitch": "በ CoinSwitch ይክፈሉ",
+  "Pay with Changelly": "በ Changelly ይክፈሉ",
+  "Close": "ዝጋ",
+  "NotPaid_ExtraTransaction": "ደረሰኙ ሙሉ በሙሉ አልተከፈለውም. እባክዎ የገንዘብ መጠን ለመሸፈን ሌላ ግብይት ይላኩ"
+}

BTCPayServer/wwwroot/locales/es-ES.json

@@ -13,7 +13,7 @@
   "Order Amount": "Total del pedido",
   "Network Cost": "Costo de la red",
   "Already Paid": "Ya has pagado",
-  "Due": "Aún debes",
+  "Due": "Faltante",
   "Scan": "Escanear",
   "Copy": "Copiar",
   "Conversion": "Conversión",
@@ -47,5 +47,5 @@
   "Pay with CoinSwitch": "Pagar con CoinSwitch",
   "Pay with Changelly": "Pagar con Changelly",
   "Close": "Cerrar",
-  "NotPaid_ExtraTransaction": "The invoice hasn't been paid in full. Please send another transaction to cover amount Due."
+  "NotPaid_ExtraTransaction": "La factura no ha sido pagada en su totalidad. Por favor envía otra transacción para cubrir el monto faltante."
 }

BTCPayServer/wwwroot/locales/fr-FR.json

@@ -47,5 +47,5 @@
   "Pay with CoinSwitch": "Payer avec CoinSwitch",
   "Pay with Changelly": "Payer avec Changelly",
   "Close": "Fermer",
-  "NotPaid_ExtraTransaction": "The invoice hasn't been paid in full. Please send another transaction to cover amount Due."
+  "NotPaid_ExtraTransaction": "La facture n'as pas été réglée dans sa totalité. Veuillez envoyer une autre transaction pour la compléter."
 }

BTCPayServer/wwwroot/locales/it-IT.json

@@ -47,5 +47,5 @@
   "Pay with CoinSwitch": "Paga con CoinSwitch",
   "Pay with Changelly": "Paga con Changelly",
   "Close": "Chiudi",
-  "NotPaid_ExtraTransaction": "The invoice hasn't been paid in full. Please send another transaction to cover amount Due."
+  "NotPaid_ExtraTransaction": "La fattura non è stata pagata per intero. Per favore effettua una nuova transazione per coprire l'importo dovuto."
 }

BTCPayServer/wwwroot/locales/pt-PT.json

@@ -47,5 +47,5 @@
   "Pay with CoinSwitch": "Pagar com CoinSwitch",
   "Pay with Changelly": "Pagar com Changelly",
   "Close": "Fechar",
-  "NotPaid_ExtraTransaction": "The invoice hasn't been paid in full. Please send another transaction to cover amount Due."
+  "NotPaid_ExtraTransaction": "A fatura não foi completamente paga. Por favor, faça um outra transação para cobrir o valor devido."
 }

Version.csproj

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-		<Version>1.0.3.112</Version>
+		<Version>1.0.3.115</Version>
   </PropertyGroup>
 </Project>