fix layout

Transaction count CS translation

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -47,7 +47,7 @@ namespace BTCPayServer.Tests
         }
 
         public Uri LTCNBXplorerUri { get; set; }
-        
+
         public Uri ServerUri
         {
             get;
@@ -65,11 +65,14 @@ namespace BTCPayServer.Tests
             get; set;
         }
 
+
+        public bool MockRates { get; set; } = true;
+
         public void Start()
         {
             if (!Directory.Exists(_Directory))
                 Directory.CreateDirectory(_Directory);
-            string chain = ChainType.Regtest.ToNetwork().Name;
+            string chain = NBXplorerDefaultSettings.GetFolderName(NetworkType.Regtest);
             string chainDirectory = Path.Combine(_Directory, chain);
             if (!Directory.Exists(chainDirectory))
                 Directory.CreateDirectory(chainDirectory);
@@ -101,12 +104,15 @@ namespace BTCPayServer.Tests
                     .UseConfiguration(conf)
                     .ConfigureServices(s =>
                     {
-                        var mockRates = new MockRateProviderFactory();
-                        var btc = new MockRateProvider("BTC", new Rate("USD", 5000m), new Rate("CAD", 4500m));
-                        var ltc = new MockRateProvider("LTC", new Rate("USD", 500m));
-                        mockRates.AddMock(btc);
-                        mockRates.AddMock(ltc);
-                        s.AddSingleton<IRateProviderFactory>(mockRates);
+                        if (MockRates)
+                        {
+                            var mockRates = new MockRateProviderFactory();
+                            var btc = new MockRateProvider("BTC", new Rate("USD", 5000m), new Rate("CAD", 4500m));
+                            var ltc = new MockRateProvider("LTC", new Rate("USD", 500m));
+                            mockRates.AddMock(btc);
+                            mockRates.AddMock(ltc);
+                            s.AddSingleton<IRateProviderFactory>(mockRates);
+                        }
                         s.AddLogging(l =>
                         {
                             l.SetMinimumLevel(LogLevel.Information)
@@ -121,7 +127,7 @@ namespace BTCPayServer.Tests
             _Host.Start();
             InvoiceRepository = (InvoiceRepository)_Host.Services.GetService(typeof(InvoiceRepository));
         }
-        
+
         public string HostName
         {
             get;

BTCPayServer.Tests/ServerTester.cs

@@ -34,22 +34,12 @@ namespace BTCPayServer.Tests
         public ServerTester(string scope)
         {
             _Directory = scope;
-        }
-
-        public bool Dockerized
-        {
-            get; set;
-        }
-
-        public void Start()
-        {
             if (Directory.Exists(_Directory))
                 Utils.DeleteDirectory(_Directory);
             if (!Directory.Exists(_Directory))
                 Directory.CreateDirectory(_Directory);
 
-
-            NetworkProvider = new BTCPayNetworkProvider(ChainType.Regtest);
+            NetworkProvider = new BTCPayNetworkProvider(NetworkType.Regtest);
             ExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_BTCRPCCONNECTION", "server=http://127.0.0.1:43782;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork("BTC").NBitcoinNetwork);
             LTCExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_LTCRPCCONNECTION", "server=http://127.0.0.1:43783;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork("LTC").NBitcoinNetwork);
 
@@ -72,6 +62,15 @@ namespace BTCPayServer.Tests
             PayTester.Port = int.Parse(GetEnvironment("TESTS_PORT", Utils.FreeTcpPort().ToString(CultureInfo.InvariantCulture)), CultureInfo.InvariantCulture);
             PayTester.HostName = GetEnvironment("TESTS_HOSTNAME", "127.0.0.1");
             PayTester.InContainer = bool.Parse(GetEnvironment("TESTS_INCONTAINER", "false"));
+        }
+
+        public bool Dockerized
+        {
+            get; set;
+        }
+
+        public void Start()
+        {
             PayTester.Start();
         }
 

BTCPayServer.Tests/UnitTest1.cs

@@ -616,12 +616,54 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        public void CanUseExchangeSpecificRate()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.PayTester.MockRates = false;
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                user.RegisterDerivationScheme("BTC");
+                List<decimal> rates = new List<decimal>();
+                rates.Add(CreateInvoice(tester, user, "coinaverage"));
+                var bitflyer = CreateInvoice(tester, user, "bitflyer");
+                var bitflyer2 = CreateInvoice(tester, user, "bitflyer");
+                Assert.Equal(bitflyer, bitflyer2); // Should be equal because cache
+                rates.Add(bitflyer);
+
+                foreach(var rate in rates)
+                {
+                    Assert.Single(rates.Where(r => r == rate));
+                }
+            }
+        }
+
+        private static decimal CreateInvoice(ServerTester tester, TestAccount user, string exchange)
+        {
+            var storeController = tester.PayTester.GetController<StoresController>(user.UserId);
+            var vm = (StoreViewModel)((ViewResult)storeController.UpdateStore(user.StoreId).Result).Model;
+            vm.PreferredExchange = exchange;
+            storeController.UpdateStore(user.StoreId, vm).Wait();
+            var invoice2 = user.BitPay.CreateInvoice(new Invoice()
+            {
+                Price = 5000.0,
+                Currency = "USD",
+                PosData = "posData",
+                OrderId = "orderId",
+                ItemDesc = "Some description",
+                FullNotifications = true
+            }, Facade.Merchant);
+            return invoice2.CryptoInfo[0].Rate;
+        }
 
         [Fact]
         public void CanTweakRate()
         {
             using (var tester = ServerTester.Create())
             {
+                tester.PayTester.MockRates = false;
                 tester.Start();
                 var user = tester.NewAccount();
                 user.GrantAccess();
@@ -831,7 +873,7 @@ namespace BTCPayServer.Tests
         [Fact]
         public void CanParseDerivationScheme()
         {
-            var parser = new DerivationSchemeParser(Network.TestNet, NBXplorer.ChainType.Test);
+            var parser = new DerivationSchemeParser(Network.TestNet);
             NBXplorer.DerivationStrategy.DerivationStrategyBase result;
             //  Passing electrum stuff
             // Native
@@ -1164,7 +1206,7 @@ namespace BTCPayServer.Tests
 
         private static bool IsMapped(Invoice invoice, ApplicationDbContext ctx)
         {
-            var h = BitcoinAddress.Create(invoice.BitcoinAddress).ScriptPubKey.Hash.ToString();
+            var h = BitcoinAddress.Create(invoice.BitcoinAddress, Network.RegTest).ScriptPubKey.Hash.ToString();
             return ctx.AddressInvoices.FirstOrDefault(i => i.InvoiceDataId == invoice.Id && i.GetAddress() == h) != null;
         }
 

BTCPayServer.Tests/docker-compose.yml

@@ -46,7 +46,7 @@ services:
       - lightning-charged
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.1.26
+    image: nicolasdorier/nbxplorer:1.0.2.0
     ports:
       - "32838:32838"
     expose: 
@@ -129,7 +129,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: nicolasdorier/clightning:0.0.0.3
+    image: nicolasdorier/clightning:0.0.0.5-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -138,6 +138,7 @@ services:
         ipaddr=merchant_lightningd
         network=regtest
         log-level=debug
+        dev-broadcast-interval=1000
     ports:
       - "30993:9835" # api port
     expose:

BTCPayServer/BTCPayNetwork.cs

@@ -14,34 +14,28 @@ namespace BTCPayServer
     {
         static BTCPayDefaultSettings()
         {
-            _Settings = new Dictionary<ChainType, BTCPayDefaultSettings>();
-            foreach (var chainType in new[] { ChainType.Main, ChainType.Test, ChainType.Regtest })
+            _Settings = new Dictionary<NetworkType, BTCPayDefaultSettings>();
+            foreach (var chainType in new[] { NetworkType.Mainnet, NetworkType.Testnet, NetworkType.Regtest })
             {
-                var btcNetwork = (chainType == ChainType.Main ? Network.Main :
-                                  chainType == ChainType.Regtest ? Network.RegTest :
-                                  chainType == ChainType.Test ? Network.TestNet : throw new NotSupportedException(chainType.ToString()));
-
                 var settings = new BTCPayDefaultSettings();
                 _Settings.Add(chainType, settings);
-                settings.ChainType = chainType;
-                settings.DefaultDataDirectory = StandardConfiguration.DefaultDataDirectory.GetDirectory("BTCPayServer", btcNetwork.Name);
+                settings.DefaultDataDirectory = StandardConfiguration.DefaultDataDirectory.GetDirectory("BTCPayServer", NBXplorerDefaultSettings.GetFolderName(chainType));
                 settings.DefaultConfigurationFile = Path.Combine(settings.DefaultDataDirectory, "settings.config");
-                settings.DefaultPort = (chainType == ChainType.Main ? 23000 :
-                                                      chainType == ChainType.Regtest ? 23002 :
-                                                      chainType == ChainType.Test ? 23001 : throw new NotSupportedException(chainType.ToString()));
+                settings.DefaultPort = (chainType == NetworkType.Mainnet ? 23000 :
+                                                      chainType == NetworkType.Regtest ? 23002 :
+                                                      chainType == NetworkType.Testnet ? 23001 : throw new NotSupportedException(chainType.ToString()));
             }
         }
 
-        static Dictionary<ChainType, BTCPayDefaultSettings> _Settings;
+        static Dictionary<NetworkType, BTCPayDefaultSettings> _Settings;
 
-        public static BTCPayDefaultSettings GetDefaultSettings(ChainType chainType)
+        public static BTCPayDefaultSettings GetDefaultSettings(NetworkType chainType)
         {
             return _Settings[chainType];
         }
 
         public string DefaultDataDirectory { get; set; }
         public string DefaultConfigurationFile { get; set; }
-        public ChainType ChainType { get; internal set; }
         public int DefaultPort { get; set; }
     }
     public class BTCPayNetwork
@@ -50,7 +44,7 @@ namespace BTCPayServer
         public string CryptoCode { get; internal set; }
         public string BlockExplorerLink { get; internal set; }
         public string UriScheme { get; internal set; }
-        public IRateProvider DefaultRateProvider { get; set; }
+        public RateProviderDescription DefaultRateProvider { get; set; }
 
         [Obsolete("Should not be needed")]
         public bool IsBTC
@@ -72,6 +66,12 @@ namespace BTCPayServer
         public override string ToString()
         {
             return CryptoCode;
-        }        
+        }
+
+        internal KeyPath GetRootKeyPath()
+        {
+            return new KeyPath(NBitcoinNetwork.Consensus.SupportSegwit ? "49'" : "44'")
+                        .Derive(CoinType); 
+        }
     }
 }

BTCPayServer/BTCPayNetworkProvider.Bitcoin.cs

@@ -14,21 +14,21 @@ namespace BTCPayServer
         public void InitBitcoin()
         {
             var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("BTC");
-            var coinaverage = new CoinAverageRateProvider("BTC");
-            var bitpay = new BitpayRateProvider(new Bitpay(new Key(), new Uri("https://bitpay.com/")));
-            var btcRate = new FallbackRateProvider(new IRateProvider[] { coinaverage, bitpay });
+            var coinaverage = new CoinAverageRateProviderDescription("BTC");
+            var bitpay = new BitpayRateProviderDescription();
+            var btcRate = new FallbackRateProviderDescription(new RateProviderDescription[] { coinaverage, bitpay });
             Add(new BTCPayNetwork()
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
-                BlockExplorerLink = NBXplorerNetworkProvider.ChainType == ChainType.Main ? "https://www.smartbit.com.au/tx/{0}" : "https://testnet.smartbit.com.au/tx/{0}",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://www.smartbit.com.au/tx/{0}" : "https://testnet.smartbit.com.au/tx/{0}",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "bitcoin",
                 DefaultRateProvider = btcRate,
                 CryptoImagePath = "imlegacy/bitcoin-symbol.svg",
                 LightningImagePath = "imlegacy/btc-lightning.svg",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NBXplorerNetworkProvider.ChainType),
-                CoinType = NBXplorerNetworkProvider.ChainType == ChainType.Main ? new KeyPath("0'") : new KeyPath("1'")
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("0'") : new KeyPath("1'")
             });
         }
     }

BTCPayServer/BTCPayNetworkProvider.Dogecoin.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using NBitcoin;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitDogecoin()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("DOGE");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://dogechain.info/tx/{0}" : "https://dogechain.info/tx/{0}",
+                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "dogecoin",
+                DefaultRateProvider = new CoinAverageRateProviderDescription("DOGE"),
+                CryptoImagePath = "imlegacy/dogecoin.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("3'") : new KeyPath("1'")
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.Litecoin.cs

@@ -12,22 +12,19 @@ namespace BTCPayServer
     {
         public void InitLitecoin()
         {
-            NBitcoin.Altcoins.Litecoin.EnsureRegistered();
-            var ltcRate = new CoinAverageRateProvider("LTC");
-
             var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LTC");
             Add(new BTCPayNetwork()
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
-                BlockExplorerLink = NBXplorerNetworkProvider.ChainType == ChainType.Main ? "https://live.blockcypher.com/ltc/tx/{0}/" : "http://explorer.litecointools.com/tx/{0}",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://live.blockcypher.com/ltc/tx/{0}/" : "http://explorer.litecointools.com/tx/{0}",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "litecoin",
-                DefaultRateProvider = ltcRate,
+                DefaultRateProvider = new CoinAverageRateProviderDescription("LTC"),
                 CryptoImagePath = "imlegacy/litecoin-symbol.svg",
                 LightningImagePath = "imlegacy/ltc-lightning.svg",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NBXplorerNetworkProvider.ChainType),
-                CoinType = NBXplorerNetworkProvider.ChainType == ChainType.Main ? new KeyPath("2'") : new KeyPath("3'")
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("2'") : new KeyPath("1'")
             });
         }
     }

BTCPayServer/BTCPayNetworkProvider.cs

@@ -27,8 +27,8 @@ namespace BTCPayServer
 
         BTCPayNetworkProvider(BTCPayNetworkProvider filtered, string[] cryptoCodes)
         {
-            ChainType = filtered.ChainType;
-            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(filtered.ChainType);
+            NetworkType = filtered.NetworkType;
+            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(filtered.NetworkType);
             _Networks = new Dictionary<string, BTCPayNetwork>();
             cryptoCodes = cryptoCodes.Select(c => c.ToUpperInvariant()).ToArray();
             foreach (var network in filtered._Networks)
@@ -40,13 +40,14 @@ namespace BTCPayServer
             }
         }
 
-        public ChainType ChainType { get; set; }
-        public BTCPayNetworkProvider(ChainType chainType)
+        public NetworkType NetworkType { get; private set; }
+        public BTCPayNetworkProvider(NetworkType networkType)
         {
-            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(chainType);
-            ChainType = chainType;
+            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(networkType);
+            NetworkType = networkType;
             InitBitcoin();
             InitLitecoin();
+            InitDogecoin();
         }
 
         /// <summary>

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.79</Version>
+		<Version>1.0.1.87</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -30,19 +30,19 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BuildBundlerMinifier" Version="2.6.362" />
+    <PackageReference Include="BuildBundlerMinifier" Version="2.6.375" />
     <PackageReference Include="Hangfire" Version="1.6.19" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
     <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.1" />
-    <PackageReference Include="LedgerWallet" Version="1.0.1.32" />
+    <PackageReference Include="LedgerWallet" Version="1.0.1.35" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.6.1" />
     <PackageReference Include="Meziantou.AspNetCore.BundleTagHelpers" Version="1.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.0" />
-    <PackageReference Include="NBitcoin" Version="4.1.0.4" />
+    <PackageReference Include="NBitcoin" Version="4.1.1" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.18" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.1.18" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.2" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.13" />

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -23,7 +23,7 @@ namespace BTCPayServer.Configuration
 
     public class BTCPayServerOptions
     {
-        public ChainType ChainType
+        public NetworkType NetworkType
         {
             get; set;
         }
@@ -51,15 +51,15 @@ namespace BTCPayServer.Configuration
 
         public void LoadArgs(IConfiguration conf)
         {
-            ChainType = DefaultConfiguration.GetChainType(conf);
-            var defaultSettings = BTCPayDefaultSettings.GetDefaultSettings(ChainType);
+            NetworkType = DefaultConfiguration.GetNetworkType(conf);
+            var defaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType);
             DataDir = conf.GetOrDefault<string>("datadir", defaultSettings.DefaultDataDirectory);
-            Logs.Configuration.LogInformation("Network: " + ChainType.ToString());
+            Logs.Configuration.LogInformation("Network: " + NetworkType.ToString());
 
             var supportedChains = conf.GetOrDefault<string>("chains", "btc")
                                       .Split(',', StringSplitOptions.RemoveEmptyEntries)
                                       .Select(t => t.ToUpperInvariant());
-            NetworkProvider = new BTCPayNetworkProvider(ChainType).Filter(supportedChains.ToArray());
+            NetworkProvider = new BTCPayNetworkProvider(NetworkType).Filter(supportedChains.ToArray());
             foreach (var chain in supportedChains)
             {
                 if (NetworkProvider.GetNetwork(chain) == null)

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -18,7 +18,7 @@ namespace BTCPayServer.Configuration
     {
         protected override CommandLineApplication CreateCommandLineApplicationCore()
         {
-            var provider = new BTCPayNetworkProvider(ChainType.Main);
+            var provider = new BTCPayNetworkProvider(NetworkType.Mainnet);
             var chains = string.Join(",", provider.GetAll().Select(n => n.CryptoCode.ToLowerInvariant()).ToArray());
             CommandLineApplication app = new CommandLineApplication(true)
             {
@@ -48,12 +48,12 @@ namespace BTCPayServer.Configuration
 
         protected override string GetDefaultDataDir(IConfiguration conf)
         {
-            return BTCPayDefaultSettings.GetDefaultSettings(GetChainType(conf)).DefaultDataDirectory;
+            return BTCPayDefaultSettings.GetDefaultSettings(GetNetworkType(conf)).DefaultDataDirectory;
         }
 
         protected override string GetDefaultConfigurationFile(IConfiguration conf)
         {
-            var network = BTCPayDefaultSettings.GetDefaultSettings(GetChainType(conf));
+            var network = BTCPayDefaultSettings.GetDefaultSettings(GetNetworkType(conf));
             var dataDir = conf["datadir"];
             if (dataDir == null)
                 return network.DefaultConfigurationFile;
@@ -69,7 +69,7 @@ namespace BTCPayServer.Configuration
             return Path.Combine(chainDir, fileName);
         }
 
-        public static ChainType GetChainType(IConfiguration conf)
+        public static NetworkType GetNetworkType(IConfiguration conf)
         {
             var network = conf.GetOrDefault<string>("network", null);
             if (network != null)
@@ -79,17 +79,18 @@ namespace BTCPayServer.Configuration
                 {
                     throw new ConfigException($"Invalid network parameter '{network}'");
                 }
-                return n.ToChainType();
+                return n.NetworkType;
             }
-            var net = conf.GetOrDefault<bool>("regtest", false) ? ChainType.Regtest :
-                        conf.GetOrDefault<bool>("testnet", false) ? ChainType.Test : ChainType.Main;
+            var net = conf.GetOrDefault<bool>("regtest", false) ? NetworkType.Regtest :
+                        conf.GetOrDefault<bool>("testnet", false) ? NetworkType.Testnet : NetworkType.Mainnet;
 
             return net;
         }
 
         protected override string GetDefaultConfigurationFileTemplate(IConfiguration conf)
         {
-            var defaultSettings = BTCPayDefaultSettings.GetDefaultSettings(GetChainType(conf));
+            var networkType = GetNetworkType(conf);
+            var defaultSettings = BTCPayDefaultSettings.GetDefaultSettings(networkType);
             StringBuilder builder = new StringBuilder();
             builder.AppendLine("### Global settings ###");
             builder.AppendLine("#network=mainnet");
@@ -102,7 +103,7 @@ namespace BTCPayServer.Configuration
             builder.AppendLine("#postgres=User ID=root;Password=myPassword;Host=localhost;Port=5432;Database=myDataBase;");
             builder.AppendLine();
             builder.AppendLine("### NBXplorer settings ###");
-            foreach (var n in new BTCPayNetworkProvider(defaultSettings.ChainType).GetAll())
+            foreach (var n in new BTCPayNetworkProvider(networkType).GetAll())
             {
                 builder.AppendLine($"#{n.CryptoCode}.explorer.url={n.NBXplorerNetwork.DefaultSettings.DefaultUrl}");
                 builder.AppendLine($"#{n.CryptoCode}.explorer.cookiefile={ n.NBXplorerNetwork.DefaultSettings.DefaultCookieFile}");
@@ -116,7 +117,7 @@ namespace BTCPayServer.Configuration
 
         protected override IPEndPoint GetDefaultEndpoint(IConfiguration conf)
         {
-            return new IPEndPoint(IPAddress.Parse("127.0.0.1"), BTCPayDefaultSettings.GetDefaultSettings(GetChainType(conf)).DefaultPort);
+            return new IPEndPoint(IPAddress.Parse("127.0.0.1"), BTCPayDefaultSettings.GetDefaultSettings(GetNetworkType(conf)).DefaultPort);
         }
     }
 }

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -85,54 +85,66 @@ namespace BTCPayServer.Controllers
                 model.CryptoPayments.Add(cryptoPayment);
             }
 
-            var payments = invoice
+            var onChainPayments = invoice
                 .GetPayments()
-                .Where(p => p.GetPaymentMethodId().PaymentType == PaymentTypes.BTCLike)
-                .Select(async payment =>
+                .Select<PaymentEntity, Task<object>>(async payment =>
                 {
-                    var paymentData = (Payments.Bitcoin.BitcoinLikePaymentData)payment.GetCryptoPaymentData();
-                    var m = new InvoiceDetailsModel.Payment();
                     var paymentNetwork = _NetworkProvider.GetNetwork(payment.GetCryptoCode());
-                    m.PaymentMethod = ToString(payment.GetPaymentMethodId());
-                    m.DepositAddress = paymentData.Output.ScriptPubKey.GetDestinationAddress(paymentNetwork.NBitcoinNetwork);
-
-                    int confirmationCount = 0;
-                    if (    (paymentData.ConfirmationCount < paymentNetwork.MaxTrackedConfirmation && payment.Accounted)
-                         && (paymentData.Legacy || invoice.MonitoringExpiration < DateTimeOffset.UtcNow)) // The confirmation count in the paymentData is not up to date
+                    var paymentData = payment.GetCryptoPaymentData();
+                    if (paymentData is Payments.Bitcoin.BitcoinLikePaymentData onChainPaymentData)
                     {
-                        confirmationCount = (await ((ExplorerClientProvider)_ServiceProvider.GetService(typeof(ExplorerClientProvider))).GetExplorerClient(payment.GetCryptoCode())?.GetTransactionAsync(paymentData.Outpoint.Hash))?.Confirmations ?? 0;
-                        paymentData.ConfirmationCount = confirmationCount;
-                        payment.SetCryptoPaymentData(paymentData);
-                        await _InvoiceRepository.UpdatePayments(new List<PaymentEntity> { payment });
+                        var m = new InvoiceDetailsModel.Payment();
+                        m.Crypto = payment.GetPaymentMethodId().CryptoCode;
+                        m.DepositAddress = onChainPaymentData.Output.ScriptPubKey.GetDestinationAddress(paymentNetwork.NBitcoinNetwork);
+
+                        int confirmationCount = 0;
+                        if ((onChainPaymentData.ConfirmationCount < paymentNetwork.MaxTrackedConfirmation && payment.Accounted)
+                             && (onChainPaymentData.Legacy || invoice.MonitoringExpiration < DateTimeOffset.UtcNow)) // The confirmation count in the paymentData is not up to date
+                        {
+                            confirmationCount = (await ((ExplorerClientProvider)_ServiceProvider.GetService(typeof(ExplorerClientProvider))).GetExplorerClient(payment.GetCryptoCode())?.GetTransactionAsync(onChainPaymentData.Outpoint.Hash))?.Confirmations ?? 0;
+                            onChainPaymentData.ConfirmationCount = confirmationCount;
+                            payment.SetCryptoPaymentData(onChainPaymentData);
+                            await _InvoiceRepository.UpdatePayments(new List<PaymentEntity> { payment });
+                        }
+                        else
+                        {
+                            confirmationCount = onChainPaymentData.ConfirmationCount;
+                        }
+                        if (confirmationCount >= paymentNetwork.MaxTrackedConfirmation)
+                        {
+                            m.Confirmations = "At least " + (paymentNetwork.MaxTrackedConfirmation);
+                        }
+                        else
+                        {
+                            m.Confirmations = confirmationCount.ToString(CultureInfo.InvariantCulture);
+                        }
+
+                        m.TransactionId = onChainPaymentData.Outpoint.Hash.ToString();
+                        m.ReceivedTime = payment.ReceivedTime;
+                        m.TransactionLink = string.Format(CultureInfo.InvariantCulture, paymentNetwork.BlockExplorerLink, m.TransactionId);
+                        m.Replaced = !payment.Accounted;
+                        return m;
                     }
                     else
                     {
-                        confirmationCount = paymentData.ConfirmationCount;
+                        var lightningPaymentData = (Payments.Lightning.LightningLikePaymentData)paymentData;
+                        return new InvoiceDetailsModel.OffChainPayment()
+                        {
+                            Crypto = paymentNetwork.CryptoCode,
+                            BOLT11 = lightningPaymentData.BOLT11
+                        };
                     }
-                    if (confirmationCount >= paymentNetwork.MaxTrackedConfirmation)
-                    {
-                        m.Confirmations = "At least " + (paymentNetwork.MaxTrackedConfirmation);
-                    }
-                    else
-                    {
-                        m.Confirmations = confirmationCount.ToString(CultureInfo.InvariantCulture);
-                    }
-
-                    m.TransactionId = paymentData.Outpoint.Hash.ToString();
-                    m.ReceivedTime = payment.ReceivedTime;
-                    m.TransactionLink = string.Format(CultureInfo.InvariantCulture, paymentNetwork.BlockExplorerLink, m.TransactionId);
-                    m.Replaced = !payment.Accounted;
-                    return m;
                 })
                 .ToArray();
-            await Task.WhenAll(payments);
+            await Task.WhenAll(onChainPayments);
             model.Addresses = invoice.HistoricalAddresses.Select(h => new InvoiceDetailsModel.AddressModel
             {
                 Destination = h.GetAddress(),
                 PaymentMethod = ToString(h.GetPaymentMethodId()),
                 Current = !h.UnAssigned.HasValue
             }).ToArray();
-            model.Payments = payments.Select(p => p.GetAwaiter().GetResult()).ToList();
+            model.OnChainPayments = onChainPayments.Select(p => p.GetAwaiter().GetResult()).OfType<InvoiceDetailsModel.Payment>().ToList();
+            model.OffChainPayments = onChainPayments.Select(p => p.GetAwaiter().GetResult()).OfType<InvoiceDetailsModel.OffChainPayment>().ToList();
             model.StatusMessage = StatusMessage;
             return View(model);
         }
@@ -238,7 +250,8 @@ namespace BTCPayServer.Controllers
                 BtcPaid = accounting.Paid.ToString(),
                 Status = invoice.Status,
                 CryptoImage = "/" + GetImage(paymentMethodId, network),
-                NetworkFeeDescription = $"{accounting.TxRequired} transaction{(accounting.TxRequired > 1 ? "s" : "")} x {paymentMethodDetails.GetTxFee()} {network.CryptoCode}",
+                NetworkFee = paymentMethodDetails.GetTxFee(),
+                IsMultiCurrency = invoice.GetPayments().Select(p => p.GetPaymentMethodId()).Concat(new[] { paymentMethod.GetId() }).Distinct().Count() > 1,
                 AllowCoinConversion = storeBlob.AllowCoinConversion,
                 AvailableCryptos = invoice.GetPaymentMethods(_NetworkProvider)
                                           .Where(i => i.Network != null)
@@ -251,12 +264,8 @@ namespace BTCPayServer.Controllers
                 .ToList()
             };
 
-            var isMultiCurrency = invoice.GetPayments().Select(p => p.GetPaymentMethodId()).Concat(new[] { paymentMethod.GetId() }).Distinct().Count() > 1;
-            if (isMultiCurrency)
-                model.NetworkFeeDescription = $"{accounting.NetworkFee} {network.CryptoCode}";
-
             var expiration = TimeSpan.FromSeconds(model.ExpirationSeconds);
-            model.TimeLeft = PrettyPrint(expiration);
+            model.TimeLeft = expiration.PrettyPrint();
             return model;
         }
 
@@ -275,17 +284,6 @@ namespace BTCPayServer.Controllers
             return price.ToString("C", _CurrencyNameTable.GetCurrencyProvider(currency)) + $" ({currency})";
         }
 
-        private string PrettyPrint(TimeSpan expiration)
-        {
-            StringBuilder builder = new StringBuilder();
-            if (expiration.Days >= 1)
-                builder.Append(expiration.Days.ToString(CultureInfo.InvariantCulture));
-            if (expiration.Hours >= 1)
-                builder.Append(expiration.Hours.ToString("00", CultureInfo.InvariantCulture));
-            builder.Append($"{expiration.Minutes.ToString("00", CultureInfo.InvariantCulture)}:{expiration.Seconds.ToString("00", CultureInfo.InvariantCulture)}");
-            return builder.ToString();
-        }
-
         [HttpGet]
         [Route("i/{invoiceId}/status")]
         [Route("i/{invoiceId}/{paymentMethodId}/status")]
@@ -453,7 +451,7 @@ namespace BTCPayServer.Controllers
                 return View(model);
             }
 
-            if(StatusMessage != null)
+            if (StatusMessage != null)
             {
                 return RedirectToAction(nameof(StoresController.UpdateStore), "Stores", new
                 {

BTCPayServer/Controllers/InvoiceController.cs

@@ -165,7 +165,7 @@ namespace BTCPayServer.Controllers
             {
                 var btc = _NetworkProvider.BTC;
                 var feeProvider = ((IFeeProviderFactory)_ServiceProvider.GetService(typeof(IFeeProviderFactory))).CreateFeeProvider(btc);
-                var rateProvider = storeBlob.ApplyRateRules(btc, _RateProviders.GetRateProvider(btc, false));
+                var rateProvider = _RateProviders.GetRateProvider(btc, storeBlob.GetRateRules());
                 if (feeProvider != null && rateProvider != null)
                 {
                     var gettingFee = feeProvider.GetFeeRateAsync();
@@ -186,7 +186,7 @@ namespace BTCPayServer.Controllers
         private async Task<PaymentMethod> CreatePaymentMethodAsync(IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store)
         {
             var storeBlob = store.GetStoreBlob();
-            var rate = await storeBlob.ApplyRateRules(network, _RateProviders.GetRateProvider(network, false)).GetRateAsync(entity.ProductInformation.Currency);
+            var rate = await _RateProviders.GetRateProvider(network, storeBlob.GetRateRules()).GetRateAsync(entity.ProductInformation.Currency);
             PaymentMethod paymentMethod = new PaymentMethod();
             paymentMethod.ParentEntity = entity;
             paymentMethod.Network = network;
@@ -221,7 +221,7 @@ namespace BTCPayServer.Controllers
                 if (limitValue.Currency == entity.ProductInformation.Currency)
                     limitValueRate = paymentMethod.Rate;
                 else
-                    limitValueRate = await storeBlob.ApplyRateRules(network, _RateProviders.GetRateProvider(network, false)).GetRateAsync(limitValue.Currency);
+                    limitValueRate = await _RateProviders.GetRateProvider(network, storeBlob.GetRateRules()).GetRateAsync(limitValue.Currency);
 
                 var limitValueCrypto = Money.Coins(limitValue.Value / limitValueRate);
                 if (compare(paymentMethod.Calculate().Due, limitValueCrypto))
@@ -278,11 +278,6 @@ namespace BTCPayServer.Controllers
             buyerInformation.BuyerZip = buyerInformation.BuyerZip ?? buyer.zip;
         }
 
-        private DerivationStrategyBase ParseDerivationStrategy(string derivationStrategy, BTCPayNetwork network)
-        {
-            return new DerivationStrategyFactory(network.NBitcoinNetwork).Parse(derivationStrategy);
-        }
-
         private TDest Map<TFrom, TDest>(TFrom data)
         {
             return JsonConvert.DeserializeObject<TDest>(JsonConvert.SerializeObject(data));

BTCPayServer/Controllers/RateController.cs

@@ -49,18 +49,20 @@ namespace BTCPayServer.Controllers
             var network = _NetworkProvider.GetNetwork(cryptoCode);
             if (network == null)
                 return NotFound();
-            var rateProvider = _RateProviderFactory.GetRateProvider(network, true);
-            if (rateProvider == null)
-                return NotFound();
 
+            RateRules rules = null;
             if (storeId != null)
             {
                 var store = await _StoreRepo.FindStore(storeId);
                 if (store == null)
                     return NotFound();
-                rateProvider = store.GetStoreBlob().ApplyRateRules(network, rateProvider);
+                rules = store.GetStoreBlob().GetRateRules();
             }
 
+            var rateProvider = _RateProviderFactory.GetRateProvider(network, rules);
+            if (rateProvider == null)
+                return NotFound();
+
             var allRates = (await rateProvider.GetRatesAsync());
             return Json(allRates.Select(r =>
                             new NBitpayClient.Rate()

BTCPayServer/Controllers/ServerController.cs

@@ -2,6 +2,7 @@
 using BTCPayServer.Models.ServerViewModels;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Mails;
+using BTCPayServer.Services.Rates;
 using BTCPayServer.Validations;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
@@ -11,6 +12,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Net.Mail;
 using System.Threading.Tasks;
 
@@ -22,12 +24,84 @@ namespace BTCPayServer.Controllers
         private UserManager<ApplicationUser> _UserManager;
         SettingsRepository _SettingsRepository;
 
-        public ServerController(UserManager<ApplicationUser> userManager, SettingsRepository settingsRepository)
+        public ServerController(UserManager<ApplicationUser> userManager,
+            IRateProviderFactory rateProviderFactory,
+            SettingsRepository settingsRepository)
         {
             _UserManager = userManager;
             _SettingsRepository = settingsRepository;
         }
 
+        [Route("server/rates")]
+        public async Task<IActionResult> Rates()
+        {
+            var rates = (await _SettingsRepository.GetSettingAsync<RatesSetting>()) ?? new RatesSetting();
+
+            var vm = new RatesViewModel()
+            {
+                CacheMinutes = rates.CacheInMinutes,
+                PrivateKey = rates.PrivateKey,
+                PublicKey = rates.PublicKey
+            };
+            await FetchRateLimits(vm);
+            return View(vm);
+        }
+
+        private static async Task FetchRateLimits(RatesViewModel vm)
+        {
+            var coinAverage = GetCoinaverageService(vm, false);
+            if (coinAverage != null)
+            {
+                try
+                {
+                    vm.RateLimits = await coinAverage.GetRateLimitsAsync();
+                }
+                catch { }
+            }
+        }
+
+        [Route("server/rates")]
+        [HttpPost]
+        public async Task<IActionResult> Rates(RatesViewModel vm)
+        {
+            var rates = (await _SettingsRepository.GetSettingAsync<RatesSetting>()) ?? new RatesSetting();
+            rates.PrivateKey = vm.PrivateKey;
+            rates.PublicKey = vm.PublicKey;
+            rates.CacheInMinutes = vm.CacheMinutes;
+            try
+            {
+                var service = GetCoinaverageService(vm, true);
+                if(service != null)
+                    await service.TestAuthAsync();
+            }
+            catch
+            {
+                ModelState.AddModelError(nameof(vm.PrivateKey), "Invalid API key pair");
+            }
+            if (!ModelState.IsValid)
+            {
+                await FetchRateLimits(vm);
+                return View(vm);
+            }
+            await _SettingsRepository.UpdateSetting(rates);
+            StatusMessage = "Rate settings successfully updated";
+            return RedirectToAction(nameof(Rates));
+        }
+
+        private static CoinAverageRateProvider GetCoinaverageService(RatesViewModel vm, bool withAuth)
+        {
+            var settings = new CoinAverageSettings()
+            {
+                KeyPair = (vm.PublicKey, vm.PrivateKey)
+            };
+            if (!withAuth || settings.GetCoinAverageSignature() != null)
+            {
+                return new CoinAverageRateProvider("BTC")
+                { Authenticator = settings };
+            }
+            return null;
+        }
+
         [Route("server/users")]
         public IActionResult ListUsers()
         {
@@ -72,7 +146,7 @@ namespace BTCPayServer.Controllers
             var isAdmin = IsAdmin(roles);
             bool updated = false;
 
-            if(isAdmin != viewModel.IsAdmin)
+            if (isAdmin != viewModel.IsAdmin)
             {
                 if (viewModel.IsAdmin)
                     await _UserManager.AddToRoleAsync(user, Roles.ServerAdmin);
@@ -80,7 +154,7 @@ namespace BTCPayServer.Controllers
                     await _UserManager.RemoveFromRoleAsync(user, Roles.ServerAdmin);
                 updated = true;
             }
-            if(updated)
+            if (updated)
             {
                 viewModel.StatusMessage = "User successfully updated";
             }

BTCPayServer/Controllers/StoresController.BTCLike.cs

@@ -26,10 +26,16 @@ namespace BTCPayServer.Controllers
             var store = await _Repo.FindStore(storeId, GetUserId());
             if (store == null)
                 return NotFound();
+            var network = cryptoCode == null ? null : _ExplorerProvider.GetNetwork(cryptoCode);
+            if (network == null)
+            {
+                return NotFound();
+            }
 
             DerivationSchemeViewModel vm = new DerivationSchemeViewModel();
             vm.ServerUrl = GetStoreUrl(storeId);
             vm.CryptoCode = cryptoCode;
+            vm.RootKeyPath = network.GetRootKeyPath();
             SetExistingValues(store, vm);
             return View(vm);
         }
@@ -63,6 +69,7 @@ namespace BTCPayServer.Controllers
             {
                 return NotFound();
             }
+            vm.RootKeyPath = network.GetRootKeyPath();
             var wallet = _WalletProvider.GetWallet(network);
             if (wallet == null)
             {
@@ -204,7 +211,7 @@ namespace BTCPayServer.Controllers
                 {
                     try
                     {
-                        destinationAddress = BitcoinAddress.Create(destination);
+                        destinationAddress = BitcoinAddress.Create(destination, network.NBitcoinNetwork);
                     }
                     catch { }
                     if (destinationAddress == null)
@@ -251,8 +258,6 @@ namespace BTCPayServer.Controllers
                 if (command == "getxpub")
                 {
                     var getxpubResult = await hw.GetExtPubKey(network, account);
-                    ;
-                    getxpubResult.CoinType = (int)(getxpubResult.KeyPath.Indexes[1] - 0x80000000);
                     result = getxpubResult;
                 }
                 if (command == "getinfo")

BTCPayServer/Controllers/StoresController.cs

@@ -5,6 +5,7 @@ using BTCPayServer.HostedServices;
 using BTCPayServer.Models;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Services;
+using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
 using BTCPayServer.Services.Wallets;
 using Microsoft.AspNetCore.Authorization;
@@ -47,7 +48,8 @@ namespace BTCPayServer.Controllers
             ExplorerClientProvider explorerProvider,
             IFeeProviderFactory feeRateProvider,
             LanguageService langService,
-            IHostingEnvironment env)
+            IHostingEnvironment env,
+            CoinAverageSettings coinAverage)
         {
             _Dashboard = dashboard;
             _Repo = repo;
@@ -64,7 +66,9 @@ namespace BTCPayServer.Controllers
             _ServiceProvider = serviceProvider;
             _BtcpayServerOptions = btcpayServerOptions;
             _BTCPayEnv = btcpayEnv;
+            _CoinAverage = coinAverage;
         }
+        CoinAverageSettings _CoinAverage;
         NBXplorerDashboard _Dashboard;
         BTCPayServerOptions _BtcpayServerOptions;
         BTCPayServerEnvironment _BTCPayEnv;
@@ -237,7 +241,7 @@ namespace BTCPayServer.Controllers
             model.SetCryptoCurrencies(_ExplorerProvider, model.DefaultCryptoCurrency);
             model.SetLanguages(_LangService, model.DefaultLang);
 
-            if(!ModelState.IsValid)
+            if (!ModelState.IsValid)
             {
                 return View(model);
             }
@@ -273,6 +277,7 @@ namespace BTCPayServer.Controllers
 
             var storeBlob = store.GetStoreBlob();
             var vm = new StoreViewModel();
+            vm.SetExchangeRates(GetSupportedExchanges(), storeBlob.PreferredExchange.IsCoinAverage() ? "coinaverage" : storeBlob.PreferredExchange);
             vm.Id = store.Id;
             vm.StoreName = store.StoreName;
             vm.StoreWebsite = store.StoreWebsite;
@@ -283,7 +288,6 @@ namespace BTCPayServer.Controllers
             vm.InvoiceExpiration = storeBlob.InvoiceExpiration;
             vm.RateMultiplier = (double)storeBlob.GetRateMultiplier();
             vm.LightningDescriptionTemplate = storeBlob.LightningDescriptionTemplate;
-            vm.PreferredExchange = storeBlob.PreferredExchange.IsCoinAverage() ? "coinaverage" : storeBlob.PreferredExchange;
             return View(vm);
         }
 
@@ -325,6 +329,7 @@ namespace BTCPayServer.Controllers
         [Route("{storeId}")]
         public async Task<IActionResult> UpdateStore(string storeId, StoreViewModel model)
         {
+            model.SetExchangeRates(GetSupportedExchanges(), model.PreferredExchange);
             if (!ModelState.IsValid)
             {
                 return View(model);
@@ -371,14 +376,11 @@ namespace BTCPayServer.Controllers
 
             if (!blob.PreferredExchange.IsCoinAverage() && newExchange)
             {
-                using (HttpClient client = new HttpClient())
+
+                if (!GetSupportedExchanges().Select(c => c.Name).Contains(blob.PreferredExchange, StringComparer.OrdinalIgnoreCase))
                 {
-                    var rate = await client.GetAsync(model.RateSource);
-                    if (rate.StatusCode == System.Net.HttpStatusCode.NotFound)
-                    {
-                        ModelState.AddModelError(nameof(model.PreferredExchange), $"Unsupported exchange ({model.RateSource})");
-                        return View(model);
-                    }
+                    ModelState.AddModelError(nameof(model.PreferredExchange), $"Unsupported exchange ({model.RateSource})");
+                    return View(model);
                 }
             }
 
@@ -394,9 +396,14 @@ namespace BTCPayServer.Controllers
             });
         }
 
+        private (String DisplayName, String Name)[] GetSupportedExchanges()
+        {
+            return new[] { ("Coin Average", "coinaverage") }.Concat(_CoinAverage.AvailableExchanges).ToArray();
+        }
+
         private DerivationStrategy ParseDerivationStrategy(string derivationScheme, Script hint, BTCPayNetwork network)
         {
-            var parser = new DerivationSchemeParser(network.NBitcoinNetwork, network.DefaultSettings.ChainType);
+            var parser = new DerivationSchemeParser(network.NBitcoinNetwork);
             parser.HintScriptPubKey = hint;
             return new DerivationStrategy(parser.Parse(derivationScheme), network);
         }

BTCPayServer/Data/StoreData.cs

@@ -284,30 +284,12 @@ namespace BTCPayServer.Data
             }
         }
 
-        public IRateProvider ApplyRateRules(BTCPayNetwork network, IRateProvider rateProvider)
+        public RateRules GetRateRules()
         {
-            if (!PreferredExchange.IsCoinAverage())
+            return new RateRules(RateRules)
             {
-                // If the original rateProvider is a cache, use the same inner provider as fallback, and same memory cache to wrap it all
-                if (rateProvider is CachedRateProvider cachedRateProvider)
-                {
-                    rateProvider = new FallbackRateProvider(new IRateProvider[] {
-                        new CoinAverageRateProvider(network.CryptoCode) { Exchange = PreferredExchange },
-                        cachedRateProvider.Inner
-                    });
-                    rateProvider = new CachedRateProvider(network.CryptoCode, rateProvider, cachedRateProvider.MemoryCache) { AdditionalScope = PreferredExchange };
-                }
-                else
-                {
-                    rateProvider = new FallbackRateProvider(new IRateProvider[] {
-                        new CoinAverageRateProvider(network.CryptoCode) { Exchange = PreferredExchange },
-                        rateProvider
-                    });
-                }
-            }
-            if (RateRules == null || RateRules.Count == 0)
-                return rateProvider;
-            return new TweakRateProvider(network, rateProvider, RateRules.ToList());
+                PreferredExchange = PreferredExchange
+            };
         }
     }
 }

BTCPayServer/DerivationSchemeParser.cs

@@ -13,13 +13,11 @@ namespace BTCPayServer
     public class DerivationSchemeParser
     {
         public Network Network { get; set; }
-        public ChainType ChainType { get; set; }
         public Script HintScriptPubKey { get; set; }
 
-        public DerivationSchemeParser(Network expectedNetwork, ChainType chainType)
+        public DerivationSchemeParser(Network expectedNetwork)
         {
             Network = expectedNetwork;
-            ChainType = chainType;
         }
 
         public DerivationStrategyBase Parse(string str)
@@ -43,6 +41,9 @@ namespace BTCPayServer
                 }
             }
 
+            if(!Network.Consensus.SupportSegwit)
+                hintedLabels.Add("legacy");
+
             try
             {
                 var result = new DerivationStrategyFactory(Network).Parse(str);
@@ -75,7 +76,7 @@ namespace BTCPayServer
                     if (data.Length < 4)
                         continue;
                     var prefix = Utils.ToUInt32(data, false);
-                    var standardPrefix = Utils.ToBytes(ChainType == NBXplorer.ChainType.Main ? 0x0488b21eU : 0x043587cf, false);
+                    var standardPrefix = Utils.ToBytes(Network.NetworkType == NetworkType.Mainnet ? 0x0488b21eU : 0x043587cf, false);
                     for (int ii = 0; ii < 4; ii++)
                         data[ii] = standardPrefix[ii];
 

BTCPayServer/Extensions.cs

@@ -28,11 +28,22 @@ using BTCPayServer.Payments;
 using Microsoft.AspNetCore.Identity;
 using BTCPayServer.Models;
 using System.Security.Claims;
+using System.Globalization;
 
 namespace BTCPayServer
 {
     public static class Extensions
     {
+        public static string PrettyPrint(this TimeSpan expiration)
+        {
+            StringBuilder builder = new StringBuilder();
+            if (expiration.Days >= 1)
+                builder.Append(expiration.Days.ToString(CultureInfo.InvariantCulture));
+            if (expiration.Hours >= 1)
+                builder.Append(expiration.Hours.ToString("00", CultureInfo.InvariantCulture));
+            builder.Append($"{expiration.Minutes.ToString("00", CultureInfo.InvariantCulture)}:{expiration.Seconds.ToString("00", CultureInfo.InvariantCulture)}");
+            return builder.ToString();
+        }
         public static decimal RoundUp(decimal value, int precision)
         {
             for (int i = 0; i < precision; i++)

BTCPayServer/HostedServices/NBXplorerWaiter.cs

@@ -184,8 +184,8 @@ namespace BTCPayServer.HostedServices
 
             if(status != null && error == null)
             {
-                if(status.ChainType != _Network.NBXplorerNetwork.DefaultSettings.ChainType)
-                    error = $"{_Network.CryptoCode}: NBXplorer is on a different ChainType (actual: {status.ChainType}, expected: {_Network.NBXplorerNetwork.DefaultSettings.ChainType})";
+                if(status.NetworkType != _Network.NBitcoinNetwork.NetworkType)
+                    error = $"{_Network.CryptoCode}: NBXplorer is on a different ChainType (actual: {status.NetworkType}, expected: {_Network.NBitcoinNetwork.NetworkType})";
             }
 
             if (error != null)

BTCPayServer/HostedServices/RatesHostedService.cs

@@ -0,0 +1,101 @@
+using System;
+using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Services;
+using BTCPayServer.Services.Rates;
+using Microsoft.Extensions.Hosting;
+using BTCPayServer.Logging;
+using System.Runtime.CompilerServices;
+
+namespace BTCPayServer.HostedServices
+{
+    public class RatesHostedService : IHostedService
+    {
+        private SettingsRepository _SettingsRepository;
+        private IRateProviderFactory _RateProviderFactory;
+        private CoinAverageSettings _coinAverageSettings;
+        public RatesHostedService(SettingsRepository repo,
+                                  CoinAverageSettings coinAverageSettings,
+                                  IRateProviderFactory rateProviderFactory)
+        {
+            this._SettingsRepository = repo;
+            _RateProviderFactory = rateProviderFactory;
+            _coinAverageSettings = coinAverageSettings;
+        }
+
+
+        CancellationTokenSource _Cts = new CancellationTokenSource();
+
+        List<Task> _Tasks = new List<Task>();
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            _Tasks.Add(RefreshCoinAverageSupportedExchanges(_Cts.Token));
+            _Tasks.Add(RefreshCoinAverageSettings(_Cts.Token));
+            return Task.CompletedTask;
+        }
+
+
+        async Task Timer(Func<Task> act, CancellationToken cancellation, [CallerMemberName]string caller = null)
+        {
+            await new SynchronizationContextRemover();
+            while (!cancellation.IsCancellationRequested)
+            {
+                try
+                {
+                    await act();
+                }
+                catch (OperationCanceledException) when (cancellation.IsCancellationRequested)
+                {
+                }
+                catch (Exception ex)
+                {
+                    Logs.PayServer.LogWarning(ex, caller + " failed");
+                    try
+                    {
+                        await Task.Delay(TimeSpan.FromMinutes(1), cancellation);
+                    }
+                    catch (OperationCanceledException) when (cancellation.IsCancellationRequested) { }
+                }
+            }
+        }
+        Task RefreshCoinAverageSupportedExchanges(CancellationToken cancellation)
+        {
+            return Timer(async () =>
+            {
+                await new SynchronizationContextRemover();
+                var tickers = await new CoinAverageRateProvider("BTC").GetExchangeTickersAsync();
+                _coinAverageSettings.AvailableExchanges = tickers
+                    .Exchanges
+                    .Select(c => (c.DisplayName, c.Name))
+                    .ToArray();
+
+                await Task.Delay(TimeSpan.FromHours(5), cancellation);
+            }, cancellation);
+        }
+
+        Task RefreshCoinAverageSettings(CancellationToken cancellation)
+        {
+            return Timer(async () =>
+            {
+                await new SynchronizationContextRemover();
+                var rates = (await _SettingsRepository.GetSettingAsync<RatesSetting>()) ?? new RatesSetting();
+                _RateProviderFactory.CacheSpan = TimeSpan.FromMinutes(rates.CacheInMinutes);
+                if (!string.IsNullOrWhiteSpace(rates.PrivateKey) && !string.IsNullOrWhiteSpace(rates.PublicKey))
+                {
+                    _coinAverageSettings.KeyPair = (rates.PublicKey, rates.PrivateKey);
+                }
+                await _SettingsRepository.WaitSettingsChanged<RatesSetting>(cancellation);
+            }, cancellation);
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            _Cts.Cancel();
+            return Task.WhenAll(_Tasks.ToArray());
+        }
+    }
+}

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -109,6 +109,8 @@ namespace BTCPayServer.Hosting
             services.AddSingleton<BTCPayServerEnvironment>();
             services.TryAddSingleton<TokenRepository>();
             services.TryAddSingleton<EventAggregator>();
+            services.TryAddSingleton<CoinAverageSettings>();
+            services.TryAddSingleton<ICoinAverageAuthenticator, CoinAverageSettings>();
             services.TryAddSingleton<ApplicationDbContextFactory>(o => 
             {
                 var opts = o.GetRequiredService<BTCPayServerOptions>();
@@ -154,16 +156,17 @@ namespace BTCPayServer.Hosting
             services.AddSingleton<IHostedService, NBXplorerWaiters>();
             services.AddSingleton<IHostedService, InvoiceNotificationManager>();
             services.AddSingleton<IHostedService, InvoiceWatcher>();
+            services.AddSingleton<IHostedService, RatesHostedService>();
 
             services.TryAddSingleton<ExplorerClientProvider>();
             services.TryAddSingleton<Bitpay>(o =>
             {
-                if (o.GetRequiredService<BTCPayServerOptions>().ChainType == ChainType.Main)
+                if (o.GetRequiredService<BTCPayServerOptions>().NetworkType == NetworkType.Mainnet)
                     return new Bitpay(new Key(), new Uri("https://bitpay.com/"));
                 else
                     return new Bitpay(new Key(), new Uri("https://test.bitpay.com/"));
             });
-            services.TryAddSingleton<IRateProviderFactory, CachedDefaultRateProviderFactory>();
+            services.TryAddSingleton<IRateProviderFactory, BTCPayRateProviderFactory>();
 
             services.TryAddScoped<IHttpContextAccessor, HttpContextAccessor>();
             services.TryAddSingleton<IAuthorizationHandler, OwnStoreHandler>();

BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs

@@ -27,7 +27,7 @@ namespace BTCPayServer.Models.InvoicingModels
         }
         public class Payment
         {
-            public string PaymentMethod { get; set; }
+            public string Crypto { get; set; }
             public string Confirmations
             {
                 get; set;
@@ -72,7 +72,13 @@ namespace BTCPayServer.Models.InvoicingModels
             get; set;
         } = new List<CryptoPayment>();
 
-        public List<Payment> Payments { get; set; } = new List<Payment>();
+        public List<Payment> OnChainPayments { get; set; } = new List<Payment>();
+        public List<OffChainPayment> OffChainPayments { get; set; } = new List<OffChainPayment>();
+        public class OffChainPayment
+        {
+            public string Crypto { get; set; }
+            public string BOLT11 { get; set; }
+        }
 
         public string Status
         {

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -43,7 +43,8 @@ namespace BTCPayServer.Models.InvoicingModels
 
         public string OrderId { get; set; }
         public string CryptoImage { get; set; }
-        public string NetworkFeeDescription { get; internal set; }
+        public decimal NetworkFee { get; set; }
+        public bool IsMultiCurrency { get; set; }
         public int MaxTimeMinutes { get; internal set; }
         public string PaymentType { get; internal set; }
         public string PaymentMethodId { get; internal set; }

BTCPayServer/Models/ServerViewModels/RatesViewModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+
+namespace BTCPayServer.Models.ServerViewModels
+{
+    public class RatesViewModel
+    {
+        [Display(Name = "Bitcoin average api keys")]
+        public string PublicKey { get; set; }
+        public string PrivateKey { get; set; }
+        [Display(Name = "Cache the rates for ... minutes")]
+        [Range(0, 60)]
+        public int CacheMinutes { get; set; }
+        public GetRateLimitsResponse RateLimits { get; internal set; }
+    }
+}

BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using NBitcoin;
 
 namespace BTCPayServer.Models.StoreViewModels
 {
@@ -29,5 +30,6 @@ namespace BTCPayServer.Models.StoreViewModels
 
         public string ServerUrl { get; set; }
         public string StatusMessage { get; internal set; }
+        public KeyPath RootKeyPath { get; set; }
     }
 }

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -12,6 +12,11 @@ namespace BTCPayServer.Models.StoreViewModels
 {
     public class StoreViewModel
     {
+        class Format
+        {
+            public string Name { get; set; }
+            public string Value { get; set; }
+        }
         public class DerivationScheme
         {
             public string Crypto { get; set; }
@@ -44,6 +49,17 @@ namespace BTCPayServer.Models.StoreViewModels
 
         public List<StoreViewModel.DerivationScheme> DerivationSchemes { get; set; } = new List<StoreViewModel.DerivationScheme>();
 
+        public void SetExchangeRates((String DisplayName, String Name)[] supportedList, string preferredExchange)
+        {
+            var defaultStore = preferredExchange ?? "coinaverage";
+            var choices = supportedList.Select(o => new Format() { Name = o.DisplayName, Value = o.Name }).ToArray();
+            var chosen = choices.FirstOrDefault(f => f.Value == defaultStore) ?? choices.FirstOrDefault();
+            Exchanges = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);
+            PreferredExchange = chosen.Value;
+        }
+
+        public SelectList Exchanges { get; set; }
+
         [Display(Name = "Preferred price source (eg. bitfinex, bitstamp...)")]
         public string PreferredExchange { get; set; }
 

BTCPayServer/Payments/Lightning/CLightning/CLightningRPCClient.cs

@@ -177,7 +177,7 @@ namespace BTCPayServer.Payments.Lightning.CLightning
         async Task<LightningInvoice> ILightningInvoiceClient.CreateInvoice(LightMoney amount, string description, TimeSpan expiry, CancellationToken cancellation)
         {
             var id = InvoiceIdEncoder.EncodeData(RandomUtils.GetBytes(20));
-            var invoice = await SendCommandAsync<CLightningInvoice>("invoice", new object[] { amount.MilliSatoshi, id, description ?? "" }, cancellation: cancellation);
+            var invoice = await SendCommandAsync<CLightningInvoice>("invoice", new object[] { amount.MilliSatoshi, id, description ?? "", Math.Max(0,  (int)expiry.TotalSeconds) }, cancellation: cancellation);
             invoice.Label = id;
             invoice.MilliSatoshi = amount;
             invoice.Status = "unpaid";

BTCPayServer/Services/BTCPayServerEnvironment.cs

@@ -6,6 +6,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using System.Text;
 using NBXplorer;
+using NBitcoin;
 
 namespace BTCPayServer.Services
 {
@@ -20,13 +21,13 @@ namespace BTCPayServer.Services
 			Build = "Release";
 #endif
             Environment = env;
-            ChainType = provider.NBXplorerNetworkProvider.ChainType;
+            NetworkType = provider.NetworkType;
         }
         public IHostingEnvironment Environment
         {
             get; set;
         }
-        public ChainType ChainType { get; set; }
+        public NetworkType NetworkType { get; set; }
         public string Version
         {
             get; set;
@@ -40,7 +41,7 @@ namespace BTCPayServer.Services
         {
             get
             {
-                return ChainType == ChainType.Regtest && Environment.IsDevelopment();
+                return NetworkType == NetworkType.Regtest && Environment.IsDevelopment();
             }
         }
         public override string ToString()

BTCPayServer/Services/HardwareWalletService.cs

@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.WebSockets;
@@ -82,12 +83,13 @@ namespace BTCPayServer.Services
             if (network == null)
                 throw new ArgumentNullException(nameof(network));
 
-            var path = new KeyPath("49'").Derive(network.CoinType).Derive(account, true);
+            var segwit = network.NBitcoinNetwork.Consensus.SupportSegwit;
+            var path = network.GetRootKeyPath().Derive(account, true);
             var pubkey = await GetExtPubKey(_Ledger, network, path, false);
             var derivation = new DerivationStrategyFactory(network.NBitcoinNetwork).CreateDirectDerivationStrategy(pubkey, new DerivationStrategyOptions()
             {
-                P2SH = true,
-                Legacy = false
+                P2SH = segwit,
+                Legacy = !segwit
             });
             return new GetXPubResult() { ExtPubKey = derivation.ToString(), KeyPath = path };
         }
@@ -99,7 +101,7 @@ namespace BTCPayServer.Services
                 var pubKey = await ledger.GetWalletPubKeyAsync(account);
                 if (pubKey.Address.Network != network.NBitcoinNetwork)
                 {
-                    if (network.DefaultSettings.ChainType == NBXplorer.ChainType.Main)
+                    if (network.NBitcoinNetwork.NetworkType == NetworkType.Mainnet)
                         throw new Exception($"The opened ledger app should be for {network.NBitcoinNetwork.Name}, not for {pubKey.Address.Network}");
                 }
                 var fingerprint = onlyChaincode ? new byte[4] : (await ledger.GetWalletPubKeyAsync(account.Parent)).UncompressedPublicKey.Compress().Hash.ToBytes().Take(4).ToArray();
@@ -125,9 +127,13 @@ namespace BTCPayServer.Services
 
         private static async Task<KeyPath> GetKeyPath(LedgerClient ledger, BTCPayNetwork network, DirectDerivationStrategy directStrategy)
         {
+            List<KeyPath> derivations = new List<KeyPath>();
+            if(network.NBitcoinNetwork.Consensus.SupportSegwit)
+                derivations.Add(new KeyPath("49'"));
+            derivations.Add(new KeyPath("44'"));
             KeyPath foundKeyPath = null;
             foreach (var account in
-                                  new[] { new KeyPath("49'"), new KeyPath("44'") }
+                                  derivations
                                   .Select(purpose => purpose.Derive(network.CoinType))
                                   .SelectMany(coinType => Enumerable.Range(0, 5).Select(i => coinType.Derive(i, true))))
             {
@@ -235,6 +241,5 @@ namespace BTCPayServer.Services
         public string ExtPubKey { get; set; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.KeyPathJsonConverter))]
         public KeyPath KeyPath { get; set; }
-        public int CoinType { get; internal set; }
     }
 }

BTCPayServer/Services/LanguageService.cs

@@ -26,6 +26,7 @@ namespace BTCPayServer.Services
                 new Language("ja-JP", "日本語"),
                 new Language("fr-FR", "Français"),
                 new Language("es-ES", "Spanish"),
+                new Language("pt-PT", "Portuguese"),
                 new Language("pt-BR", "Portuguese (Brazil)"),
                 new Language("nl-NL", "Dutch"),
                 new Language("cs-CZ", "Česky"),

BTCPayServer/Services/Rates/BTCPayRateProviderFactory.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Options;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class BTCPayRateProviderFactory : IRateProviderFactory
+    {
+        IMemoryCache _Cache;
+        private IOptions<MemoryCacheOptions> _CacheOptions;
+
+        public IMemoryCache Cache
+        {
+            get
+            {
+                return _Cache;
+            }
+        }
+        public BTCPayRateProviderFactory(IOptions<MemoryCacheOptions> cacheOptions, IServiceProvider serviceProvider)
+        {
+            if (cacheOptions == null)
+                throw new ArgumentNullException(nameof(cacheOptions));
+            _Cache = new MemoryCache(cacheOptions);
+            _CacheOptions = cacheOptions;
+            // We use 15 min because of limits with free version of bitcoinaverage
+            CacheSpan = TimeSpan.FromMinutes(15.0);
+            this.serviceProvider = serviceProvider;
+        }
+
+        IServiceProvider serviceProvider;
+        TimeSpan _CacheSpan;
+        public TimeSpan CacheSpan
+        {
+            get
+            {
+                return _CacheSpan;
+            }
+            set
+            {
+                _CacheSpan = value;
+                InvalidateCache();
+            }
+        }
+
+        public void InvalidateCache()
+        {
+            _Cache = new MemoryCache(_CacheOptions);
+        }
+
+        public IRateProvider GetRateProvider(BTCPayNetwork network, RateRules rules)
+        {
+            rules = rules ?? new RateRules();
+            var rateProvider = GetDefaultRateProvider(network);
+            if (!rules.PreferredExchange.IsCoinAverage())
+            {
+                rateProvider = CreateExchangeRateProvider(network, rules.PreferredExchange);
+            }
+            rateProvider = CreateCachedRateProvider(network, rateProvider, rules.PreferredExchange);
+            return new TweakRateProvider(network, rateProvider, rules);
+        }
+
+        private IRateProvider CreateExchangeRateProvider(BTCPayNetwork network, string exchange)
+        {
+            var coinAverage = new CoinAverageRateProviderDescription(network.CryptoCode).CreateRateProvider(serviceProvider);
+            coinAverage.Exchange = exchange;
+            return coinAverage;
+        }
+
+        private CachedRateProvider CreateCachedRateProvider(BTCPayNetwork network, IRateProvider rateProvider, string additionalScope)
+        {
+            return new CachedRateProvider(network.CryptoCode, rateProvider, _Cache) { CacheSpan = CacheSpan, AdditionalScope = additionalScope };
+        }
+
+        private IRateProvider GetDefaultRateProvider(BTCPayNetwork network)
+        {
+            if(network.DefaultRateProvider == null)
+            {
+                throw new RateUnavailableException(network.CryptoCode);
+            }
+            return network.DefaultRateProvider.CreateRateProvider(serviceProvider);
+        }
+    }
+}

BTCPayServer/Services/Rates/BitpayRateProvider.cs

@@ -4,9 +4,17 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using NBitcoin;
 
 namespace BTCPayServer.Services.Rates
 {
+    public class BitpayRateProviderDescription : RateProviderDescription
+    {
+        public IRateProvider CreateRateProvider(IServiceProvider serviceProvider)
+        {
+            return new BitpayRateProvider(new Bitpay(new Key(), new Uri("https://bitpay.com/")));
+        }
+    }
     public class BitpayRateProvider : IRateProvider
     {
         Bitpay _Bitpay;

BTCPayServer/Services/Rates/CachedDefaultRateProviderFactory.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Caching.Memory;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class CachedDefaultRateProviderFactory : IRateProviderFactory
-    {
-        IMemoryCache _Cache;
-        ConcurrentDictionary<string, IRateProvider> _Providers = new ConcurrentDictionary<string, IRateProvider>();
-        ConcurrentDictionary<string, IRateProvider> _LongCacheProviders = new ConcurrentDictionary<string, IRateProvider>();
-
-        public IMemoryCache Cache
-        {
-            get
-            {
-                return _Cache;
-            }
-        }
-
-        public CachedDefaultRateProviderFactory(IMemoryCache cache)
-        {
-            if (cache == null)
-                throw new ArgumentNullException(nameof(cache));
-            _Cache = cache;
-            // Using same providers because they are both at 15 min actually...
-            _Providers = _LongCacheProviders;
-        }
-
-        public IRateProvider RateProvider { get; set; }
-
-        // We use 15 min because of limits with free version of bitcoinaverage
-        public TimeSpan CacheSpan { get; set; } = TimeSpan.FromMinutes(15.0);
-        public TimeSpan LongCacheSpan { get; set; } = TimeSpan.FromMinutes(15.0);
-        public IRateProvider GetRateProvider(BTCPayNetwork network, bool longCache)
-        {
-            return (longCache ? _LongCacheProviders : _Providers).GetOrAdd(network.CryptoCode, new CachedRateProvider(network.CryptoCode, RateProvider ?? network.DefaultRateProvider, _Cache) { CacheSpan = longCache ? LongCacheSpan : CacheSpan, AdditionalScope = longCache ? "LONG" : "SHORT" });
-        }
-    }
-}

BTCPayServer/Services/Rates/CoinAverageRateProvider.cs

@@ -1,11 +1,15 @@
 using Newtonsoft.Json;
+using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net.Http;
+using System.Security.Cryptography;
+using System.Text;
 using System.Threading.Tasks;
+using System.ComponentModel;
 
 namespace BTCPayServer.Services.Rates
 {
@@ -16,6 +20,57 @@ namespace BTCPayServer.Services.Rates
 
         }
     }
+
+    public class CoinAverageRateProviderDescription : RateProviderDescription
+    {
+        public CoinAverageRateProviderDescription(string crypto)
+        {
+            CryptoCode = crypto;
+        }
+
+        public string CryptoCode { get; set; }
+
+        public CoinAverageRateProvider CreateRateProvider(IServiceProvider serviceProvider)
+        {
+            return new CoinAverageRateProvider(CryptoCode)
+            {
+                Authenticator = serviceProvider.GetService<ICoinAverageAuthenticator>()
+            };
+        }
+
+        IRateProvider RateProviderDescription.CreateRateProvider(IServiceProvider serviceProvider)
+        {
+            return CreateRateProvider(serviceProvider);
+        }
+    }
+
+    public class GetExchangeTickersResponse
+    {
+        public class Exchange
+        {
+            public string Name { get; set; }
+            [JsonProperty("display_name")]
+            public string DisplayName { get; set; }
+            public string[] Symbols { get; set; }
+        }
+        public bool Success { get; set; }
+        public Exchange[] Exchanges { get; set; }
+    }
+
+    public class RatesSetting
+    {
+        public string PublicKey { get; set; }
+        public string PrivateKey { get; set; }
+        [DefaultValue(15)]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public int CacheInMinutes { get; set; } = 15;
+    }
+
+    public interface ICoinAverageAuthenticator
+    {
+        Task AddHeader(HttpRequestMessage message);
+    }    
+
     public class CoinAverageRateProvider : IRateProvider
     {
         static HttpClient _Client = new HttpClient();
@@ -48,17 +103,20 @@ namespace BTCPayServer.Services.Rates
             throw new RateUnavailableException(currency);
         }
 
+        public ICoinAverageAuthenticator Authenticator { get; set; }
+
         private async Task<Dictionary<string, decimal>> GetRatesCore()
         {
-            HttpResponseMessage resp = null;
-            if (Exchange == null)
+            string url = Exchange == null ? $"https://apiv2.bitcoinaverage.com/indices/{Market}/ticker/short"
+                                          : $"https://apiv2.bitcoinaverage.com/exchanges/{Exchange}";
+
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            var auth = Authenticator;
+            if (auth != null)
             {
-                resp = await _Client.GetAsync($"https://apiv2.bitcoinaverage.com/indices/{Market}/ticker/short");
-            }
-            else
-            {
-                resp = await _Client.GetAsync($"https://apiv2.bitcoinaverage.com/exchanges/{Exchange}");
+                await auth.AddHeader(request);
             }
+            var resp = await _Client.SendAsync(request);
             using (resp)
             {
 
@@ -99,5 +157,61 @@ namespace BTCPayServer.Services.Rates
                 Value = o.Value
             }).ToList();
         }
+
+        public async Task TestAuthAsync()
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, "https://apiv2.bitcoinaverage.com/blockchain/tx_price/BTCUSD/8a3b4394ba811a9e2b0bbf3cc56888d053ea21909299b2703cdc35e156c860ff");
+            var auth = Authenticator;
+            if (auth != null)
+            {
+                await auth.AddHeader(request);
+            }
+            var resp = await _Client.SendAsync(request);
+            resp.EnsureSuccessStatusCode();
+        }
+
+        public async Task<GetRateLimitsResponse> GetRateLimitsAsync()
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, "https://apiv2.bitcoinaverage.com/info/ratelimits");
+            var auth = Authenticator;
+            if (auth != null)
+            {
+                await auth.AddHeader(request);
+            }
+            var resp = await _Client.SendAsync(request);
+            resp.EnsureSuccessStatusCode();
+            var jobj = JObject.Parse(await resp.Content.ReadAsStringAsync());
+            var response = new GetRateLimitsResponse();
+            response.CounterReset = TimeSpan.FromSeconds(jobj["counter_reset"].Value<int>());
+            response.RequestsLeft = jobj["requests_left"].Value<int>();
+            return response;
+        }
+
+        public async Task<GetExchangeTickersResponse> GetExchangeTickersAsync()
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, "https://apiv2.bitcoinaverage.com/symbols/exchanges/ticker");
+            var resp = await _Client.SendAsync(request);
+            resp.EnsureSuccessStatusCode();
+            var jobj = JObject.Parse(await resp.Content.ReadAsStringAsync());
+            var response = new GetExchangeTickersResponse();
+            response.Success = jobj["success"].Value<bool>();
+            var exchanges = (JObject)jobj["exchanges"];
+            response.Exchanges = exchanges
+                .Properties()
+                .Select(p => 
+                {
+                    var exchange = JsonConvert.DeserializeObject<GetExchangeTickersResponse.Exchange>(p.Value.ToString());
+                    exchange.Name = p.Name;
+                    return exchange;
+                })
+                .ToArray();
+            return response;
+        }
+    }
+
+    public class GetRateLimitsResponse
+    {
+        public TimeSpan CounterReset { get; set; }
+        public int RequestsLeft { get; set; }
     }
 }

BTCPayServer/Services/Rates/CoinAverageSettings.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class CoinAverageSettings : ICoinAverageAuthenticator
+    {
+        private static readonly DateTime _epochUtc = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        public (String PublicKey, String PrivateKey)? KeyPair { get; set; }
+        public (String DisplayName, String Name)[] AvailableExchanges { get; set; } = Array.Empty<(String DisplayName, String Name)>();
+
+        public Task AddHeader(HttpRequestMessage message)
+        {
+            var signature = GetCoinAverageSignature();
+            if (signature != null)
+            {
+                message.Headers.Add("X-signature", signature);
+            }
+            return Task.CompletedTask;
+        }
+
+        public string GetCoinAverageSignature()
+        {
+            var keyPair = KeyPair;
+            if (!keyPair.HasValue)
+                return null;
+            if (string.IsNullOrEmpty(keyPair.Value.PublicKey) || string.IsNullOrEmpty(keyPair.Value.PrivateKey))
+                return null;
+            var timestamp = (int)((DateTime.UtcNow - _epochUtc).TotalSeconds);
+            var payload = timestamp + "." + keyPair.Value.PublicKey;
+            var digestValueBytes = new HMACSHA256(Encoding.ASCII.GetBytes(keyPair.Value.PrivateKey)).ComputeHash(Encoding.ASCII.GetBytes(payload));
+            var digestValueHex = NBitcoin.DataEncoders.Encoders.Hex.EncodeData(digestValueBytes);
+            return payload + "." + digestValueHex;
+        }
+    }
+}

BTCPayServer/Services/Rates/FallbackRateProvider.cs

@@ -5,8 +5,24 @@ using System.Threading.Tasks;
 
 namespace BTCPayServer.Services.Rates
 {
+    public class FallbackRateProviderDescription : RateProviderDescription
+    {
+        public FallbackRateProviderDescription(RateProviderDescription[] rateProviders)
+        {
+            RateProviders = rateProviders;
+        }
+
+        public RateProviderDescription[] RateProviders { get; set; }
+
+        public IRateProvider CreateRateProvider(IServiceProvider serviceProvider)
+        {
+            return new FallbackRateProvider(RateProviders.Select(r => r.CreateRateProvider(serviceProvider)).ToArray());
+        }
+    }
+
     public class FallbackRateProvider : IRateProvider
     {
+
         IRateProvider[] _Providers;
         public FallbackRateProvider(IRateProvider[] providers)
         {

BTCPayServer/Services/Rates/IRateProviderFactory.cs

@@ -1,12 +1,40 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Data;
 
 namespace BTCPayServer.Services.Rates
 {
+    public class RateRules : IEnumerable<RateRule>
+    {
+        private List<RateRule> rateRules;
+
+        public RateRules()
+        {
+            rateRules = new List<RateRule>();
+        }
+        public RateRules(List<RateRule> rateRules)
+        {
+            this.rateRules = rateRules?.ToList() ?? new List<RateRule>();
+        }
+        public string PreferredExchange { get; set; }
+
+        public IEnumerator<RateRule> GetEnumerator()
+        {
+            return rateRules.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
     public interface IRateProviderFactory
     {
-        IRateProvider GetRateProvider(BTCPayNetwork network, bool longCache);
+        IRateProvider GetRateProvider(BTCPayNetwork network, RateRules rules);
+        TimeSpan CacheSpan { get; set; }
+        void InvalidateCache();
     }
 }

BTCPayServer/Services/Rates/MockRateProvider.cs

@@ -14,14 +14,21 @@ namespace BTCPayServer.Services.Rates
 
         }
 
+        public TimeSpan CacheSpan { get; set; }
+
         public void AddMock(MockRateProvider mock)
         {
             _Mocks.Add(mock);
         }
-        public IRateProvider GetRateProvider(BTCPayNetwork network, bool longCache)
+        public IRateProvider GetRateProvider(BTCPayNetwork network, RateRules rules)
         {
             return _Mocks.FirstOrDefault(m => m.CryptoCode == network.CryptoCode);
         }
+
+        public void InvalidateCache()
+        {
+            
+        }
     }
     public class MockRateProvider : IRateProvider
     {

BTCPayServer/Services/Rates/RateProviderDescription.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services.Rates
+{
+    public interface RateProviderDescription
+    {
+        IRateProvider CreateRateProvider(IServiceProvider serviceProvider);
+    }
+}

BTCPayServer/Services/Rates/TweakRateProvider.cs

@@ -10,9 +10,9 @@ namespace BTCPayServer.Services.Rates
     {
         private BTCPayNetwork network;
         private IRateProvider rateProvider;
-        private List<RateRule> rateRules;
+        private RateRules rateRules;
 
-        public TweakRateProvider(BTCPayNetwork network, IRateProvider rateProvider, List<RateRule> rateRules)
+        public TweakRateProvider(BTCPayNetwork network, IRateProvider rateProvider, RateRules rateRules)
         {
             if (network == null)
                 throw new ArgumentNullException(nameof(network));

BTCPayServer/Services/SettingsRepository.cs

@@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore;
 using BTCPayServer.Models;
 using Microsoft.EntityFrameworkCore.Infrastructure.Internal;
 using Newtonsoft.Json;
+using System.Threading;
 
 namespace BTCPayServer.Services
 {
@@ -51,6 +52,22 @@ namespace BTCPayServer.Services
                     await ctx.SaveChangesAsync();
                 }
             }
+
+            IReadOnlyCollection<TaskCompletionSource<bool>> value;
+            lock (_Subscriptions)
+            {
+                if(_Subscriptions.TryGetValue(typeof(T), out value))
+                {
+                    _Subscriptions.Remove(typeof(T));
+                }
+            }
+            if(value != null)
+            {
+                foreach(var v in value)
+                {
+                    v.TrySetResult(true);
+                }
+            }
         }
 
         private T Deserialize<T>(string value)
@@ -62,5 +79,35 @@ namespace BTCPayServer.Services
         {
             return JsonConvert.SerializeObject(obj);
         }
+
+        MultiValueDictionary<Type, TaskCompletionSource<bool>> _Subscriptions = new MultiValueDictionary<Type, TaskCompletionSource<bool>>();
+        public async Task WaitSettingsChanged<T>(CancellationToken cancellation)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+            using (cancellation.Register(() =>
+             {
+                 try
+                 {
+                     tcs.TrySetCanceled();
+                 }
+                 catch { }
+             }))
+            {
+                lock (_Subscriptions)
+                {
+                    _Subscriptions.Add(typeof(T), tcs);
+                }
+#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+                tcs.Task.ContinueWith(_ =>
+                 {
+                     lock (_Subscriptions)
+                     {
+                         _Subscriptions.Remove(typeof(T), tcs);
+                     }
+                 }, TaskScheduler.Default);
+#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+                await tcs.Task;
+            }
+        }
     }
 }

BTCPayServer/SynchronizationContextRemover.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BTCPayServer
+{
+    public struct SynchronizationContextRemover : INotifyCompletion
+    {
+        public bool IsCompleted => SynchronizationContext.Current == null;
+
+        public void OnCompleted(Action continuation)
+        {
+            var prev = SynchronizationContext.Current;
+            try
+            {
+                SynchronizationContext.SetSynchronizationContext(null);
+                continuation();
+            }
+            finally
+            {
+                SynchronizationContext.SetSynchronizationContext(prev);
+            }
+        }
+
+        public SynchronizationContextRemover GetAwaiter()
+        {
+            return this;
+        }
+
+        public void GetResult()
+        {
+        }
+    }
+}

BTCPayServer/Views/Account/ForgotPassword.cshtml

@@ -3,23 +3,37 @@
     ViewData["Title"] = "Forgot your password?";
 }
 
-<h2>@ViewData["Title"]</h2>
-<h4>Enter your email.</h4>
-<hr />
-<div class="row">
-    <div class="col-md-4">
-        <form asp-action="ForgotPassword" method="post">
-            <div asp-validation-summary="All" class="text-danger"></div>
-            <div class="form-group">
-                <label asp-for="Email"></label>
-                <input asp-for="Email" class="form-control" />
-                <span asp-validation-for="Email" class="text-danger"></span>
+<section>
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-12 text-center">
+                @Html.Partial("_StatusMessage", TempData["StatusMessage"])
             </div>
-            <button type="submit" class="btn btn-primary">Submit</button>
-        </form>
+        </div>
+        <div class="row">
+            <div class="col-lg-12 text-center">
+                <h2 class="section-heading">@ViewData["Title"]</h2>
+                <hr class="primary">
+            </div>
+            <div class="col-md-4">
+                <form asp-action="ForgotPassword" method="post">
+                    <h4>Start password reset</h4>
+                    <hr />
+                    <p>
+                        We all forget passwords every now and then. Just provide email address tied to your account and we'll start the process of helping you recover your account.
+                    </p>
+                    <div asp-validation-summary="All" class="text-danger"></div>
+                    <div class="form-group">
+                        <label asp-for="Email"></label>
+                        <input asp-for="Email" class="form-control" />
+                        <span asp-validation-for="Email" class="text-danger"></span>
+                    </div>
+                    <button type="submit" class="btn btn-primary">Submit</button>
+                </form>
+            </div>
+        </div>
     </div>
-</div>
-
+</section>
 @section Scripts {
     @await Html.PartialAsync("_ValidationScriptsPartial")
 }

BTCPayServer/Views/Account/ForgotPasswordConfirmation.cshtml

@@ -1,8 +1,22 @@
 @{
-    ViewData["Title"] = "Forgot password confirmation";
+    ViewData["Title"] = "Email sent!";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h2></h2>
 <p>
-    Please check your email to reset your password.
 </p>
+
+
+<section>
+    <div class="container">
+        <div class="row">
+            <div class="col-md-4">
+                <h4>@ViewData["Title"]</h4>
+                <hr />
+                <p>
+                    Please check your email to reset your password.
+                </p>
+            </div>
+        </div>
+    </div>
+</section>

BTCPayServer/Views/Apps/ViewPointOfSale.cshtml

@@ -15,7 +15,7 @@
 </head>
 <body class="h-100">
     <div class="container d-flex h-100">
-        <div class="justify-content-center align-self-center text-center mx-auto">
+        <div class="justify-content-center align-self-center text-center mx-auto" style="margin: auto;">
             <h1 class="mb-4">@Model.Title</h1>
             <form method="post">
                 <div class="row">

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -87,7 +87,14 @@
                 <div class="line-items__item__label">
                     <span>{{$t("Network Cost")}}</span>
                 </div>
-                <div class="line-items__item__value" i18n="">{{srvModel.networkFeeDescription }}</div>
+                <div class="line-items__item__value">
+                    <span v-if="srvModel.IsMultiCurrency">
+                        {{ srvModel.networkFee }} {{ srvModel.cryptoCode }}
+                    </span>
+                    <span v-else>
+                        {{$t("txCount", {count: srvModel.txCount})}} x {{ srvModel.networkFee }} {{ srvModel.cryptoCode }}
+                    </span>
+                </div>
             </div>
             <div class="line-items__item">
                 <div class="line-items__item__label">
@@ -249,11 +256,9 @@
                     </div>
                 </div>
                 <div class="success-message">{{$t("This invoice has been paid")}}</div>
-                <button class="action-button">
-                    <bp-done-text>
-                        <span>{{$t("Return to StoreName", srvModel)}}</span>
-                    </bp-done-text>
-                </button>
+                <a class="action-button" :href="srvModel.merchantRefLink" v-show="srvModel.merchantRefLink">
+                    <span>{{$t("Return to StoreName", srvModel)}}</span>
+                </a>
             </div>
         </div>
         <div class="button-wrapper refund-address-form-container" id="refund-overpayment-button">
@@ -295,10 +300,9 @@
                     {{srvModel.orderId}}
                 </div>
             </div>
-            <a class="action-button" style="margin-top: 20px;">
-                <bp-done-text>
-                    <span>{{$t("Return to StoreName", srvModel)}}</span>
-                </bp-done-text>
+            <a class="action-button" :href="srvModel.merchantRefLink" v-show="srvModel.merchantRefLink"
+               style="margin-top: 20px;">
+                <span>{{$t("Return to StoreName", srvModel)}}</span>
             </a>
         </div>
     </div>

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -110,6 +110,7 @@
                 'es-ES': { translation: locales_es },
                 'ja-JP': { translation: locales_ja },
                 'fr-FR': { translation: locales_fr },
+                'pt': { translation: locales_pt },
                 'pt-BR': { translation: locales_pt_br },
                 'nl': { translation: locales_nl },
                 'cs-CZ': { translation: locales_cs },

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -10,6 +10,7 @@
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+
     .money {
         text-align: right;
     }
@@ -165,46 +166,74 @@
                     </thead>
                     <tbody>
                         @foreach(var payment in Model.CryptoPayments)
-                    {
-                        <tr>
-                            <td>@payment.PaymentMethod</td>
-                            <td>@payment.Address</td>
-                            <td class="money">@payment.Rate</td>
-                            <td class="money">@payment.Paid</td>
-                            <td class="money">@payment.Due</td>
-                        </tr>
-                }
+                        {
+                            <tr>
+                                <td>@payment.PaymentMethod</td>
+                                <td>@payment.Address</td>
+                                <td class="money">@payment.Rate</td>
+                                <td class="money">@payment.Paid</td>
+                                <td class="money">@payment.Due</td>
+                            </tr>
+                        }
                     </tbody>
                 </table>
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-12">
-                <h3>Payments</h3>
-                <table class="table table-sm">
-                    <thead class="thead-inverse">
-                        <tr>
-                            <th style="white-space:nowrap;">Payment method</th>
-                            <th>Deposit address</th>
-                            <th>Transaction Id</th>
-                            <th style="text-align:right;">Confirmations</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach(var payment in Model.Payments)
-                    {
-                            var replaced = payment.Replaced ? "text-decoration: line-through;" : "";
-                        <tr>
-                            <td style="@replaced">@payment.PaymentMethod</td>
-                            <td style="@replaced">@payment.DepositAddress</td>
-                            <td style="@replaced"><a href="@payment.TransactionLink" target="_blank">@payment.TransactionId</a></td>
-                            <td style="text-align:right;">@payment.Confirmations</td>
-                        </tr>
-                }
-                    </tbody>
-                </table>
+        @if(Model.OnChainPayments.Count > 0)
+        {
+            <div class="row">
+                <div class="col-md-12">
+                    <h3>On-Chain payments</h3>
+                    <table class="table table-sm">
+                        <thead class="thead-inverse">
+                            <tr>
+                                <th style="white-space:nowrap;">Crypto</th>
+                                <th>Deposit address</th>
+                                <th>Transaction Id</th>
+                                <th style="text-align:right;">Confirmations</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach(var payment in Model.OnChainPayments)
+                            {
+                                var replaced = payment.Replaced ? "text-decoration: line-through;" : "";
+                                <tr>
+                                    <td style="@replaced">@payment.Crypto</td>
+                                    <td style="@replaced">@payment.DepositAddress</td>
+                                    <td style="@replaced"><a href="@payment.TransactionLink" target="_blank">@payment.TransactionId</a></td>
+                                    <td style="text-align:right;">@payment.Confirmations</td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
+        }
+        @if(Model.OffChainPayments.Count > 0)
+        {
+            <div class="row">
+                <div class="col-md-12">
+                    <h3>Off-Chain payments</h3>
+                    <table class="table table-sm">
+                        <thead class="thead-inverse">
+                            <tr>
+                                <th style="white-space:nowrap;">Crypto</th>
+                                <th>BOLT11</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach(var payment in Model.OffChainPayments)
+                            {
+                                <tr>
+                                    <td style="width:50px;">@payment.Crypto</td>
+                                    <td style="max-width:100px;overflow:hidden;">@payment.BOLT11</td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        }
         <div class="row">
             <div class="col-md-12">
                 <h3>Addresses</h3>
@@ -219,11 +248,11 @@
                         @foreach(var address in Model.Addresses)
                         {
                             var current = address.Current ? "font-weight: bold;" : "";
-                        <tr>
-                            <td style="width:100px;@current">@address.PaymentMethod</td>
-                            <td style="max-width:100px;overflow:hidden;@current">@address.Destination</td>
-                        </tr>
-                    }
+                            <tr>
+                                <td style="width:100px;@current">@address.PaymentMethod</td>
+                                <td style="max-width:100px;overflow:hidden;@current">@address.Destination</td>
+                            </tr>
+                        }
                     </tbody>
                 </table>
             </div>

BTCPayServer/Views/Server/Rates.cshtml

@@ -0,0 +1,59 @@
+@model RatesViewModel
+@{
+    ViewData["Title"] = ServerNavPages.Rates;
+    ViewData.AddActivePage(ServerNavPages.Rates);
+}
+
+
+<h4>@ViewData["Title"]</h4>
+@Html.Partial("_StatusMessage", TempData["TempDataProperty-StatusMessage"])
+
+
+<div class="row">
+    <div class="col-md-6">
+        <div asp-validation-summary="All" class="text-danger"></div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-8">
+        <div class="form-group">
+            <h5>Bitcoin Average</h5>
+            <p>BTCPay relies on Bitcoin Average for getting crypto-currency to fiat rates</p>
+            <p>If you want BTCPay rate cache to be smaller than 15min, you should register to BitcoinAverage and get a paid API Key.</p>
+            <p>If your BTCPay server instance supports lot's of merchant or is used a lot, BitcoinAverage will rate limit your server, and invoice will be created using less accurate rates. (From Bitpay)<br /></p>
+        </div>
+        <form method="post">
+            <label asp-for="PublicKey"></label>
+            <div class="form-inline">
+                <input asp-for="PublicKey" style="width:50%;" class="form-control" placeholder="Public key" />
+                <label class="sr-only" asp-for="PrivateKey"></label>
+                <input asp-for="PrivateKey" style="width:50%;" class="form-control" placeholder="Private key" />
+                <p class="form-text text-muted">You can find the information on <a target="_blank" href="https://bitcoinaverage.com/en/apikeys">bitcoinaverage api key page</a></p>
+            </div>
+            <div class="form-group">
+                <label asp-for="CacheMinutes"></label>
+                <input asp-for="CacheMinutes" class="form-control" />
+                <span asp-validation-for="CacheMinutes" class="text-danger"></span>
+            </div>
+            @if(Model.RateLimits != null)
+            {
+                <h5>Current Bitcoin Average Quotas:</h5>
+                <table class="table table-sm">
+                    <tr>
+                        <th>Requests left</th>
+                        <td>@Model.RateLimits.RequestsLeft</td>
+                    </tr>
+                    <tr>
+                        <th>Quota reset in</th>
+                        <td>@Model.RateLimits.CounterReset</td>
+                    </tr>
+                </table>
+            }
+            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @await Html.PartialAsync("_ValidationScriptsPartial")
+}

BTCPayServer/Views/Server/ServerNavPages.cs

@@ -14,12 +14,14 @@ namespace BTCPayServer.Views.Server
 
 
         public static string Users => "Users";
+        public static string Rates => "Rates";
         public static string Emails => "Email server";
         public static string Policies => "Policies";
         public static string Hangfire => "Hangfire";
 
         public static string UsersNavClass(ViewContext viewContext) => PageNavClass(viewContext, Users);
         public static string EmailsNavClass(ViewContext viewContext) => PageNavClass(viewContext, Emails);
+        public static string RatesNavClass(ViewContext viewContext) => PageNavClass(viewContext, Rates);
         public static string PoliciesNavClass(ViewContext viewContext) => PageNavClass(viewContext, Policies);
         public static string HangfireNavClass(ViewContext viewContext) => PageNavClass(viewContext, Hangfire);
 

BTCPayServer/Views/Server/_Nav.cshtml

@@ -2,6 +2,7 @@
 
 <div class="nav flex-column nav-pills">
     <a class="nav-link @ServerNavPages.UsersNavClass(ViewContext)" asp-action="Users">Users</a>
+    <a class="nav-link @ServerNavPages.RatesNavClass(ViewContext)" asp-action="Rates">Rates</a>
     <a class="nav-link @ServerNavPages.EmailsNavClass(ViewContext)" asp-action="Emails">Email server</a>
     <a class="nav-link @ServerNavPages.PoliciesNavClass(ViewContext)" asp-action="Policies">Policies</a>
     <a class="nav-link @ServerNavPages.HangfireNavClass(ViewContext)" href="~/hangfire" target="_blank">Hangfire</a>

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -38,9 +38,9 @@
         <div class="container">
             <a class="navbar-brand js-scroll-trigger" href="~/">
                 <img src="~/img/logo.png" height="45">
-                @if (env.ChainType != NBXplorer.ChainType.Main)
+                @if (env.NetworkType != NBitcoin.NetworkType.Mainnet)
                 {
-                    <span class="badge badge-warning" style="font-size:10px;">@env.ChainType.ToString()</span>
+                    <span class="badge badge-warning" style="font-size:10px;">@env.NetworkType.ToString()</span>
                 }
             </a>
             <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">

BTCPayServer/Views/Stores/AddDerivationScheme.cshtml

@@ -35,7 +35,7 @@
                         <ul>
                             @for (int i = 0; i < 4; i++)
                             {
-                                <li><a class="ledger-info-recommended" data-ledgeraccount="@i" href="#">Account @i (49'/<span class="ledger-info-cointype">0</span>'/@i')</a></li>
+                                <li><a class="ledger-info-recommended" data-ledgeraccount="@i" href="#">Account @i (<span>@Model.RootKeyPath.Derive(i, true)</span>)</a></li>
                             }
                         </ul>
                     </div>

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -36,10 +36,10 @@
             </div>
             <div class="form-group">
                 <label asp-for="PreferredExchange"></label>
-                <input asp-for="PreferredExchange" class="form-control" />
+                <select asp-for="PreferredExchange" asp-items="Model.Exchanges" class="form-control"></select>
                 <span asp-validation-for="PreferredExchange" class="text-danger"></span>
                 <p id="PreferredExchangeHelpBlock" class="form-text text-muted">
-                    Current price source is <a href="@Model.RateSource" target="_blank">@Model.PreferredExchange</a>.<small> (using 1 minute cache)</small>
+                    Current price source is <a href="@Model.RateSource" target="_blank">@Model.PreferredExchange</a>.
                 </p>
             </div>
             <div class="form-group">
@@ -81,13 +81,13 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (var scheme in Model.DerivationSchemes)
+                        @foreach(var scheme in Model.DerivationSchemes)
                         {
                             <tr>
                                 <td>@scheme.Crypto</td>
                                 <td style="max-width:300px;overflow:hidden;">@scheme.Value</td>
                                 <td style="text-align:right">
-                                    @if (!string.IsNullOrWhiteSpace(scheme.Value))
+                                    @if(!string.IsNullOrWhiteSpace(scheme.Value))
                                     {
                                         <a asp-action="Wallet" asp-route-cryptoCode="@scheme.Crypto">Wallet</a><span> - </span>
                                     }
@@ -117,7 +117,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach (var scheme in Model.LightningNodes)
+                            @foreach(var scheme in Model.LightningNodes)
                             {
                                 <tr>
                                     <td>@scheme.CryptoCode</td>

BTCPayServer/wwwroot/checkout/js/core.js

@@ -32,15 +32,6 @@ function onDataCallback(jsonData) {
             $(".modal-dialog").removeClass("expired");
         }
 
-        if (srvModel.merchantRefLink !== "") {
-            $(".action-button").click(function () {
-                window.location.href = srvModel.merchantRefLink;
-            });
-        }
-        else {
-            $(".action-button").hide();
-        }
-
         $(".modal-dialog").addClass("paid");
 
         resetTabsSlider();

BTCPayServer/wwwroot/checkout/js/langs/cs.js

@@ -47,5 +47,8 @@ Můžete se vrátit do {{storeName}}, pokud chcete svojí objednávku založit z
     "Archived_Body": "Prosíme kontaktujte prodejce pro informace o objednávce a případnou pomoc",
     // Lightning
     "BOLT 11 Invoice": "BOLT 11 Faktura",
-    "Node Info": "Info o uzlu"
+    "Node Info": "Info o uzlu",
+    //
+    "txCount": "{{count}} transakce",
+    "txCount_plural": "{{count}} transakcí"
 };

BTCPayServer/wwwroot/checkout/js/langs/de.js

@@ -5,8 +5,8 @@ const locales_de = {
     "Awaiting Payment...": "Warten auf Zahlung...",
     "Pay with": "Bezahlen mit",
     "Contact and Refund Email": "Kontakt und Rückerstattungs Email",
-    "Contact_Body": "Bitte geben Sie unten eine E-Mail-Adresse an. Wir werden Sie unter dieser Adresse kontaktieren, wenn ein Problem mit Ihrer Zahlung vorliegt.",
-    "Your email": "Deine Email",
+    "Contact_Body": "Bitte geben Sie unten eine E-Mail-Adresse an. Wir werden Sie unter dieser Adresse kontaktieren, falls ein Problem mit Ihrer Zahlung vorliegt.",
+    "Your email": "Ihre Email-Adresse",
     "Continue": "Fortsetzen",
     "Please enter a valid email address": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
     "Order Amount": "Bestellbetrag",
@@ -16,19 +16,19 @@ const locales_de = {
     // Tabs
     "Scan": "Scan",
     "Copy": "Kopieren",
-    "Conversion": "Umwandlung",
+    "Conversion": "Umrechnung",
     // Scan tab
-    "Open in wallet": "In der Brieftasche öffnen",
+    "Open in wallet": "In der Wallet öffnen",
     // Copy tab
     "CompletePay_Body": "Um Ihre Zahlung abzuschließen, senden Sie bitte {{btcDue}} {{cryptoCode}} an die unten angegebene Adresse.",
     "Amount": "Menge",
     "Address": "Adresse",
     "Copied": "Kopiert",
     // Conversion tab
-    "ConversionTab_BodyTop": "Sie können {{btcDue}} {{cryptoCode}} mit altcoins bezahlen, die nicht direkt vom Händler unterstützt werden.",
-    "ConversionTab_BodyDesc": "Dieser Service wird von Drittanbietern bereitgestellt. Bitte beachten Sie, dass wir keine Kontrolle darüber haben, wie die Anbieter Ihre Gelder weiterleiten. Die Rechnung wird erst bezahlt, wenn das Geld in {{cryptoCode}} Blockchain eingegangen ist.",
+    "ConversionTab_BodyTop": "Sie können {{btcDue}} {{cryptoCode}} mit Altcoins bezahlen, die nicht direkt vom Händler unterstützt werden.",
+    "ConversionTab_BodyDesc": "Dieser Service wird von Drittanbietern bereitgestellt. Bitte beachten Sie, dass wir keine Kontrolle darüber haben, wie die Anbieter Ihre Gelder weiterleiten. Die Rechnung wird erst als bezahlt markiert, wenn das Geld in {{cryptoCode}} Blockchain eingegangen ist.",
     "Shapeshift_Button_Text": "Bezahlen mit Altcoins",
-    "ConversionTab_Lightning": "Für Lightning Network-Zahlungen sind keine Conversion-Anbieter verfügbar.",
+    "ConversionTab_Lightning": "Für Lightning Network-Zahlungen sind keine Umrechnungsanbieter verfügbar.",
     // Invoice expired
     "Invoice expiring soon...": "Die Rechnung läuft bald ab...",
     "Invoice expired": "Die Rechnung ist abgelaufen",
@@ -36,7 +36,7 @@ const locales_de = {
     "InvoiceExpired_Body_1": "Diese Rechnung ist abgelaufen. Eine Rechnung ist nur für {{maxTimeMinutes}} Minuten gültig. \
 Sie können zu {{storeName}} zurückkehren, wenn Sie Ihre Zahlung erneut senden möchten.",
     "InvoiceExpired_Body_2": "Wenn Sie versucht haben, eine Zahlung zu senden, wurde sie vom Bitcoin-Netzwerk noch nicht akzeptiert. Wir haben Ihre Gelder noch nicht erhalten.",
-    "InvoiceExpired_Body_3": "Wenn die Transaktion vom Bitcoin-Netzwerk nicht akzeptiert wird, ist das Geld wieder in Ihrer Brieftasche verfügbar. Abhängig von Ihrem Geldbeutel, kann dies 48-72 Stunden dauern.",
+    "InvoiceExpired_Body_3": "Wenn die Transaktion vom Bitcoin-Netzwerk nicht akzeptiert wird, ist das Geld wieder in Ihrer Wallet verfügbar. Abhängig von Ihrer Wallet, kann dies 48-72 Stunden dauern.",
     "Invoice ID": "Rechnungs ID",
     "Order ID": "Auftrag ID",
     "Return to StoreName": "Zurück zu {{storeName}}",
@@ -44,5 +44,11 @@ Sie können zu {{storeName}} zurückkehren, wenn Sie Ihre Zahlung erneut senden
     "This invoice has been paid": "Diese Rechnung wurde bezahlt",
     // Invoice archived
     "This invoice has been archived": "Diese Rechnung wurde archiviert",
-    "Archived_Body": "Bitte kontaktieren Sie den Shop für Bestellinformationen oder Hilfe"
+    "Archived_Body": "Bitte kontaktieren Sie den Shop für Bestellinformationen oder Hilfe",
+    // Lightning
+    "BOLT 11 Invoice": "BOLT 11 Rechnung",
+    "Node Info": "Netzwerkknoten Info",
+    //
+    "txCount": "{{count}} transaktion",
+    "txCount_plural": "{{count}} transaktionen"
 };

BTCPayServer/wwwroot/checkout/js/langs/en.js

@@ -47,5 +47,8 @@ You can return to {{storeName}} if you would like to submit your payment again."
     "Archived_Body": "Please contact the store for order information or assistance",
     // Lightning
     "BOLT 11 Invoice": "BOLT 11 Invoice",
-    "Node Info": "Node Info"
+    "Node Info": "Node Info",
+    //
+    "txCount": "{{count}} transaction",
+    "txCount_plural": "{{count}} transactions"
 };

BTCPayServer/wwwroot/checkout/js/langs/es.js

@@ -44,7 +44,10 @@ const locales_es = {
     // Invoice archived
     "This invoice has been archived": "Esta factura ha sido archivada",
     "Archived_Body": "Por favor, comuníquese con la tienda para obtener información de su pedido o asistencia",
-     // Lightning
+    // Lightning
     "BOLT 11 Invoice": "Factura BOLT 11",
-    "Node Info": "Información del nodo"
-    };
+    "Node Info": "Información del nodo",
+    //
+    "txCount": "{{count}} transacción",
+    "txCount_plural": "{{count}} transacciones"
+};

BTCPayServer/wwwroot/checkout/js/langs/fr.js

@@ -47,5 +47,8 @@ Vous pouvez revenir sur {{storeName}} si vous voulez resoumettre votre paiement.
     "Archived_Body": "Merci de contacter le marchand pour plus d'assistance ou d'information sur cette commande.",
     // Lightning
     "BOLT 11 Invoice": "Facture BOLT 11",
-    "Node Info": "Information du noeud"
+    "Node Info": "Information du noeud",
+    //
+    "txCount": "{{count}} transaction",
+    "txCount_plural": "{{count}} transactions"
 };

BTCPayServer/wwwroot/checkout/js/langs/ja.js

@@ -47,5 +47,8 @@
     "Archived_Body": "ご注文に関わる詳細などでお困りの場合はお店の担当窓口へお問い合わせください。",
     // Lightning
     "BOLT 11 Invoice": "お支払いコード",
-    "Node Info": "接続情報"
+    "Node Info": "接続情報",
+    //
+    "txCount": "取引 {{count}} 個",
+    "txCount_plural": "取引 {{count}} 個"
 };

BTCPayServer/wwwroot/checkout/js/langs/nl.js

@@ -47,5 +47,8 @@ Je kan terug komen naar {{storeName}} indien je nog eens je betaling wilt prober
     "Archived_Body": "Bedankt om de winkel te contacteren voor bijstand met of informatie over deze bestelling",
     // Lightning
     "BOLT 11 Invoice": "BOLT 11 Factuur",
-    "Node Info": "Node Info"
+    "Node Info": "Node Info",
+	//
+    "txCount": "{{count}} transactie",
+    "txCount_plural": "{{count}} transacties"
 };

BTCPayServer/wwwroot/checkout/js/langs/pt.js

@@ -0,0 +1,54 @@
+const locales_pt = {
+    nested: {
+        lang: 'Idioma'
+    },
+    "Awaiting Payment...": "A Aguardar Pagamento...",
+    "Pay with": "Pague com",
+    "Contact and Refund Email": "E-mail de Contacto e Reembolso",
+    "Contact_Body": "Por favor indique um e-mail abaixo. Entraremos em contacto para este endereço se ocorrer algum problema com o seu pagamento.",
+    "Your email": "O seu e-mail",
+    "Continue": "Continuar",
+    "Please enter a valid email address": "Por favor introduza um e-mail válido",
+    "Order Amount": "Valor da Encomenda",
+    "Network Cost": "Custo da Rede",
+    "Already Paid": "Já Pago",
+    "Due": "Devido",
+    // Tabs
+    "Scan": "Digitalizar",
+    "Copy": "Copiar",
+    "Conversion": "Conversão",
+    // Scan tab
+    "Open in wallet": "Abrir na carteira",
+    // Copy tab
+    "CompletePay_Body": "Para completar o seu pagamento, por favor envie {{btcDue}} {{cryptoCode}} para o endereço abaixo.",
+    "Amount": "Quantia",
+    "Address": "Endereço",
+    "Copied": "Copiado",
+    // Conversion tab
+    "ConversionTab_BodyTop": "Pode pagar {{btcDue}} {{cryptoCode}} utilizando outras altcoins além das que a loja aceita diretamente.",
+    "ConversionTab_BodyDesc": "Este serviço é oferecido por terceiros. Por favor tenha em mente que não temos qualquer controlo sobre como os seus fundos serão utilizados. A fatura será marcada como paga apenas quando os fundos forem recebidos na Blockchain {{cryptoCode}}.",
+    "Shapeshift_Button_Text": "Pagar com Altcoins",
+    "ConversionTab_Lightning": "Não há fornecedores de conversão disponíveis para pagamentos via Lightning Network.",
+    // Invoice expired
+    "Invoice expiring soon...": "A fatura está a expirar...",
+    "Invoice expired": "Fatura expirada",
+    "What happened?": "O que aconteceu?",
+    "InvoiceExpired_Body_1": "Esta fatura expirou. Uma fatura é válida durante {{maxTimeMinutes}} minutos.  \
+Pode voltar para {{storeName}} se quiser enviar o seu pagamento novamente.",
+    "InvoiceExpired_Body_2": "Se tentou enviar um pagamento, ele ainda não foi aceite pela rede Bitcoin. Nós ainda não recebemos o valor enviado.",
+    "InvoiceExpired_Body_3": "Se a transação não for aceite pela rede Bitcoin, o valor voltará para sua carteira. Dependendo da sua carteira, isto pode demorar entre 48 e 72 horas.",
+    "Invoice ID": "Nº da Fatura",
+    "Order ID": "Nº da Encomenda",
+    "Return to StoreName": "Voltar para {{storeName}}",
+    // Invoice paid
+    "This invoice has been paid": "Esta fatura foi paga",
+    // Invoice archived
+    "This invoice has been archived": "Esta fatura foi arquivada",
+    "Archived_Body": "Por favor, entre em contacto com o vendedor para informações e suporte",
+    // Lightning
+    "BOLT 11 Invoice": "Fatura BOLT 11",
+    "Node Info": "Informação do Nó",
+    //
+    "txCount": "{{count}} transação",
+    "txCount_plural": "{{count}} transações"
+};

BTCPayServer/wwwroot/checkout/js/langs/pt_BR.js

@@ -2,23 +2,23 @@ const locales_pt_br = {
     nested: {
         lang: 'Idioma'
     },
-    "Awaiting Payment...": "Esperando o pagamento...",
+    "Awaiting Payment...": "Aguardando o pagamento...",
     "Pay with": "Pague com",
-    "Contact and Refund Email": "Email de contato e reembolso",
-    "Contact_Body": "Por favor, forneça um email abaixo. Nós iremos contactar você se algum problema ocorrer com o seu pagamento.",
-    "Your email": "Seu email",
-    "Continue": "Continue",
-    "Please enter a valid email address": "Por favor, entre com um email válido",
+    "Contact and Refund Email": "E-mail de contato e reembolso",
+    "Contact_Body": "Por favor, informe um e-mail abaixo. Nós entraremos em contato se algum problema ocorrer com o seu pagamento.",
+    "Your email": "Seu e-mail",
+    "Continue": "Continuar",
+    "Please enter a valid email address": "Por favor, informe um e-mail válido",
     "Order Amount": "Valor do pedido",
     "Network Cost": "Custo da rede",
     "Already Paid": "Já foi pago",
     "Due": "Devido",
     // Tabs
-    "Scan": "Escaneie",
-    "Copy": "Copie",
+    "Scan": "Escanear",
+    "Copy": "Copiar",
     "Conversion": "Conversão",
     // Scan tab
-    "Open in wallet": "Abra na carteira",
+    "Open in wallet": "Abrir na carteira",
     // Copy tab
     "CompletePay_Body": "Para completar seu pagamento, por favor envie {{btcDue}} {{cryptoCode}} para o endereço abaixo.",
     "Amount": "Quantia",
@@ -27,22 +27,28 @@ const locales_pt_br = {
     // Conversion tab
     "ConversionTab_BodyTop": "Você pode pagar {{btcDue}} {{cryptoCode}} utilizando outras altcoins além das que a loja aceita diretamente.",
     "ConversionTab_BodyDesc": "Esse serviço é oferecido por terceiros. Por favor, tenha em mente que não temos nenhum controle sobre como seus fundos serão utilizados. A fatura apenas será marcada como paga quando os fundos forem recebidos na Blockchain {{cryptoCode}}.",
-    "Shapeshift_Button_Text": "Pague com Altcoins",
+    "Shapeshift_Button_Text": "Pagar com Altcoins",
     "ConversionTab_Lightning": "Não há provedores de conversão disponíveis para pagamentos via Lightning Network.",
     // Invoice expired
-    "Invoice expiring soon...": "A fatura está vencendo...",
-    "Invoice expired": "Fatura vencida",
+    "Invoice expiring soon...": "A fatura está expirando...",
+    "Invoice expired": "Fatura expirada",
     "What happened?": "O que aconteceu?",
-    "InvoiceExpired_Body_1": "Essa fatura vence. Uma fatura é válida apenas por {{maxTimeMinutes}} minutos.  \
-Você pode retornar à {{storeName}} se desejar enviar seu pagamento novamente.",
-    "InvoiceExpired_Body_2": "Se você tentou enviar um pagamento, o mesmo não foi aceito pela rede Bitcoin. Nós não recebemos ainda o valor enviado.",
-    "InvoiceExpired_Body_3": "Se a transação não for aceita pela rede Bitcoin, o valor retornará à sua carteira. Dependendo da sua carteira, isso pode demorar de 48 a 72 horas.",
+    "InvoiceExpired_Body_1": "Essa fatura expirou. Uma fatura é válida por apenas {{maxTimeMinutes}} minutos.  \
+Você pode voltar para {{storeName}} se quiser enviar o seu pagamento novamente.",
+    "InvoiceExpired_Body_2": "Se você tentou enviar um pagamento, ele ainda não foi aceito pela rede Bitcoin. Nós ainda não recebemos o valor enviado.",
+    "InvoiceExpired_Body_3": "Se a transação não for aceita pela rede Bitcoin, o valor voltará para sua carteira. Dependendo da sua carteira, isso pode demorar de 48 a 72 horas.",
     "Invoice ID": "Nº da Fatura",
     "Order ID": "Nº do Pedido",
-    "Return to StoreName": "Retornar à {{storeName}}",
+    "Return to StoreName": "Voltar para {{storeName}}",
     // Invoice paid
     "This invoice has been paid": "Essa fatura foi paga",
     // Invoice archived
     "This invoice has been archived": "Essa fatura foi arquivada",
-    "Archived_Body": "Por favor, contate o estabelecimento para informações e suporte"
+    "Archived_Body": "Por favor, entre em contato com o estabelecimento para informações e suporte",
+    // Lightning
+    "BOLT 11 Invoice": "Fatura BOLT 11",
+    "Node Info": "Informação de nó",
+    //
+    "txCount": "{{count}} transação",
+    "txCount_plural": "{{count}} transações"
 };

BTCPayServer/wwwroot/js/StoreAddDerivationScheme.js

@@ -52,7 +52,6 @@
                     Write('check', 'success', 'This store is configured to use your ledger');
                     $("#no-ledger-info").css("display", "none");
                     $("#ledger-info").css("display", "block");
-                    $(".ledger-info-cointype").text(result.coinType);
                 }
             });
     };

BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css

@@ -4,7 +4,7 @@
  * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
-/*:root {
+:root {
   --blue: #007bff;
   --indigo: #6610f2;
   --purple: #6f42c1;
@@ -32,7 +32,7 @@
   --breakpoint-lg: 992px;
   --breakpoint-xl: 1200px;
   --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; }*/
+  --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; }
 
 *,
 *::before,