Bump

Croatian 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)
@@ -120,9 +126,8 @@ namespace BTCPayServer.Tests
                     .Build();
             _Host.Start();
             InvoiceRepository = (InvoiceRepository)_Host.Services.GetService(typeof(InvoiceRepository));
-            ((LightningLikePaymentHandler)_Host.Services.GetService(typeof(IPaymentMethodHandler<LightningSupportedPaymentMethod>))).SkipP2PTest = !InContainer;
         }
-        
+
         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/TestAccount.cs

@@ -132,7 +132,8 @@ namespace BTCPayServer.Tests
             {
                 Url = connectionType == LightningConnectionType.Charge ? parent.MerchantCharge.Client.Uri.AbsoluteUri :
                       connectionType == LightningConnectionType.CLightning ? parent.MerchantLightningD.Address.AbsoluteUri
-                      : throw new NotSupportedException(connectionType.ToString())
+                      : throw new NotSupportedException(connectionType.ToString()),
+                SkipPortTest = true
             }, "save", "BTC");
             if (storeController.ModelState.ErrorCount != 0)
                 Assert.False(true, storeController.ModelState.FirstOrDefault().Value.Errors[0].ErrorMessage);

BTCPayServer.Tests/UnitTest1.cs

@@ -32,6 +32,9 @@ using BTCPayServer.HostedServices;
 using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Services.Apps;
+using BTCPayServer.Services.Stores;
+using System.Net.Http;
+using System.Text;
 
 namespace BTCPayServer.Tests
 {
@@ -598,8 +601,18 @@ namespace BTCPayServer.Tests
             var search = new SearchString(filter);
             Assert.Equal("storeid:abc status:abed blabhbalh", search.ToString());
             Assert.Equal("blabhbalh", search.TextSearch);
-            Assert.Equal("abc", search.Filters["storeid"]);
-            Assert.Equal("abed", search.Filters["status"]);
+            Assert.Single(search.Filters["storeid"]);
+            Assert.Single(search.Filters["status"]);
+            Assert.Equal("abc", search.Filters["storeid"].First());
+            Assert.Equal("abed", search.Filters["status"].First());
+
+            filter = "status:abed status:abed2";
+            search = new SearchString(filter);
+            Assert.Equal("status:abed status:abed2", search.ToString());
+            Assert.Throws<KeyNotFoundException>(() => search.Filters["test"]);
+            Assert.Equal(2, search.Filters["status"].Count);
+            Assert.Equal("abed", search.Filters["status"].First());
+            Assert.Equal("abed2", search.Filters["status"].Skip(1).First());
         }
 
         [Fact]
@@ -613,15 +626,87 @@ namespace BTCPayServer.Tests
                 user.GrantAccess();
                 user.RegisterDerivationScheme("BTC");
                 Assert.True(user.BitPay.TestAccess(Facade.Merchant));
+
+                // Can generate API Key
+                var repo = tester.PayTester.GetService<TokenRepository>();
+                Assert.Empty(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult());
+                Assert.IsType<RedirectToActionResult>(user.GetController<StoresController>().GenerateAPIKey(user.StoreId).GetAwaiter().GetResult());
+
+                var apiKey = Assert.Single(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult());
+                ///////
+
+                // Generating a new one remove the previous
+                Assert.IsType<RedirectToActionResult>(user.GetController<StoresController>().GenerateAPIKey(user.StoreId).GetAwaiter().GetResult());
+                var apiKey2 = Assert.Single(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult());
+                Assert.NotEqual(apiKey, apiKey2);
+                ////////
+
+                apiKey = apiKey2;
+
+                // Can create an invoice with this new API Key
+                HttpClient client = new HttpClient();
+                HttpRequestMessage message = new HttpRequestMessage(HttpMethod.Post, tester.PayTester.ServerUri.AbsoluteUri + "invoices");
+                message.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", Encoders.Base64.EncodeData(Encoders.ASCII.DecodeData(apiKey)));
+                var invoice = new Invoice()
+                {
+                    Price = 5000.0,
+                    Currency = "USD"
+                };
+                message.Content = new StringContent(JsonConvert.SerializeObject(invoice), Encoding.UTF8, "application/json");
+                var result = client.SendAsync(message).GetAwaiter().GetResult();
+                result.EnsureSuccessStatusCode();
+                /////////////////////
             }
         }
 
+        [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 +916,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
@@ -945,7 +1030,7 @@ namespace BTCPayServer.Tests
                 Assert.Equal("orange", vmview.Items[1].Title);
                 Assert.Equal(10.0m, vmview.Items[1].Price.Value);
                 Assert.Equal("$5.00", vmview.Items[0].Price.Formatted);
-                Assert.IsType<RedirectResult>(apps.ViewPointOfSale(appId, "orange").Result);
+                Assert.IsType<RedirectResult>(apps.ViewPointOfSale(appId, 0, "orange").Result);
                 var invoice = user.BitPay.GetInvoices().First();
                 Assert.Equal(10.00, invoice.Price);
                 Assert.Equal("CAD", invoice.Currency);
@@ -1012,13 +1097,13 @@ namespace BTCPayServer.Tests
                 {
                     var textSearchResult = tester.PayTester.InvoiceRepository.GetInvoices(new InvoiceQuery()
                     {
-                        StoreId = user.StoreId,
+                        StoreId = new[] { user.StoreId },
                         TextSearch = invoice.OrderId
                     }).GetAwaiter().GetResult();
                     Assert.Single(textSearchResult);
                     textSearchResult = tester.PayTester.InvoiceRepository.GetInvoices(new InvoiceQuery()
                     {
-                        StoreId = user.StoreId,
+                        StoreId = new[] { user.StoreId },
                         TextSearch = invoice.Id
                     }).GetAwaiter().GetResult();
 
@@ -1143,6 +1228,26 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        public void CheckQuadrigacxRateProvider()
+        {
+            var quadri = new QuadrigacxRateProvider("BTC");
+            var rates = quadri.GetRatesAsync().GetAwaiter().GetResult();
+            Assert.NotEmpty(rates);
+            Assert.NotEqual(0.0m, rates.First().Value);
+            Assert.NotEqual(0.0m, quadri.GetRateAsync("CAD").GetAwaiter().GetResult());
+            Assert.NotEqual(0.0m, quadri.GetRateAsync("USD").GetAwaiter().GetResult());
+            Assert.Throws<RateUnavailableException>(() => quadri.GetRateAsync("IOEW").GetAwaiter().GetResult());
+
+            quadri = new QuadrigacxRateProvider("LTC");
+            rates = quadri.GetRatesAsync().GetAwaiter().GetResult();
+            Assert.NotEmpty(rates);
+            Assert.NotEqual(0.0m, rates.First().Value);
+            Assert.NotEqual(0.0m, quadri.GetRateAsync("CAD").GetAwaiter().GetResult());
+            Assert.Throws<RateUnavailableException>(() => quadri.GetRateAsync("IOEW").GetAwaiter().GetResult());
+            Assert.Throws<RateUnavailableException>(() => quadri.GetRateAsync("USD").GetAwaiter().GetResult());
+        }
+
         [Fact]
         public void CheckRatesProvider()
         {
@@ -1164,7 +1269,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/UnitTestPeusa.cs

@@ -1,52 +0,0 @@
-using NBitcoin;
-using NBitcoin.DataEncoders;
-using NBitpayClient;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Xunit;
-
-namespace BTCPayServer.Tests
-{
-    // Helper class for testing functionality and generating data needed during coding/debuging
-    public class UnitTestPeusa
-    {
-        // Unit test that generates temorary checkout Bitpay page
-        // https://forkbitpay.slack.com/archives/C7M093Z55/p1508293682000217
-
-        // Testnet of Bitpay down
-        //[Fact]
-        //public void BitpayCheckout()
-        //{
-        //    var key = new Key(Encoders.Hex.DecodeData("7b70a06f35562873e3dcb46005ed0fe78e1991ad906e56adaaafa40ba861e056"));
-        //    var url = new Uri("https://test.bitpay.com/");
-        //    var btcpay = new Bitpay(key, url);
-        //    var invoice = btcpay.CreateInvoice(new Invoice()
-        //    {
-
-        //        Price = 5.0,
-        //        Currency = "USD",
-        //        PosData = "posData",
-        //        OrderId = "cdfd8a5f-6928-4c3b-ba9b-ddf438029e73",
-        //        ItemDesc = "Hello from the otherside"
-        //    }, Facade.Merchant);
-
-        //    // go to invoice.Url
-        //    Console.WriteLine(invoice.Url);
-        //}
-
-        // Generating Extended public key to use on http://localhost:14142/stores/{storeId}
-        [Fact]
-        public void GeneratePubkey()
-        {
-            var network = Network.RegTest;
-
-            ExtKey masterKey = new ExtKey();
-            Console.WriteLine("Master key : " + masterKey.ToString(network));
-            ExtPubKey masterPubKey = masterKey.Neuter();
-
-            ExtPubKey pubkey = masterPubKey.Derive(0);
-            Console.WriteLine("PubKey " + 0 + " : " + pubkey.ToString(network));
-        }
-    }
-}

BTCPayServer.Tests/docker-compose.yml

@@ -46,7 +46,7 @@ services:
       - lightning-charged
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.1.25
+    image: nicolasdorier/nbxplorer:1.0.2.2
     ports:
       - "32838:32838"
     expose: 
@@ -89,7 +89,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: nicolasdorier/clightning:0.0.0.2
+    image: nicolasdorier/clightning:0.0.0.11-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -98,6 +98,7 @@ services:
         network=regtest
         ipaddr=customer_lightningd
         log-level=debug
+        dev-broadcast-interval=1000
     ports:
       - "30992:9835" # api port
     expose:
@@ -110,7 +111,7 @@ services:
       - bitcoind
 
   lightning-charged:
-    image: shesek/lightning-charge:0.3.7
+    image: shesek/lightning-charge:0.3.9
     environment:
       NETWORK: regtest
       API_TOKEN: foiewnccewuify
@@ -129,7 +130,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: nicolasdorier/clightning:0.0.0.2
+    image: nicolasdorier/clightning:0.0.0.11-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -138,6 +139,7 @@ services:
         ipaddr=merchant_lightningd
         network=regtest
         log-level=debug
+        dev-broadcast-interval=1000
     ports:
       - "30993:9835" # api port
     expose:

BTCPayServer/Authentication/BitIdentity.cs

@@ -1,35 +0,0 @@
-using NBitcoin;
-using NBitcoin.DataEncoders;
-using System;
-using System.Collections.Generic;
-using System.Security.Principal;
-using System.Text;
-
-namespace BTCPayServer.Authentication
-{
-    public class BitIdentity : IIdentity
-    {
-        public BitIdentity(PubKey key)
-        {
-            PubKey = key;
-            _Name = Encoders.Base58Check.EncodeData(Encoders.Hex.DecodeData("0f02" + key.Hash.ToString()));
-            SIN = NBitpayClient.Extensions.BitIdExtensions.GetBitIDSIN(key);
-        }
-        string _Name;
-
-        public string SIN
-        {
-            get;
-        }
-        public PubKey PubKey
-        {
-            get;
-        }
-
-        public string AuthenticationType => "BitID";
-
-        public bool IsAuthenticated => true;
-
-        public string Name => _Name;
-    }
-}

BTCPayServer/Authentication/TokenRepository.cs

@@ -33,6 +33,8 @@ namespace BTCPayServer.Authentication
 
         public async Task<BitTokenEntity[]> GetTokens(string sin)
         {
+            if (sin == null)
+                return Array.Empty<BitTokenEntity>();
             using (var ctx = _Factory.CreateContext())
             {
                 return (await ctx.PairedSINData
@@ -43,6 +45,46 @@ namespace BTCPayServer.Authentication
             }
         }
 
+        public async Task<String> GetStoreIdFromAPIKey(string apiKey)
+        {
+            using (var ctx = _Factory.CreateContext())
+            {
+                return await ctx.ApiKeys.Where(o => o.Id == apiKey).Select(o => o.StoreId).FirstOrDefaultAsync();
+            }
+        }
+
+        public async Task GenerateLegacyAPIKey(string storeId)
+        {
+            // It is legacy support and Bitpay generate string of unknown format, trying to replicate them
+            // as good as possible. The string below got generated for me.
+            var chars = "ERo0vkBMOYhyU0ZHvirCplbLDIGWPdi1ok77VnW7QdE";
+            var rand = new Random(Math.Abs(RandomUtils.GetInt32()));
+            var generated = new char[chars.Length];
+            for (int i = 0; i < generated.Length; i++)
+            {
+                generated[i] = chars[rand.Next(0, generated.Length)];
+            }
+
+            using (var ctx = _Factory.CreateContext())
+            {
+                var existing = await ctx.ApiKeys.Where(o => o.StoreId == storeId).FirstOrDefaultAsync();
+                if (existing != null)
+                {
+                    ctx.ApiKeys.Remove(existing);
+                }
+                ctx.ApiKeys.Add(new APIKeyData() { Id = new string(generated), StoreId = storeId });
+                await ctx.SaveChangesAsync().ConfigureAwait(false);
+            }
+        }
+
+        public async Task<string[]> GetLegacyAPIKeys(string storeId)
+        {
+            using (var ctx = _Factory.CreateContext())
+            {
+                return await ctx.ApiKeys.Where(o => o.StoreId == storeId).Select(c => c.Id).ToArrayAsync();
+            }
+        }
+
         private BitTokenEntity CreateTokenEntity(PairedSINData data)
         {
             return new BitTokenEntity()

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,21 +2,25 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.76</Version>
+		<Version>1.0.1.94</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
     <Compile Remove="wwwroot\bundles\jqueryvalidate\**" />
+    <Compile Remove="wwwroot\css\**" />
     <Compile Remove="wwwroot\vendor\jquery-nice-select\**" />
     <Content Remove="Build\dockerfiles\**" />
     <Content Remove="wwwroot\bundles\jqueryvalidate\**" />
+    <Content Remove="wwwroot\css\**" />
     <Content Remove="wwwroot\vendor\jquery-nice-select\**" />
     <EmbeddedResource Remove="Build\dockerfiles\**" />
     <EmbeddedResource Remove="wwwroot\bundles\jqueryvalidate\**" />
+    <EmbeddedResource Remove="wwwroot\css\**" />
     <EmbeddedResource Remove="wwwroot\vendor\jquery-nice-select\**" />
     <None Remove="Build\dockerfiles\**" />
     <None Remove="wwwroot\bundles\jqueryvalidate\**" />
+    <None Remove="wwwroot\css\**" />
     <None Remove="wwwroot\vendor\jquery-nice-select\**" />
   </ItemGroup>
   <ItemGroup>
@@ -26,19 +30,20 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BuildBundlerMinifier" Version="2.6.362" />
-    <PackageReference Include="Hangfire" Version="1.6.17" />
+    <PackageReference Include="BuildBundlerMinifier" Version="2.6.375" />
+    <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.4.0" />
+    <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.36" />
     <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.3" />
+    <PackageReference Include="NBitcoin" Version="4.1.1.3" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.18" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.1.17" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.2.3" />
     <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" />
@@ -61,13 +66,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <None Include="wwwroot\js\checkout\core.js" />
-	  <None Include="wwwroot\js\creative.js" />
-	  <None Include="wwwroot\js\creative.min.js" />
-	  <None Include="wwwroot\js\site.js" />
-	  <None Include="wwwroot\js\site.min.js" />
-	  <None Include="wwwroot\vendor\bootstrap\js\bootstrap.js" />
-	  <None Include="wwwroot\vendor\bootstrap\js\bootstrap.min.js" />
+	  <None Include="wwwroot\checkout\js\core.js" />
+	  <None Include="wwwroot\vendor\bootstrap4-creativestart\creative.js" />
 	  <None Include="wwwroot\vendor\font-awesome\fonts\fontawesome-webfont.svg" />
 	  <None Include="wwwroot\vendor\font-awesome\fonts\fontawesome-webfont.woff2" />
 	  <None Include="wwwroot\vendor\font-awesome\less\animated.less" />

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)
@@ -94,7 +94,8 @@ namespace BTCPayServer.Configuration
             ExternalUrl = conf.GetOrDefault<Uri>("externalurl", null);
 
             RootPath = conf.GetOrDefault<string>("rootpath", "/");
-
+            if (!RootPath.StartsWith("/", StringComparison.InvariantCultureIgnoreCase))
+                RootPath = "/" + RootPath;
             var old = conf.GetOrDefault<Uri>("internallightningnode", null);
             if(old != null)
                 throw new ConfigException($"internallightningnode should not be used anymore, use btclightning instead");
@@ -118,5 +119,14 @@ namespace BTCPayServer.Configuration
             get;
             set;
         }
+
+        internal string GetRootUri()
+        {
+            if (ExternalUrl == null)
+                return null;
+            UriBuilder builder = new UriBuilder(ExternalUrl);
+            builder.Path = RootPath;
+            return builder.ToString();
+        }
     }
 }

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/AccessTokenController.cs

@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 
 namespace BTCPayServer.Controllers
 {
+    [BitpayAPIConstraint]
     public class AccessTokenController : Controller
     {
         TokenRepository _TokenRepository;
@@ -23,7 +24,7 @@ namespace BTCPayServer.Controllers
         [Route("tokens")]
         public async Task<GetTokensResponse> Tokens()
         {
-            var tokens = await _TokenRepository.GetTokens(this.GetBitIdentity().SIN);
+            var tokens = await _TokenRepository.GetTokens(this.User.GetSIN());
             return new GetTokensResponse(tokens);
         }
 
@@ -51,7 +52,7 @@ namespace BTCPayServer.Controllers
             }
             else
             {
-                var sin = this.GetBitIdentity(false)?.SIN ?? request.Id;
+                var sin = this.User.GetSIN() ?? request.Id;
                 if (string.IsNullOrEmpty(request.Id) || !NBitpayClient.Extensions.BitIdExtensions.ValidateSIN(request.Id))
                     throw new BitpayHttpException(400, "'id' property is required, alternatively, use BitId");
 

BTCPayServer/Controllers/AppsController.PointOfSale.cs

@@ -42,10 +42,12 @@ namespace BTCPayServer.Controllers
                     "  price: 15\n\n" +
                     "tshirt:\n" +
                     "  price: 25";
+                ShowCustomAmount = true;
             }
             public string Title { get; set; }
             public string Currency { get; set; }
             public string Template { get; set; }
+            public bool ShowCustomAmount { get; set; }
         }
 
         [HttpGet]
@@ -57,7 +59,7 @@ namespace BTCPayServer.Controllers
                 return NotFound();
 
             var settings = app.GetSettings<PointOfSaleSettings>();
-            return View(new UpdatePointOfSaleViewModel() { Title = settings.Title, Currency = settings.Currency, Template = settings.Template });
+            return View(new UpdatePointOfSaleViewModel() { Title = settings.Title, ShowCustomAmount = settings.ShowCustomAmount, Currency = settings.Currency, Template = settings.Template });
         }
         [HttpPost]
         [Route("{appId}/settings/pos")]
@@ -83,6 +85,7 @@ namespace BTCPayServer.Controllers
             app.SetSettings(new PointOfSaleSettings()
             {
                 Title = vm.Title,
+                ShowCustomAmount = vm.ShowCustomAmount,
                 Currency = vm.Currency.ToUpperInvariant(),
                 Template = vm.Template
             });
@@ -99,9 +102,13 @@ namespace BTCPayServer.Controllers
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<PointOfSaleSettings>();
+            var currency = _Currencies.GetCurrencyData(settings.Currency);
+            double step = currency == null ? 1 : Math.Pow(10, -(currency.Divisibility));
             return View(new ViewPointOfSaleViewModel()
             {
                 Title = settings.Title,
+                Step = step.ToString(CultureInfo.InvariantCulture),
+                ShowCustomAmount = settings.ShowCustomAmount,
                 Items = Parse(settings.Template, settings.Currency)
             });
         }
@@ -155,23 +162,43 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("{appId}/pos")]
-        public async Task<IActionResult> ViewPointOfSale(string appId, string choiceKey)
+        public async Task<IActionResult> ViewPointOfSale(string appId, double amount, string choiceKey)
         {
             var app = await GetApp(appId, AppType.PointOfSale);
+            if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
+            {
+                return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId });
+            }
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<PointOfSaleSettings>();
-            var choices = Parse(settings.Template, settings.Currency);
-            var choice = choices.FirstOrDefault(c => c.Id == choiceKey);
-            if (choice == null)
-                return NotFound();
+            if(string.IsNullOrEmpty(choiceKey) && !settings.ShowCustomAmount)
+            {
+                return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId });
+            }
+            string title = null;
+            double price = 0.0;
+            if (!string.IsNullOrEmpty(choiceKey))
+            {
+                var choices = Parse(settings.Template, settings.Currency);
+                var choice = choices.FirstOrDefault(c => c.Id == choiceKey);
+                if (choice == null)
+                    return NotFound();
+                title = choice.Title;
+                price = (double)choice.Price.Value;
+            }
+            else
+            {
+                price = amount;
+                title = settings.Title;
+            }
 
             var store = await GetStore(app);
             var invoice = await _InvoiceController.CreateInvoiceCore(new NBitpayClient.Invoice()
             {
-                ItemDesc = choice.Title,
+                ItemDesc = title,
                 Currency = settings.Currency,
-                Price = (double)choice.Price.Value,
+                Price = price,
             }, store, HttpContext.Request.GetAbsoluteRoot());
             return Redirect(invoice.Data.Url);
         }

BTCPayServer/Controllers/InvoiceController.API.cs

@@ -22,20 +22,14 @@ namespace BTCPayServer.Controllers
     {
         private InvoiceController _InvoiceController;
         private InvoiceRepository _InvoiceRepository;
-        private TokenRepository _TokenRepository;
-        private StoreRepository _StoreRepository;
         private BTCPayNetworkProvider _NetworkProvider;
 
         public InvoiceControllerAPI(InvoiceController invoiceController,
                                     InvoiceRepository invoceRepository,
-                                    TokenRepository tokenRepository,
-                                    StoreRepository storeRepository,
                                     BTCPayNetworkProvider networkProvider)
         {
             this._InvoiceController = invoiceController;
             this._InvoiceRepository = invoceRepository;
-            this._TokenRepository = tokenRepository;
-            this._StoreRepository = storeRepository;
             this._NetworkProvider = networkProvider;
         }
 
@@ -44,21 +38,16 @@ namespace BTCPayServer.Controllers
         [MediaTypeConstraint("application/json")]
         public async Task<DataWrapper<InvoiceResponse>> CreateInvoice([FromBody] Invoice invoice)
         {
-            var bitToken = await CheckTokenPermissionAsync(Facade.Merchant, invoice.Token);
-            var store = await FindStore(bitToken);
-            return await _InvoiceController.CreateInvoiceCore(invoice, store, HttpContext.Request.GetAbsoluteRoot());
+            return await _InvoiceController.CreateInvoiceCore(invoice, HttpContext.GetStoreData(), HttpContext.Request.GetAbsoluteRoot());
         }
 
         [HttpGet]
         [Route("invoices/{id}")]
         public async Task<DataWrapper<InvoiceResponse>> GetInvoice(string id, string token)
         {
-            var bitToken = await CheckTokenPermissionAsync(Facade.Merchant, token);
-            var store = await FindStore(bitToken);
-            var invoice = await _InvoiceRepository.GetInvoice(store.Id, id);
+            var invoice = await _InvoiceRepository.GetInvoice(HttpContext.GetStoreData().Id, id);
             if (invoice == null)
                 throw new BitpayHttpException(404, "Object not found");
-
             var resp = invoice.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp);
         }
@@ -77,8 +66,7 @@ namespace BTCPayServer.Controllers
         {
             if (dateEnd != null)
                 dateEnd = dateEnd.Value + TimeSpan.FromDays(1); //Should include the end day
-            var bitToken = await CheckTokenPermissionAsync(Facade.Merchant, token);
-            var store = await FindStore(bitToken);
+            
             var query = new InvoiceQuery()
             {
                 Count = limit,
@@ -87,55 +75,14 @@ namespace BTCPayServer.Controllers
                 StartDate = dateStart,
                 OrderId = orderId,
                 ItemCode = itemCode,
-                Status = status,
-                StoreId = store.Id
+                Status = status == null ? null : new[] { status },
+                StoreId = new[] { this.HttpContext.GetStoreData().Id }
             };
 
-
             var entities = (await _InvoiceRepository.GetInvoices(query))
                             .Select((o) => o.EntityToDTO(_NetworkProvider)).ToArray();
 
             return DataWrapper.Create(entities);
         }
-
-        private async Task<BitTokenEntity> CheckTokenPermissionAsync(Facade facade, string expectedToken)
-        {
-            if (facade == null)
-                throw new ArgumentNullException(nameof(facade));
-
-            var actualTokens = (await _TokenRepository.GetTokens(this.GetBitIdentity().SIN)).ToArray();
-            actualTokens = actualTokens.SelectMany(t => GetCompatibleTokens(t)).ToArray();
-
-            var actualToken = actualTokens.FirstOrDefault(a => a.Value.Equals(expectedToken, StringComparison.Ordinal));
-            if (expectedToken == null || actualToken == null)
-            {
-                Logs.PayServer.LogDebug($"No token found for facade {facade} for SIN {this.GetBitIdentity().SIN}");
-                throw new BitpayHttpException(401, $"This endpoint does not support the `{actualTokens.Select(a => a.Facade).Concat(new[] { "user" }).FirstOrDefault()}` facade");
-            }
-            return actualToken;
-        }
-
-        private IEnumerable<BitTokenEntity> GetCompatibleTokens(BitTokenEntity token)
-        {
-            if (token.Facade == Facade.Merchant.ToString())
-            {
-                yield return token.Clone(Facade.User);
-                yield return token.Clone(Facade.PointOfSale);
-            }
-            if (token.Facade == Facade.PointOfSale.ToString())
-            {
-                yield return token.Clone(Facade.User);
-            }
-            yield return token;
-        }
-
-        private async Task<StoreData> FindStore(BitTokenEntity bitToken)
-        {
-            var store = await _StoreRepository.FindStore(bitToken.StoreId);
-            if (store == null)
-                throw new BitpayHttpException(401, "Unknown store");
-            return store;
-        }
-
     }
 }

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);
         }
@@ -220,6 +232,7 @@ namespace BTCPayServer.Controllers
                 OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
                 BtcDue = accounting.Due.ToString(),
                 CustomerEmail = invoice.RefundMail,
+                RequiresRefundEmail = storeBlob.RequiresRefundEmail,
                 ExpirationSeconds = Math.Max(0, (int)(invoice.ExpirationTime - DateTimeOffset.UtcNow).TotalSeconds),
                 MaxTimeSeconds = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalSeconds,
                 MaxTimeMinutes = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalMinutes,
@@ -238,7 +251,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 +265,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 +285,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")]
@@ -358,7 +357,7 @@ namespace BTCPayServer.Controllers
         [Route("invoices")]
         [Authorize(AuthenticationSchemes = "Identity.Application")]
         [BitpayAPIConstraint(false)]
-        public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 20)
+        public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 50)
         {
             var model = new InvoicesModel();
             var filterString = new SearchString(searchTerm);
@@ -368,15 +367,15 @@ namespace BTCPayServer.Controllers
                 Count = count,
                 Skip = skip,
                 UserId = GetUserId(),
-                Status = filterString.Filters.TryGet("status"),
-                StoreId = filterString.Filters.TryGet("storeid")
+                Status = filterString.Filters.ContainsKey("status") ? filterString.Filters["status"].ToArray() : null,
+                StoreId = filterString.Filters.ContainsKey("storeid") ? filterString.Filters["storeid"].ToArray() : null
             }))
             {
                 model.SearchTerm = searchTerm;
                 model.Invoices.Add(new InvoiceModel()
                 {
                     Status = invoice.Status,
-                    Date = Prettify(invoice.InvoiceTime),
+                    Date = (DateTimeOffset.UtcNow - invoice.InvoiceTime).Prettify() + " ago",
                     InvoiceId = invoice.Id,
                     OrderId = invoice.OrderId ?? string.Empty,
                     RedirectUrl = invoice.RedirectURL ?? string.Empty,
@@ -389,30 +388,6 @@ namespace BTCPayServer.Controllers
             return View(model);
         }
 
-        private string Prettify(DateTimeOffset invoiceTime)
-        {
-            var ago = DateTime.UtcNow - invoiceTime;
-
-            if (ago.TotalMinutes < 1)
-            {
-                return $"{(int)ago.TotalSeconds} second{Plural((int)ago.TotalSeconds)} ago";
-            }
-            if (ago.TotalHours < 1)
-            {
-                return $"{(int)ago.TotalMinutes} minute{Plural((int)ago.TotalMinutes)} ago";
-            }
-            if (ago.Days < 1)
-            {
-                return $"{(int)ago.TotalHours} hour{Plural((int)ago.TotalHours)} ago";
-            }
-            return $"{(int)ago.TotalDays} day{Plural((int)ago.TotalDays)} ago";
-        }
-
-        private string Plural(int totalDays)
-        {
-            return totalDays > 1 ? "s" : string.Empty;
-        }
-
         [HttpGet]
         [Route("invoices/create")]
         [Authorize(AuthenticationSchemes = "Identity.Application")]
@@ -453,7 +428,7 @@ namespace BTCPayServer.Controllers
                 return View(model);
             }
 
-            if(StatusMessage != null)
+            if (StatusMessage != null)
             {
                 return RedirectToAction(nameof(StoresController.UpdateStore), "Stores", new
                 {

BTCPayServer/Controllers/InvoiceController.cs

@@ -119,7 +119,7 @@ namespace BTCPayServer.Controllers
                                                 .Where(c => c.Network != null)
                                                 .Select(o =>
                                                     (SupportedPaymentMethod: o.SupportedPaymentMethod,
-                                                    PaymentMethod: CreatePaymentMethodAsync(o.Handler, o.SupportedPaymentMethod, o.Network, entity, storeBlob)))
+                                                    PaymentMethod: CreatePaymentMethodAsync(o.Handler, o.SupportedPaymentMethod, o.Network, entity, store)))
                                                 .ToList();
 
             List<string> paymentMethodErrors = new List<string>();
@@ -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();
@@ -183,15 +183,16 @@ namespace BTCPayServer.Controllers
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }
 
-        private async Task<PaymentMethod> CreatePaymentMethodAsync(IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreBlob storeBlob)
+        private async Task<PaymentMethod> CreatePaymentMethodAsync(IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store)
         {
-            var rate = await storeBlob.ApplyRateRules(network, _RateProviders.GetRateProvider(network, false)).GetRateAsync(entity.ProductInformation.Currency);
+            var storeBlob = store.GetStoreBlob();
+            var rate = await _RateProviders.GetRateProvider(network, storeBlob.GetRateRules()).GetRateAsync(entity.ProductInformation.Currency);
             PaymentMethod paymentMethod = new PaymentMethod();
             paymentMethod.ParentEntity = entity;
             paymentMethod.Network = network;
             paymentMethod.SetId(supportedPaymentMethod.PaymentId);
             paymentMethod.Rate = rate;
-            var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, network);
+            var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, store, network);
             if (storeBlob.NetworkFeeDisabled)
                 paymentDetails.SetNoTxFee();
             paymentMethod.SetPaymentMethodDetails(paymentDetails);
@@ -220,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))
@@ -277,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

@@ -1,7 +1,9 @@
-using BTCPayServer.Models;
+using BTCPayServer.HostedServices;
+using BTCPayServer.Models;
 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 +13,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;
 
@@ -21,11 +24,85 @@ namespace BTCPayServer.Controllers
     {
         private UserManager<ApplicationUser> _UserManager;
         SettingsRepository _SettingsRepository;
+        private IRateProviderFactory _RateProviderFactory;
 
-        public ServerController(UserManager<ApplicationUser> userManager, SettingsRepository settingsRepository)
+        public ServerController(UserManager<ApplicationUser> userManager,
+            IRateProviderFactory rateProviderFactory,
+            SettingsRepository settingsRepository)
         {
             _UserManager = userManager;
             _SettingsRepository = settingsRepository;
+            _RateProviderFactory = rateProviderFactory;
+        }
+
+        [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")]
@@ -52,6 +129,7 @@ namespace BTCPayServer.Controllers
             var roles = await _UserManager.GetRolesAsync(user);
             var userVM = new UserViewModel();
             userVM.Id = user.Id;
+            userVM.Email = user.Email;
             userVM.IsAdmin = IsAdmin(roles);
             return View(userVM);
         }
@@ -72,7 +150,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 +158,7 @@ namespace BTCPayServer.Controllers
                     await _UserManager.RemoveFromRoleAsync(user, Roles.ServerAdmin);
                 updated = true;
             }
-            if(updated)
+            if (updated)
             {
                 viewModel.StatusMessage = "User successfully updated";
             }
@@ -138,7 +216,22 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> Policies(PoliciesSettings settings)
         {
             await _SettingsRepository.UpdateSetting(settings);
-            TempData["StatusMessage"] = "Policies upadated successfully";
+            TempData["StatusMessage"] = "Policies updated successfully";
+            return View(settings);
+        }
+
+        [Route("server/theme")]
+        public async Task<IActionResult> Theme()
+        {
+            var data = (await _SettingsRepository.GetSettingAsync<ThemeSettings>()) ?? new ThemeSettings();
+            return View(data);
+        }
+        [Route("server/theme")]
+        [HttpPost]
+        public async Task<IActionResult> Theme(ThemeSettings settings)
+        {
+            await _SettingsRepository.UpdateSetting(settings);
+            TempData["StatusMessage"] = "Theme settings updated successfully";
             return View(settings);
         }
 

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.LightningLike.cs

@@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Mvc;
 using BTCPayServer.Payments.Lightning;
 using System.Net;
 using BTCPayServer.Data;
+using System.Threading;
 
 namespace BTCPayServer.Controllers
 {
@@ -127,13 +128,20 @@ namespace BTCPayServer.Controllers
                 try
                 {
                     var info = await handler.Test(paymentMethod, network);
+                    if (!vm.SkipPortTest)
+                    {
+                        using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(20)))
+                        {
+                            await handler.TestConnection(info, cts.Token);
+                        }
+                    }
                     vm.StatusMessage = $"Connection to the lightning node succeed ({info})";
                 }
                 catch (Exception ex)
                 {
                     vm.StatusMessage = $"Error: {ex.Message}";
                     return View(vm);
-                }                
+                }
                 return View(vm);
             }
         }

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;
@@ -197,6 +201,7 @@ namespace BTCPayServer.Controllers
             vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
             vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
             vm.AllowCoinConversion = storeBlob.AllowCoinConversion;
+            vm.RequiresRefundEmail = storeBlob.RequiresRefundEmail;
             vm.CustomCSS = storeBlob.CustomCSS?.AbsoluteUri;
             vm.CustomLogo = storeBlob.CustomLogo?.AbsoluteUri;
             return View(vm);
@@ -237,12 +242,13 @@ namespace BTCPayServer.Controllers
             model.SetCryptoCurrencies(_ExplorerProvider, model.DefaultCryptoCurrency);
             model.SetLanguages(_LangService, model.DefaultLang);
 
-            if(!ModelState.IsValid)
+            if (!ModelState.IsValid)
             {
                 return View(model);
             }
             blob.DefaultLang = model.DefaultLang;
             blob.AllowCoinConversion = model.AllowCoinConversion;
+            blob.RequiresRefundEmail = model.RequiresRefundEmail;
             blob.LightningMaxValue = lightningMaxValue;
             blob.OnChainMinValue = onchainMinValue;
             blob.CustomLogo = string.IsNullOrWhiteSpace(model.CustomLogo) ? null : new Uri(model.CustomLogo, UriKind.Absolute);
@@ -273,6 +279,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;
@@ -282,7 +289,7 @@ namespace BTCPayServer.Controllers
             vm.MonitoringExpiration = storeBlob.MonitoringExpiration;
             vm.InvoiceExpiration = storeBlob.InvoiceExpiration;
             vm.RateMultiplier = (double)storeBlob.GetRateMultiplier();
-            vm.PreferredExchange = storeBlob.PreferredExchange.IsCoinAverage() ? "coinaverage" : storeBlob.PreferredExchange;
+            vm.LightningDescriptionTemplate = storeBlob.LightningDescriptionTemplate;
             return View(vm);
         }
 
@@ -324,6 +331,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);
@@ -356,6 +364,7 @@ namespace BTCPayServer.Controllers
             blob.NetworkFeeDisabled = !model.NetworkFee;
             blob.MonitoringExpiration = model.MonitoringExpiration;
             blob.InvoiceExpiration = model.InvoiceExpiration;
+            blob.LightningDescriptionTemplate = model.LightningDescriptionTemplate ?? string.Empty;
 
             bool newExchange = blob.PreferredExchange != model.PreferredExchange;
             blob.PreferredExchange = model.PreferredExchange;
@@ -369,14 +378,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);
                 }
             }
 
@@ -392,9 +398,17 @@ namespace BTCPayServer.Controllers
             });
         }
 
+        private (String DisplayName, String Name)[] GetSupportedExchanges()
+        {
+            return new[] { ("Coin Average", "coinaverage") }
+                            .Concat(_CoinAverage.AvailableExchanges)
+                            .OrderBy(s => s.Item1, StringComparer.OrdinalIgnoreCase)
+                            .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);
         }
@@ -413,6 +427,12 @@ namespace BTCPayServer.Controllers
                 SIN = t.SIN,
                 Id = t.Value
             }).ToArray();
+
+            model.ApiKey = (await _TokenRepository.GetLegacyAPIKeys(storeId)).FirstOrDefault();
+            if (model.ApiKey == null)
+                model.EncodedApiKey = "*API Key*";
+            else
+                model.EncodedApiKey = Encoders.Base64.EncodeData(Encoders.ASCII.DecodeData(model.ApiKey));
             return View(model);
         }
 
@@ -511,6 +531,17 @@ namespace BTCPayServer.Controllers
             return RedirectToAction(nameof(ListTokens));
         }
 
+        [HttpPost]
+        [Route("{storeId}/tokens/apikey")]
+        public async Task<IActionResult> GenerateAPIKey(string storeId)
+        {
+            var store = await _Repo.FindStore(storeId, GetUserId());
+            if (store == null)
+                return NotFound();
+            await _TokenRepository.GenerateLegacyAPIKey(storeId);
+            StatusMessage = "API Key re-generated";
+            return RedirectToAction(nameof(ListTokens));
+        }
 
         [HttpGet]
         [Route("/api-access-request")]

BTCPayServer/Data/APIKeyData.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Data
+{
+    public class APIKeyData
+    {
+        [MaxLength(50)]
+        public string Id
+        {
+            get; set;
+        }
+
+        [MaxLength(50)]
+        public string StoreId
+        {
+            get; set;
+        }
+    }
+}

BTCPayServer/Data/ApplicationDbContext.cs

@@ -86,6 +86,11 @@ namespace BTCPayServer.Data
             get; set;
         }
 
+        public DbSet<APIKeyData> ApiKeys
+        {
+            get; set;
+        }
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             var isConfigured = optionsBuilder.Options.Extensions.OfType<RelationalOptionsExtension>().Any();
@@ -112,6 +117,8 @@ namespace BTCPayServer.Data
                        t.StoreDataId
                    });
 
+            builder.Entity<APIKeyData>()
+                .HasIndex(o => o.StoreId);
 
             builder.Entity<AppData>()
                     .HasOne(a => a.StoreData);

BTCPayServer/Data/StoreData.cs

@@ -14,6 +14,7 @@ using Newtonsoft.Json.Linq;
 using BTCPayServer.Services.Rates;
 using BTCPayServer.Payments;
 using BTCPayServer.JsonConverters;
+using System.ComponentModel.DataAnnotations;
 
 namespace BTCPayServer.Data
 {
@@ -120,7 +121,7 @@ namespace BTCPayServer.Data
                 }
             }
 
-            if(!existing && supportedPaymentMethod == null && paymentMethodId.IsBTCOnChain)
+            if (!existing && supportedPaymentMethod == null && paymentMethodId.IsBTCOnChain)
             {
                 DerivationStrategy = null;
             }
@@ -214,6 +215,7 @@ namespace BTCPayServer.Data
         {
             InvoiceExpiration = 15;
             MonitoringExpiration = 60;
+            RequiresRefundEmail = true;
         }
         public bool NetworkFeeDisabled
         {
@@ -223,6 +225,9 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
+
+        public bool RequiresRefundEmail { get; set; }
+
         public string DefaultLang { get; set; }
         [DefaultValue(60)]
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
@@ -270,30 +275,26 @@ namespace BTCPayServer.Data
         [JsonConverter(typeof(UriJsonConverter))]
         public Uri CustomCSS { get; set; }
 
-        public IRateProvider ApplyRateRules(BTCPayNetwork network, IRateProvider rateProvider)
+
+        string _LightningDescriptionTemplate;
+        public string LightningDescriptionTemplate
         {
-            if (!PreferredExchange.IsCoinAverage())
+            get
             {
-                // 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
-                    });
-                }
+                return _LightningDescriptionTemplate ?? "Paid to {StoreName} (Order ID: {OrderId})";
             }
-            if (RateRules == null || RateRules.Count == 0)
-                return rateProvider;
-            return new TweakRateProvider(network, rateProvider, RateRules.ToList());
+            set
+            {
+                _LightningDescriptionTemplate = value;
+            }
+        }
+
+        public RateRules GetRateRules()
+        {
+            return new RateRules(RateRules)
+            {
+                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,46 @@ using BTCPayServer.Payments;
 using Microsoft.AspNetCore.Identity;
 using BTCPayServer.Models;
 using System.Security.Claims;
+using System.Globalization;
+using BTCPayServer.Services;
+using BTCPayServer.Data;
 
 namespace BTCPayServer
 {
     public static class Extensions
     {
+        public static string Prettify(this TimeSpan timeSpan)
+        {
+            if (timeSpan.TotalMinutes < 1)
+            {
+                return $"{(int)timeSpan.TotalSeconds} second{Plural((int)timeSpan.TotalSeconds)}";
+            }
+            if (timeSpan.TotalHours < 1)
+            {
+                return $"{(int)timeSpan.TotalMinutes} minute{Plural((int)timeSpan.TotalMinutes)}";
+            }
+            if (timeSpan.Days < 1)
+            {
+                return $"{(int)timeSpan.TotalHours} hour{Plural((int)timeSpan.TotalHours)}";
+            }
+            return $"{(int)timeSpan.TotalDays} day{Plural((int)timeSpan.TotalDays)}";
+        }
+
+        private static string Plural(int totalDays)
+        {
+            return totalDays > 1 ? "s" : string.Empty;
+        }
+
+        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++)
@@ -100,6 +135,14 @@ namespace BTCPayServer
                         request.PathBase.ToUriComponent());
         }
 
+        public static string GetAbsoluteUri(this HttpRequest request, string redirectUrl)
+        {
+            bool isRelative = 
+                (redirectUrl.Length > 0 && redirectUrl[0] == '/')
+                || !new Uri(redirectUrl, UriKind.RelativeOrAbsolute).IsAbsoluteUri;
+            return isRelative ? request.GetAbsoluteRoot() + redirectUrl : redirectUrl;
+        }
+
         public static IServiceCollection ConfigureBTCPayServer(this IServiceCollection services, IConfiguration conf)
         {
             services.Configure<BTCPayServerOptions>(o =>
@@ -109,12 +152,35 @@ namespace BTCPayServer
             return services;
         }
 
-
-        public static BitIdentity GetBitIdentity(this Controller controller, bool throws = true)
+        public static string GetSIN(this ClaimsPrincipal principal)
         {
-            if (!(controller.User.Identity is BitIdentity))
-                return throws ? throw new UnauthorizedAccessException("no-bitid") : (BitIdentity)null;
-            return (BitIdentity)controller.User.Identity;
+            return principal.Claims.Where(c => c.Type == Claims.SIN).Select(c => c.Value).FirstOrDefault();
+        }
+
+        public static string GetStoreId(this ClaimsPrincipal principal)
+        {
+            return principal.Claims.Where(c => c.Type == Claims.OwnStore).Select(c => c.Value).FirstOrDefault();
+        }
+
+        public static void SetIsBitpayAPI(this HttpContext ctx, bool value)
+        {
+            NBitcoin.Extensions.TryAdd(ctx.Items, "IsBitpayAPI", value);
+        }
+
+        public static bool GetIsBitpayAPI(this HttpContext ctx)
+        {
+            return ctx.Items.TryGetValue("IsBitpayAPI", out object obj) &&
+                  obj is bool b && b;
+        }
+
+
+        public static StoreData GetStoreData(this HttpContext ctx)
+        {
+            return ctx.Items.TryGet("BTCPAY.STOREDATA") as StoreData;
+        }
+        public static void SetStoreData(this HttpContext ctx, StoreData storeData)
+        {
+            ctx.Items["BTCPAY.STOREDATA"] = storeData;
         }
 
         private static JsonSerializerSettings jsonSettings = new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() };

BTCPayServer/Filters/OnlyMediaTypeAttribute.cs

@@ -43,9 +43,7 @@ namespace BTCPayServer.Filters
 
         public bool Accept(ActionConstraintContext context)
         {
-            var hasVersion = context.RouteContext.HttpContext.Request.Headers["x-accept-version"].Where(h => h == "2.0.0").Any();
-            var hasIdentity = context.RouteContext.HttpContext.Request.Headers["x-identity"].Any();
-            return (hasVersion || hasIdentity) == IsBitpayAPI;
+            return context.RouteContext.HttpContext.GetIsBitpayAPI() == IsBitpayAPI;
         }
     }
 

BTCPayServer/HostedServices/BaseAsyncService.cs

@@ -0,0 +1,66 @@
+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;
+using System.IO;
+using System.Text;
+
+namespace BTCPayServer.HostedServices
+{
+    public abstract class BaseAsyncService : IHostedService
+    {
+        private CancellationTokenSource _Cts;
+        protected Task[] _Tasks;
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            _Cts = new CancellationTokenSource();
+            _Tasks = InitializeTasks();
+            return Task.CompletedTask;
+        }
+
+        internal abstract Task[] InitializeTasks();
+
+        protected CancellationToken Cancellation
+        {
+            get { return _Cts.Token; }
+        }
+
+        protected async Task CreateLoopTask(Func<Task> act, [CallerMemberName]string caller = null)
+        {
+            await new SynchronizationContextRemover();
+            while (!_Cts.IsCancellationRequested)
+            {
+                try
+                {
+                    await act();
+                }
+                catch (OperationCanceledException) when (_Cts.IsCancellationRequested)
+                {
+                }
+                catch (Exception ex)
+                {
+                    Logs.PayServer.LogWarning(ex, caller + " failed");
+                    try
+                    {
+                        await Task.Delay(TimeSpan.FromMinutes(1), _Cts.Token);
+                    }
+                    catch (OperationCanceledException) when (_Cts.IsCancellationRequested) { }
+                }
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            _Cts.Cancel();
+            return Task.WhenAll(_Tasks);
+        }
+    }
+}

BTCPayServer/HostedServices/CssThemeManager.cs

@@ -0,0 +1,74 @@
+using System;
+using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Logging;
+using Microsoft.Extensions.Hosting;
+using NBXplorer;
+using NBXplorer.Models;
+using System.Collections.Concurrent;
+using BTCPayServer.Events;
+using BTCPayServer.Services;
+
+namespace BTCPayServer.HostedServices
+{
+    public class CssThemeManager
+    {
+        public void Update(ThemeSettings data)
+        {
+            if (String.IsNullOrWhiteSpace(data.BootstrapCssUri))
+                _bootstrapUri = "/vendor/bootstrap4/css/bootstrap.css?v=" + DateTime.Now.Ticks;
+            else
+                _bootstrapUri = data.BootstrapCssUri;
+
+
+            if (String.IsNullOrWhiteSpace(data.CreativeStartCssUri))
+                _creativeStartUri = "/vendor/bootstrap4-creativestart/creative.css?v=" + DateTime.Now.Ticks;
+            else
+                _creativeStartUri = data.CreativeStartCssUri;
+        }
+
+        private string _bootstrapUri;
+        public string BootstrapUri
+        {
+            get { return _bootstrapUri; }
+        }
+
+        private string _creativeStartUri;
+        public string CreativeStartUri
+        {
+            get { return _creativeStartUri; }
+        }
+    }
+
+    public class CssThemeManagerHostedService : BaseAsyncService
+    {
+        private SettingsRepository _SettingsRepository;
+        private CssThemeManager _CssThemeManager;
+
+        public CssThemeManagerHostedService(SettingsRepository settingsRepository, CssThemeManager cssThemeManager)
+        {
+            _SettingsRepository = settingsRepository;
+            _CssThemeManager = cssThemeManager;
+        }
+
+        internal override Task[] InitializeTasks()
+        {
+            return new[]
+            {
+                CreateLoopTask(ListenForThemeChanges)
+            };
+        }
+
+        async Task ListenForThemeChanges()
+        {
+            await new SynchronizationContextRemover();
+            var data = (await _SettingsRepository.GetSettingAsync<ThemeSettings>()) ?? new ThemeSettings();
+            _CssThemeManager.Update(data);
+
+            await _SettingsRepository.WaitSettingsChanged<ThemeSettings>(Cancellation);
+        }
+    }
+}

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,67 @@
+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;
+using System.IO;
+using System.Text;
+
+namespace BTCPayServer.HostedServices
+{
+    public class RatesHostedService : BaseAsyncService
+    {
+        private SettingsRepository _SettingsRepository;
+        private IRateProviderFactory _RateProviderFactory;
+        private CoinAverageSettings _coinAverageSettings;
+        public RatesHostedService(SettingsRepository repo,
+                                  CoinAverageSettings coinAverageSettings,
+                                  IRateProviderFactory rateProviderFactory)
+        {
+            this._SettingsRepository = repo;
+            _RateProviderFactory = rateProviderFactory;
+            _coinAverageSettings = coinAverageSettings;
+        }
+
+        internal override Task[] InitializeTasks()
+        {
+            return new[]
+            {
+                CreateLoopTask(RefreshCoinAverageSupportedExchanges),
+                CreateLoopTask(RefreshCoinAverageSettings)
+            };
+        }
+
+        async Task RefreshCoinAverageSupportedExchanges()
+        {
+            await new SynchronizationContextRemover();
+            var tickers = await new CoinAverageRateProvider("BTC") { Authenticator = _coinAverageSettings }.GetExchangeTickersAsync();
+            _coinAverageSettings.AvailableExchanges = tickers
+                .Exchanges
+                .Select(c => (c.DisplayName, c.Name))
+                .ToArray();
+            await Task.Delay(TimeSpan.FromHours(5), Cancellation);
+        }
+
+        async Task RefreshCoinAverageSettings()
+        {
+            await new SynchronizationContextRemover();
+            var rates = (await _SettingsRepository.GetSettingAsync<RatesSetting>()) ?? new RatesSetting();
+            _RateProviderFactory.CacheSpan = TimeSpan.FromMinutes(rates.CacheInMinutes);
+            if (!string.IsNullOrWhiteSpace(rates.PrivateKey) && !string.IsNullOrWhiteSpace(rates.PublicKey))
+            {
+                _coinAverageSettings.KeyPair = (rates.PublicKey, rates.PrivateKey);
+            }
+            else
+            {
+                _coinAverageSettings.KeyPair = null;
+            }
+            await _SettingsRepository.WaitSettingsChanged<RatesSetting>(Cancellation);
+        }
+    }
+}

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, CoinAverageSettingsAuthenticator>();
             services.TryAddSingleton<ApplicationDbContextFactory>(o => 
             {
                 var opts = o.GetRequiredService<BTCPayServerOptions>();
@@ -145,6 +147,9 @@ namespace BTCPayServer.Hosting
                 BlockTarget = 20
             });
 
+            services.AddSingleton<CssThemeManager>();
+            services.AddSingleton<IHostedService, CssThemeManagerHostedService>();
+
             services.AddSingleton<Payments.IPaymentMethodHandler<DerivationStrategy>, Payments.Bitcoin.BitcoinLikePaymentHandler>();
             services.AddSingleton<IHostedService, Payments.Bitcoin.NBXplorerListener>();
 
@@ -154,16 +159,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/Hosting/BTCpayMiddleware.cs

@@ -23,20 +23,28 @@ using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Http.Extensions;
 using BTCPayServer.Controllers;
 using System.Net.WebSockets;
+using System.Security.Claims;
+using BTCPayServer.Services;
+using NBitpayClient;
+using Newtonsoft.Json.Linq;
+using BTCPayServer.Services.Stores;
 
 namespace BTCPayServer.Hosting
 {
     public class BTCPayMiddleware
     {
         TokenRepository _TokenRepository;
+        StoreRepository _StoreRepository;
         RequestDelegate _Next;
         BTCPayServerOptions _Options;
 
         public BTCPayMiddleware(RequestDelegate next,
             TokenRepository tokenRepo,
+            StoreRepository storeRepo,
             BTCPayServerOptions options)
         {
             _TokenRepository = tokenRepo ?? throw new ArgumentNullException(nameof(tokenRepo));
+            _StoreRepository = storeRepo;
             _Next = next ?? throw new ArgumentNullException(nameof(next));
             _Options = options ?? throw new ArgumentNullException(nameof(options));
         }
@@ -45,42 +53,48 @@ namespace BTCPayServer.Hosting
         public async Task Invoke(HttpContext httpContext)
         {
             RewriteHostIfNeeded(httpContext);
-            httpContext.Request.Headers.TryGetValue("x-signature", out StringValues values);
-            var sig = values.FirstOrDefault();
-            httpContext.Request.Headers.TryGetValue("x-identity", out values);
-            var id = values.FirstOrDefault();
-            if (!string.IsNullOrEmpty(sig) && !string.IsNullOrEmpty(id))
-            {
-                httpContext.Request.EnableRewind();
-
-                string body = string.Empty;
-                if (httpContext.Request.ContentLength != 0 && httpContext.Request.Body != null)
-                {
-                    using (StreamReader reader = new StreamReader(httpContext.Request.Body, Encoding.UTF8, true, 1024, true))
-                    {
-                        body = reader.ReadToEnd();
-                    }
-                    httpContext.Request.Body.Position = 0;
-                }
-
-                var url = httpContext.Request.GetEncodedUrl();
-                try
-                {
-                    var key = new PubKey(id);
-                    if (BitIdExtensions.CheckBitIDSignature(key, sig, url, body))
-                    {
-                        var bitid = new BitIdentity(key);
-                        httpContext.User = new GenericPrincipal(bitid, Array.Empty<string>());
-                        Logs.PayServer.LogDebug($"BitId signature check success for SIN {bitid.SIN}");
-                    }
-                }
-                catch (FormatException) { }
-                if (!(httpContext.User.Identity is BitIdentity))
-                    Logs.PayServer.LogDebug("BitId signature check failed");
-            }
 
             try
             {
+                var bitpayAuth = GetBitpayAuth(httpContext, out bool isBitpayAuth);
+                var isBitpayAPI = IsBitpayAPI(httpContext, isBitpayAuth);
+                httpContext.SetIsBitpayAPI(isBitpayAPI);
+                if (isBitpayAPI)
+                {
+
+                    string storeId = null;
+                    var failedAuth = false;
+                    if (!string.IsNullOrEmpty(bitpayAuth.Signature) && !string.IsNullOrEmpty(bitpayAuth.Id))
+                    {
+                        storeId = await CheckBitId(httpContext, bitpayAuth.Signature, bitpayAuth.Id);
+                        if (!httpContext.User.Claims.Any(c => c.Type == Claims.SIN))
+                        {
+                            Logs.PayServer.LogDebug("BitId signature check failed");
+                            failedAuth = true;
+                        }
+                    }
+                    else if (!string.IsNullOrEmpty(bitpayAuth.Authorization))
+                    {
+                        storeId = await CheckLegacyAPIKey(httpContext, bitpayAuth.Authorization);
+                        if (storeId == null)
+                        {
+                            Logs.PayServer.LogDebug("API key check failed");
+                            failedAuth = true;
+                        }
+                    }
+
+                    if (storeId != null)
+                    {
+                        var identity = ((ClaimsIdentity)httpContext.User.Identity);
+                        identity.AddClaim(new Claim(Claims.OwnStore, storeId));
+                        var store = await _StoreRepository.FindStore(storeId);
+                        httpContext.SetStoreData(store);
+                    }
+                    else if (failedAuth)
+                    {
+                        throw new BitpayHttpException(401, "Can't access to store");
+                    }
+                }
                 await _Next(httpContext);
             }
             catch (WebSocketException)
@@ -100,6 +114,55 @@ namespace BTCPayServer.Hosting
             }
         }
 
+        private static (string Signature, String Id, String Authorization) GetBitpayAuth(HttpContext httpContext, out bool hasBitpayAuth)
+        {
+            httpContext.Request.Headers.TryGetValue("x-signature", out StringValues values);
+            var sig = values.FirstOrDefault();
+            httpContext.Request.Headers.TryGetValue("x-identity", out values);
+            var id = values.FirstOrDefault();
+            httpContext.Request.Headers.TryGetValue("Authorization", out values);
+            var auth = values.FirstOrDefault();
+            hasBitpayAuth = auth != null || (sig != null && id != null);
+            return (sig, id, auth);
+        }
+
+        private bool IsBitpayAPI(HttpContext httpContext, bool bitpayAuth)
+        {
+            if (!httpContext.Request.Path.HasValue)
+                return false;
+
+            var path = httpContext.Request.Path.Value;
+            if (
+                bitpayAuth &&
+                path == "/invoices" &&
+              httpContext.Request.Method == "POST" &&
+              (httpContext.Request.ContentType ?? string.Empty).StartsWith("application/json", StringComparison.OrdinalIgnoreCase))
+                return true;
+
+            if (
+                bitpayAuth &&
+                path == "/invoices" &&
+              httpContext.Request.Method == "GET")
+                return true;
+
+            if (
+                bitpayAuth &&
+                path.StartsWith("/invoices/", StringComparison.OrdinalIgnoreCase) &&
+                httpContext.Request.Method == "GET")
+                return true;
+
+            if (path.Equals("/rates", StringComparison.OrdinalIgnoreCase) &&
+                httpContext.Request.Method == "GET")
+                return true;
+
+            if (
+                path.Equals("/tokens", StringComparison.Ordinal) && 
+                ( httpContext.Request.Method == "GET" || httpContext.Request.Method == "POST"))
+                return true;
+
+            return false;
+        }
+
         private void RewriteHostIfNeeded(HttpContext httpContext)
         {
             string reverseProxyScheme = null;
@@ -132,7 +195,7 @@ namespace BTCPayServer.Hosting
                     httpContext.Request.Scheme = reverseProxyScheme;
                 }
                 else
-                { 
+                {
                     httpContext.Request.Scheme = _Options.ExternalUrl.Scheme;
                 }
                 if (_Options.ExternalUrl.IsDefaultPort)
@@ -192,5 +255,109 @@ namespace BTCPayServer.Hosting
                 await writer.FlushAsync();
             }
         }
+
+
+        private async Task<string> CheckBitId(HttpContext httpContext, string sig, string id)
+        {
+            httpContext.Request.EnableRewind();
+
+            string storeId = null;
+            string body = string.Empty;
+            if (httpContext.Request.ContentLength != 0 && httpContext.Request.Body != null)
+            {
+                using (StreamReader reader = new StreamReader(httpContext.Request.Body, Encoding.UTF8, true, 1024, true))
+                {
+                    body = reader.ReadToEnd();
+                }
+                httpContext.Request.Body.Position = 0;
+            }
+
+            var url = httpContext.Request.GetEncodedUrl();
+            try
+            {
+                var key = new PubKey(id);
+                if (BitIdExtensions.CheckBitIDSignature(key, sig, url, body))
+                {
+                    var sin = key.GetBitIDSIN();
+                    var identity = ((ClaimsIdentity)httpContext.User.Identity);
+                    identity.AddClaim(new Claim(Claims.SIN, sin));
+
+                    string token = null;
+                    if (httpContext.Request.Query.TryGetValue("token", out var tokenValues))
+                    {
+                        token = tokenValues[0];
+                    }
+
+                    if (token == null && !String.IsNullOrEmpty(body) && httpContext.Request.Method == "POST")
+                    {
+                        try
+                        {
+                            token = JObject.Parse(body)?.Property("token")?.Value?.Value<string>();
+                        }
+                        catch { }
+                    }
+
+                    if (token != null)
+                    {
+                        var bitToken = await GetTokenPermissionAsync(sin, token);
+                        if (bitToken == null)
+                        {
+                            return null;
+                        }
+                        storeId = bitToken.StoreId;
+                    }
+                }
+            }
+            catch (FormatException) { }
+            return storeId;
+        }
+
+        private async Task<string> CheckLegacyAPIKey(HttpContext httpContext, string auth)
+        {
+            var splitted = auth.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+            if (splitted.Length != 2 || !splitted[0].Equals("Basic", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            string apiKey = null;
+            try
+            {
+                apiKey = Encoders.ASCII.EncodeData(Encoders.Base64.DecodeData(splitted[1]));
+            }
+            catch
+            {
+                return null;
+            }
+            return await _TokenRepository.GetStoreIdFromAPIKey(apiKey);
+        }
+
+        private async Task<BitTokenEntity> GetTokenPermissionAsync(string sin, string expectedToken)
+        {
+            var actualTokens = (await _TokenRepository.GetTokens(sin)).ToArray();
+            actualTokens = actualTokens.SelectMany(t => GetCompatibleTokens(t)).ToArray();
+
+            var actualToken = actualTokens.FirstOrDefault(a => a.Value.Equals(expectedToken, StringComparison.Ordinal));
+            if (expectedToken == null || actualToken == null)
+            {
+                Logs.PayServer.LogDebug($"No token found for facade {Facade.Merchant} for SIN {sin}");
+                return null;
+            }
+            return actualToken;
+        }
+
+        private IEnumerable<BitTokenEntity> GetCompatibleTokens(BitTokenEntity token)
+        {
+            if (token.Facade == Facade.Merchant.ToString())
+            {
+                yield return token.Clone(Facade.User);
+                yield return token.Clone(Facade.PointOfSale);
+            }
+            if (token.Facade == Facade.PointOfSale.ToString())
+            {
+                yield return token.Clone(Facade.User);
+            }
+            yield return token;
+        }
     }
 }

BTCPayServer/Hosting/Startup.cs

@@ -76,8 +76,6 @@ namespace BTCPayServer.Hosting
                 .AddEntityFrameworkStores<ApplicationDbContext>()
                 .AddDefaultTokenProviders();
 
-            // Big hack, tests fails because Hangfire fail at initializing at the second test run
-            AddHangfireFix(services);
             services.AddBTCPayServer();
             services.AddMvc(o =>
             {
@@ -93,6 +91,24 @@ namespace BTCPayServer.Hosting
                 options.Password.RequireUppercase = false;
             });
 
+            services.AddHangfire((o) =>
+            {
+                var scope = AspNetCoreJobActivator.Current.BeginScope(null);
+                var options = (ApplicationDbContextFactory)scope.Resolve(typeof(ApplicationDbContextFactory));
+                options.ConfigureHangfireBuilder(o);
+            });
+            services.AddCors(o =>
+            {
+                o.AddPolicy("BitpayAPI", b =>
+                {
+                    b.AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
+                });
+            });
+            services.Configure<IOptions<ApplicationInsightsServiceOptions>>(o =>
+            {
+                o.Value.DeveloperMode = _Env.IsDevelopment();
+            });
+
             // Needed to debug U2F for ledger support
             //services.Configure<KestrelServerOptions>(kestrel =>
             //{
@@ -103,46 +119,6 @@ namespace BTCPayServer.Hosting
             //});
         }
 
-        // Big hack, tests fails if only call AddHangfire because Hangfire fail at initializing at the second test run
-        private void AddHangfireFix(IServiceCollection services)
-        {
-            Action<IGlobalConfiguration> configuration = o =>
-            {
-                var scope = AspNetCoreJobActivator.Current.BeginScope(null);
-                var options = (ApplicationDbContextFactory)scope.Resolve(typeof(ApplicationDbContextFactory));
-                options.ConfigureHangfireBuilder(o);
-            };
-
-            ServiceCollectionDescriptorExtensions.TryAddSingleton<Action<IGlobalConfiguration>>(services, (IServiceProvider serviceProvider) => new Action<IGlobalConfiguration>((config) =>
-           {
-               ILoggerFactory service = ServiceProviderServiceExtensions.GetService<ILoggerFactory>(serviceProvider);
-               if (service != null)
-               {
-                   Hangfire.GlobalConfigurationExtensions.UseLogProvider<AspNetCoreLogProvider>(config, new AspNetCoreLogProvider(service));
-               }
-               IServiceScopeFactory service2 = ServiceProviderServiceExtensions.GetService<IServiceScopeFactory>(serviceProvider);
-               if (service2 != null)
-               {
-                   Hangfire.GlobalConfigurationExtensions.UseActivator<AspNetCoreJobActivator>(config, new AspNetCoreJobActivator(service2));
-               }
-               configuration(config);
-           }));
-
-            services.AddHangfire(configuration);
-            services.AddCors(o =>
-            {
-                o.AddPolicy("BitpayAPI", b =>
-                {
-                    b.AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-                });
-            });
-
-            services.Configure<IOptions<ApplicationInsightsServiceOptions>>(o =>
-            {
-                o.Value.DeveloperMode = _Env.IsDevelopment();
-            });
-        }
-
         public void Configure(
             IApplicationBuilder app,
             IHostingEnvironment env,
@@ -154,18 +130,18 @@ namespace BTCPayServer.Hosting
             Logs.Configuration.LogInformation($"Root Path: {options.RootPath}");
             if (options.RootPath.Equals("/", StringComparison.OrdinalIgnoreCase))
             {
-                ConfigureCore(app, env, prov, loggerFactory);
+                ConfigureCore(app, env, prov, loggerFactory, options);
             }
             else
             {
                 app.Map(options.RootPath, appChild =>
                 {
-                    ConfigureCore(appChild, env, prov, loggerFactory);
+                    ConfigureCore(appChild, env, prov, loggerFactory, options);
                 });
             }
         }
 
-        private static void ConfigureCore(IApplicationBuilder app, IHostingEnvironment env, IServiceProvider prov, ILoggerFactory loggerFactory)
+        private static void ConfigureCore(IApplicationBuilder app, IHostingEnvironment env, IServiceProvider prov, ILoggerFactory loggerFactory, BTCPayServerOptions options)
         {
             if (env.IsDevelopment())
             {
@@ -180,7 +156,11 @@ namespace BTCPayServer.Hosting
             app.UseStaticFiles();
             app.UseAuthentication();
             app.UseHangfireServer();
-            app.UseHangfireDashboard("/hangfire", new DashboardOptions() { Authorization = new[] { new NeedRole(Roles.ServerAdmin) } });
+            app.UseHangfireDashboard("/hangfire", new DashboardOptions()
+            {
+                AppPath = options.GetRootUri(),
+                Authorization = new[] { new NeedRole(Roles.ServerAdmin) }
+            });
             app.UseWebSockets();
             app.UseMvc(routes =>
             {

BTCPayServer/Migrations/20180429083930_legacyapikey.Designer.cs

@@ -0,0 +1,553 @@
+// <auto-generated />
+using BTCPayServer.Data;
+using BTCPayServer.Services.Invoices;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
+using System;
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20180429083930_legacyapikey")]
+    partial class legacyapikey
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.0.2-rtm-10011");
+
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+                {
+                    b.Property<string>("Address")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTimeOffset?>("CreatedTime");
+
+                    b.Property<string>("InvoiceDataId");
+
+                    b.HasKey("Address");
+
+                    b.HasIndex("InvoiceDataId");
+
+                    b.ToTable("AddressInvoices");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(50);
+
+                    b.Property<string>("StoreId")
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("ApiKeys");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("AppType");
+
+                    b.Property<DateTimeOffset>("Created");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Settings");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreDataId");
+
+                    b.ToTable("Apps");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
+                {
+                    b.Property<string>("InvoiceDataId");
+
+                    b.Property<string>("Address");
+
+                    b.Property<DateTimeOffset>("Assigned");
+
+                    b.Property<string>("CryptoCode");
+
+                    b.Property<DateTimeOffset?>("UnAssigned");
+
+                    b.HasKey("InvoiceDataId", "Address");
+
+                    b.ToTable("HistoricalAddressInvoices");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte[]>("Blob");
+
+                    b.Property<DateTimeOffset>("Created");
+
+                    b.Property<string>("CustomerEmail");
+
+                    b.Property<string>("ExceptionStatus");
+
+                    b.Property<string>("ItemCode");
+
+                    b.Property<string>("OrderId");
+
+                    b.Property<string>("Status");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreDataId");
+
+                    b.ToTable("Invoices");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
+                {
+                    b.Property<string>("InvoiceDataId");
+
+                    b.Property<string>("UniqueId");
+
+                    b.Property<string>("Message");
+
+                    b.Property<DateTimeOffset>("Timestamp");
+
+                    b.HasKey("InvoiceDataId", "UniqueId");
+
+                    b.ToTable("InvoiceEvents");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Facade");
+
+                    b.Property<string>("Label");
+
+                    b.Property<DateTimeOffset>("PairingTime");
+
+                    b.Property<string>("SIN");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SIN");
+
+                    b.HasIndex("StoreDataId");
+
+                    b.ToTable("PairedSINData");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PairingCodeData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("DateCreated");
+
+                    b.Property<DateTimeOffset>("Expiration");
+
+                    b.Property<string>("Facade");
+
+                    b.Property<string>("Label");
+
+                    b.Property<string>("SIN");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.Property<string>("TokenValue");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PairingCodes");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Accounted");
+
+                    b.Property<byte[]>("Blob");
+
+                    b.Property<string>("InvoiceDataId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceDataId");
+
+                    b.ToTable("Payments");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PendingInvoices");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte[]>("Blob");
+
+                    b.Property<string>("InvoiceDataId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceDataId");
+
+                    b.ToTable("RefundAddresses");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.SettingData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Settings");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.StoreData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("DefaultCrypto");
+
+                    b.Property<string>("DerivationStrategies");
+
+                    b.Property<string>("DerivationStrategy");
+
+                    b.Property<int>("SpeedPolicy");
+
+                    b.Property<byte[]>("StoreBlob");
+
+                    b.Property<byte[]>("StoreCertificate");
+
+                    b.Property<string>("StoreName");
+
+                    b.Property<string>("StoreWebsite");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Stores");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>
+                {
+                    b.Property<string>("ApplicationUserId");
+
+                    b.Property<string>("StoreDataId");
+
+                    b.Property<string>("Role");
+
+                    b.HasKey("ApplicationUserId", "StoreDataId");
+
+                    b.HasIndex("StoreDataId");
+
+                    b.ToTable("UserStore");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Models.ApplicationUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AccessFailedCount");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed");
+
+                    b.Property<bool>("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed");
+
+                    b.Property<bool>("RequiresEmailConfirmation");
+
+                    b.Property<string>("SecurityStamp");
+
+                    b.Property<bool>("TwoFactorEnabled");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("ProviderKey");
+
+                    b.Property<string>("ProviderDisplayName");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("RoleId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("AddressInvoices")
+                        .HasForeignKey("InvoiceDataId");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                        .WithMany("Apps")
+                        .HasForeignKey("StoreDataId");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData")
+                        .WithMany("HistoricalAddressInvoices")
+                        .HasForeignKey("InvoiceDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                        .WithMany()
+                        .HasForeignKey("StoreDataId");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData")
+                        .WithMany("Events")
+                        .HasForeignKey("InvoiceDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("Payments")
+                        .HasForeignKey("InvoiceDataId");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("RefundAddresses")
+                        .HasForeignKey("InvoiceDataId");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>
+                {
+                    b.HasOne("BTCPayServer.Models.ApplicationUser", "ApplicationUser")
+                        .WithMany("UserStores")
+                        .HasForeignKey("ApplicationUserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                        .WithMany("UserStores")
+                        .HasForeignKey("StoreDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("BTCPayServer.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("BTCPayServer.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("BTCPayServer.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("BTCPayServer.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

BTCPayServer/Migrations/20180429083930_legacyapikey.cs

@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+
+namespace BTCPayServer.Migrations
+{
+    public partial class legacyapikey : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ApiKeys",
+                columns: table => new
+                {
+                    Id = table.Column<string>(maxLength: 50, nullable: false),
+                    StoreId = table.Column<string>(maxLength: 50, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ApiKeys", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ApiKeys_StoreId",
+                table: "ApiKeys",
+                column: "StoreId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ApiKeys");
+        }
+    }
+}

BTCPayServer/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -18,7 +18,7 @@ namespace BTCPayServer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.1-rtm-125");
+                .HasAnnotation("ProductVersion", "2.0.2-rtm-10011");
 
             modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
                 {
@@ -36,6 +36,22 @@ namespace BTCPayServer.Migrations
                     b.ToTable("AddressInvoices");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(50);
+
+                    b.Property<string>("StoreId")
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("ApiKeys");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
                 {
                     b.Property<string>("Id")

BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs

@@ -17,5 +17,8 @@ namespace BTCPayServer.Models.AppViewModels
         [Required]
         [MaxLength(5000)]
         public string Template { get; set; }
+
+        [Display(Name = "User can input custom amount")]
+        public bool ShowCustomAmount { get; set; }
     }
 }

BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs

@@ -18,6 +18,8 @@ namespace BTCPayServer.Models.AppViewModels
             public ItemPrice Price { get; set; }
             public string Title { get; set; }
         }
+        public bool ShowCustomAmount { get; set; }
+        public string Step { get; set; }
         public string Title { get; set; }
         public Item[] Items { get; set; }
     }

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

@@ -24,6 +24,7 @@ namespace BTCPayServer.Models.InvoicingModels
         public string BtcAddress { get; set; }
         public string BtcDue { get; set; }
         public string CustomerEmail { get; set; }
+        public bool RequiresRefundEmail { get; set; }
         public int ExpirationSeconds { get; set; }
         public string Status { get; set; }
         public string MerchantRefLink { get; set; }
@@ -43,7 +44,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/CheckoutExperienceViewModel.cs

@@ -31,6 +31,12 @@ namespace BTCPayServer.Models.StoreViewModels
         [MaxLength(20)]
         public string LightningMaxValue { get; set; }
 
+        [Display(Name = "Requires a refund email")]
+        public bool RequiresRefundEmail
+        {
+            get; set;
+        }
+
         [Display(Name = "Do not propose on chain payment if the value of the invoice is below...")]
         [MaxLength(20)]
         public string OnChainMinValue { get; 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/LightningNodeViewModel.cs

@@ -23,5 +23,6 @@ namespace BTCPayServer.Models.StoreViewModels
         }
         public string StatusMessage { get; set; }
         public string InternalLightningNode { get; internal set; }
+        public bool SkipPortTest { 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; }
 
@@ -91,6 +107,9 @@ namespace BTCPayServer.Models.StoreViewModels
             get; set;
         }
 
+        [Display(Name = "Description template of the lightning invoice")]
+        public string LightningDescriptionTemplate { get; set; }
+
         public class LightningNode
         {
             public string CryptoCode { get; set; }
@@ -100,6 +119,5 @@ namespace BTCPayServer.Models.StoreViewModels
         {
             get; set;
         } = new List<LightningNode>();
-
     }
 }

BTCPayServer/Models/StoreViewModels/TokensViewModel.cs

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

BTCPayServer/MultiValueDictionary.cs

@@ -1111,4 +1111,17 @@ namespace BTCPayServer
             #endregion
         }
     }
+
+    public static class MultiValueDictionaryExtensions
+    {
+        public static MultiValueDictionary<TKey, TValue> ToMultiValueDictionary<TInput, TKey, TValue>(this IEnumerable<TInput> collection, Func<TInput, TKey> keySelector, Func<TInput, TValue> valueSelector)
+        {
+            var dictionary = new MultiValueDictionary<TKey, TValue>();
+            foreach(var item in collection)
+            {
+                dictionary.Add(keySelector(item), valueSelector(item));
+            }
+            return dictionary;
+        }
+    }
 }

BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs

@@ -27,7 +27,7 @@ namespace BTCPayServer.Payments.Bitcoin
             _WalletProvider = walletProvider;
         }
 
-        public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(DerivationStrategy supportedPaymentMethod, PaymentMethod paymentMethod, BTCPayNetwork network)
+        public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(DerivationStrategy supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network)
         {
             if (!_ExplorerProvider.IsAvailable(network))
                 throw new PaymentMethodUnavailableException($"Full node not available");

BTCPayServer/Payments/IPaymentMethodHandler.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Data;
 using BTCPayServer.Services.Invoices;
 
 namespace BTCPayServer.Payments
@@ -16,25 +17,26 @@ namespace BTCPayServer.Payments
         /// </summary>
         /// <param name="supportedPaymentMethod"></param>
         /// <param name="paymentMethod"></param>
+        /// <param name="store"></param>
         /// <param name="network"></param>
         /// <returns></returns>
-        Task<IPaymentMethodDetails> CreatePaymentMethodDetails(ISupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, BTCPayNetwork network);
+        Task<IPaymentMethodDetails> CreatePaymentMethodDetails(ISupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network);
     }
 
     public interface IPaymentMethodHandler<T> : IPaymentMethodHandler where T : ISupportedPaymentMethod
     {
-        Task<IPaymentMethodDetails> CreatePaymentMethodDetails(T supportedPaymentMethod, PaymentMethod paymentMethod, BTCPayNetwork network);
+        Task<IPaymentMethodDetails> CreatePaymentMethodDetails(T supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network);
     }
 
     public abstract class PaymentMethodHandlerBase<T> : IPaymentMethodHandler<T> where T : ISupportedPaymentMethod
     {
-        public abstract Task<IPaymentMethodDetails> CreatePaymentMethodDetails(T supportedPaymentMethod, PaymentMethod paymentMethod, BTCPayNetwork network);
+        public abstract Task<IPaymentMethodDetails> CreatePaymentMethodDetails(T supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network);
 
-        Task<IPaymentMethodDetails> IPaymentMethodHandler.CreatePaymentMethodDetails(ISupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, BTCPayNetwork network)
+        Task<IPaymentMethodDetails> IPaymentMethodHandler.CreatePaymentMethodDetails(ISupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network)
         {
             if (supportedPaymentMethod is T method)
             {
-                return CreatePaymentMethodDetails(method, paymentMethod, network);
+                return CreatePaymentMethodDetails(method, paymentMethod, store, network);
             }
             throw new NotSupportedException("Invalid supportedPaymentMethod");
         }

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/Payments/Lightning/Charge/ChargeClient.cs

@@ -48,8 +48,10 @@ namespace BTCPayServer.Payments.Lightning.Charge
         {
             var message = CreateMessage(HttpMethod.Post, "invoice");
             Dictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters.Add("msatoshi", request.Amont.MilliSatoshi.ToString(CultureInfo.InvariantCulture));
+            parameters.Add("msatoshi", request.Amount.MilliSatoshi.ToString(CultureInfo.InvariantCulture));
             parameters.Add("expiry", ((int)request.Expiry.TotalSeconds).ToString(CultureInfo.InvariantCulture));
+            if(request.Description != null)
+                parameters.Add("description", request.Description);
             message.Content = new FormUrlEncodedContent(parameters);
             var result = await _Client.SendAsync(message, cancellation);
             result.EnsureSuccessStatusCode();
@@ -154,7 +156,7 @@ namespace BTCPayServer.Payments.Lightning.Charge
 
         async Task<LightningInvoice> ILightningInvoiceClient.CreateInvoice(LightMoney amount, string description, TimeSpan expiry, CancellationToken cancellation)
         {
-            var invoice = await CreateInvoiceAsync(new CreateInvoiceRequest() { Amont = amount, Expiry = expiry, Description = description ?? "" });
+            var invoice = await CreateInvoiceAsync(new CreateInvoiceRequest() { Amount = amount, Expiry = expiry, Description = description ?? "" });
             return new LightningInvoice() { Id = invoice.Id, Amount = amount, BOLT11 = invoice.PayReq, Status = "unpaid" };
         }
 

BTCPayServer/Payments/Lightning/Charge/CreateInvoiceRequest.cs

@@ -7,7 +7,7 @@ namespace BTCPayServer.Payments.Lightning.Charge
 {
     public class CreateInvoiceRequest
     {
-        public LightMoney Amont { get; set; }
+        public LightMoney Amount { get; set; }
         public TimeSpan Expiry { get; set; }
         public string Description { get; set; }
     }

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -5,6 +5,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
+using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Payments.Lightning.Charge;
 using BTCPayServer.Payments.Lightning.CLightning;
@@ -23,8 +24,9 @@ namespace BTCPayServer.Payments.Lightning
             _LightningClientFactory = lightningClientFactory;
             _Dashboard = dashboard;
         }
-        public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, BTCPayNetwork network)
+        public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network)
         {
+            var storeBlob = store.GetStoreBlob();
             var test = Test(supportedPaymentMethod, network);
             var invoice = paymentMethod.ParentEntity;
             var due = Extensions.RoundUp(invoice.ProductInformation.Price / paymentMethod.Rate, 8);
@@ -36,9 +38,13 @@ namespace BTCPayServer.Payments.Lightning
             LightningInvoice lightningInvoice = null;
             try
             {
-                lightningInvoice = await client.CreateInvoice(new LightMoney(due, LightMoneyUnit.BTC), invoice.ProductInformation.ItemDesc, expiry);
+                string description = storeBlob.LightningDescriptionTemplate;
+                description = description.Replace("{StoreName}", store.StoreName ?? "", StringComparison.OrdinalIgnoreCase)
+                                         .Replace("{ItemDescription}", invoice.ProductInformation.ItemDesc ?? "", StringComparison.OrdinalIgnoreCase)
+                                         .Replace("{OrderId}", invoice.OrderId ?? "", StringComparison.OrdinalIgnoreCase);
+                lightningInvoice = await client.CreateInvoice(new LightMoney(due, LightMoneyUnit.BTC), description, expiry);
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 throw new PaymentMethodUnavailableException($"Impossible to create lightning invoice ({ex.Message})", ex);
             }
@@ -51,11 +57,6 @@ namespace BTCPayServer.Payments.Lightning
             };
         }
 
-        /// <summary>
-        /// Used for testing
-        /// </summary>
-        public bool SkipP2PTest { get; set; }
-
         public async Task<NodeInfo> Test(LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
         {
             if (!_Dashboard.IsFullySynched(network.CryptoCode, out var summary))
@@ -88,38 +89,34 @@ namespace BTCPayServer.Payments.Lightning
                 throw new PaymentMethodUnavailableException($"The lightning is not synched ({blocksGap} blocks)");
             }
 
+            return new NodeInfo(info.NodeId, info.Address, info.P2PPort);
+        }
+
+        public async Task TestConnection(NodeInfo nodeInfo, CancellationToken cancellation)
+        {
             try
             {
-                if (!SkipP2PTest)
+                IPAddress address = null;
+                try
                 {
-                    await TestConnection(info.Address, info.P2PPort, cts.Token);
+                    address = IPAddress.Parse(nodeInfo.Host);
+                }
+                catch
+                {
+                    address = (await Dns.GetHostAddressesAsync(nodeInfo.Host)).FirstOrDefault();
+                }
+
+                if (address == null)
+                    throw new PaymentMethodUnavailableException($"DNS did not resolved {nodeInfo.Host}");
+
+                using (var tcp = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp))
+                {
+                    await WithTimeout(tcp.ConnectAsync(new IPEndPoint(address, nodeInfo.Port)), cancellation);
                 }
             }
             catch (Exception ex)
             {
-                throw new PaymentMethodUnavailableException($"Error while connecting to the lightning node via {info.Address}:{info.P2PPort} ({ex.Message})");
-            }
-            return new NodeInfo(info.NodeId, info.Address, info.P2PPort);
-        }
-
-        private async Task TestConnection(string addressStr, int port, CancellationToken cancellation)
-        {
-            IPAddress address = null;
-            try
-            {
-                address = IPAddress.Parse(addressStr);
-            }
-            catch
-            {
-                address = (await Dns.GetHostAddressesAsync(addressStr)).FirstOrDefault();
-            }
-
-            if (address == null)
-                throw new PaymentMethodUnavailableException($"DNS did not resolved {addressStr}");
-
-            using (var tcp = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp))
-            {
-                await WithTimeout(tcp.ConnectAsync(new IPEndPoint(address, port)), cancellation);
+                throw new PaymentMethodUnavailableException($"Error while connecting to the lightning node via {nodeInfo.Host}:{nodeInfo.Port} ({ex.Message})");
             }
         }
 

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -52,9 +52,20 @@ namespace BTCPayServer.Payments.Lightning
 
             _ListenPoller = new Timer(async s =>
             {
-                await Task.WhenAll((await _InvoiceRepository.GetPendingInvoices())
-                .Select(async invoiceId => await EnsureListening(invoiceId, true))
-                .ToArray());
+                try
+                {
+                    await Task.WhenAll((await _InvoiceRepository.GetPendingInvoices())
+                    .Select(async invoiceId => await EnsureListening(invoiceId, true))
+                    .ToArray());
+                }
+                catch (AggregateException ex)
+                {
+                    Logs.PayServer.LogError(ex.InnerException ?? ex.InnerExceptions.FirstOrDefault(), $"Lightning: Uncaught error");
+                }
+                catch (Exception ex)
+                {
+                    Logs.PayServer.LogError(ex, $"Lightning: Uncaught error");
+                }
             }, null, 0, (int)PollInterval.TotalMilliseconds);
             leases.Add(_ListenPoller);
             return Task.CompletedTask;
@@ -90,7 +101,16 @@ namespace BTCPayServer.Payments.Lightning
                 if (poll)
                 {
                     var charge = _LightningClientFactory.CreateClient(lightningSupportedMethod, network);
-                    var chargeInvoice = await charge.GetInvoice(lightningMethod.InvoiceId);
+                    LightningInvoice chargeInvoice = null;
+                    try
+                    {
+                        chargeInvoice = await charge.GetInvoice(lightningMethod.InvoiceId);
+                    }
+                    catch(Exception ex)
+                    {
+                        Logs.PayServer.LogError(ex, $"{lightningSupportedMethod.CryptoCode} (Lightning): Can't connect to the lightning server");
+                        continue;
+                    }
                     if (chargeInvoice == null)
                         continue;
                     if (chargeInvoice.Status == "paid")

BTCPayServer/SearchString.cs

@@ -21,7 +21,7 @@ namespace BTCPayServer
                     .Select(t => t.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries))
                     .Where(kv => kv.Length == 2)
                     .Select(kv => new KeyValuePair<string, string>(kv[0].ToLowerInvariant(), kv[1]))
-                    .ToDictionary(o => o.Key, o => o.Value);
+                    .ToMultiValueDictionary(o => o.Key, o => o.Value);
 
             foreach(var filter in splitted)
             {
@@ -38,8 +38,8 @@ namespace BTCPayServer
             get;
             private set;
         }
-
-        public Dictionary<string, string> Filters { get; private set; }
+        
+        public MultiValueDictionary<string, string> Filters { get; private set; }
 
         public override string ToString()
         {

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/Claims.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services
+{
+    public class Claims
+    {
+        public const string SIN = "BITID_SIN";
+
+        public const string OwnStore = "BTCPAY_OWN_STORE";
+    }
+}

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 };
         }
@@ -97,10 +99,14 @@ namespace BTCPayServer.Services
             try
             {
                 var pubKey = await ledger.GetWalletPubKeyAsync(account);
-                if (pubKey.Address.Network != network.NBitcoinNetwork)
+                try
                 {
-                    if (network.DefaultSettings.ChainType == NBXplorer.ChainType.Main)
-                        throw new Exception($"The opened ledger app should be for {network.NBitcoinNetwork.Name}, not for {pubKey.Address.Network}");
+                    pubKey.GetAddress(network.NBitcoinNetwork);
+                }
+                catch
+                {
+                    if (network.NBitcoinNetwork.NetworkType == NetworkType.Mainnet)
+                        throw new Exception($"The opened ledger app does not seems to support {network.NBitcoinNetwork.Name}.");
                 }
                 var fingerprint = onlyChaincode ? new byte[4] : (await ledger.GetWalletPubKeyAsync(account.Parent)).UncompressedPublicKey.Compress().Hash.ToBytes().Take(4).ToArray();
                 var extpubkey = new ExtPubKey(pubKey.UncompressedPublicKey.Compress(), pubKey.ChainCode, (byte)account.Indexes.Length, fingerprint, account.Indexes.Last()).GetWif(network.NBitcoinNetwork);
@@ -125,9 +131,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))))
             {
@@ -189,6 +199,7 @@ namespace BTCPayServer.Services
 
             TransactionBuilder builder = new TransactionBuilder();
             builder.StandardTransactionPolicy.MinRelayTxFee = minTxRelayFee;
+            builder.SetConsensusFactory(network.NBitcoinNetwork);
             builder.AddCoins(coins.Select(c=>c.Coin).ToArray());
 
             foreach (var element in send)
@@ -235,6 +246,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/Invoices/InvoiceRepository.cs

@@ -399,9 +399,10 @@ namespace BTCPayServer.Services.Invoices
                     query = query.Where(i => i.Id == queryObject.InvoiceId);
                 }
 
-                if (!string.IsNullOrEmpty(queryObject.StoreId))
+                if (queryObject.StoreId != null && queryObject.StoreId.Length > 0)
                 {
-                    query = query.Where(i => i.StoreDataId == queryObject.StoreId);
+                    var stores = queryObject.StoreId.ToHashSet();
+                    query = query.Where(i => stores.Contains(i.StoreDataId));
                 }
 
                 if (queryObject.UserId != null)
@@ -429,8 +430,11 @@ namespace BTCPayServer.Services.Invoices
                 if (queryObject.OrderId != null)
                     query = query.Where(i => i.OrderId == queryObject.OrderId);
 
-                if (queryObject.Status != null)
-                    query = query.Where(i => i.Status == queryObject.Status);
+                if (queryObject.Status != null && queryObject.Status.Length > 0)
+                {
+                    var statusSet = queryObject.Status.ToHashSet();
+                    query = query.Where(i => statusSet.Contains(i.Status));
+                }
 
                 query = query.OrderByDescending(q => q.Created);
 
@@ -568,7 +572,7 @@ namespace BTCPayServer.Services.Invoices
 
     public class InvoiceQuery
     {
-        public string StoreId
+        public string[] StoreId
         {
             get; set;
         }
@@ -610,7 +614,7 @@ namespace BTCPayServer.Services.Invoices
             get; set;
         }
 
-        public string Status
+        public string[] Status
         {
             get; set;
         }

BTCPayServer/Services/LanguageService.cs

@@ -26,10 +26,12 @@ 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"),
                 new Language("is-IS", "Íslenska"),
+                new Language("hr-HR", "Croatian"),
             };
         }
     }

BTCPayServer/Services/Rates/BTCPayRateProviderFactory.cs

@@ -0,0 +1,95 @@
+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)
+        {
+            List<IRateProvider> providers = new List<IRateProvider>();
+
+            if(exchange == "quadrigacx")
+            {
+                providers.Add(new QuadrigacxRateProvider(network.CryptoCode));
+            }
+
+            var coinAverage = new CoinAverageRateProviderDescription(network.CryptoCode).CreateRateProvider(serviceProvider);
+            coinAverage.Exchange = exchange;
+            providers.Add(coinAverage);
+            return new FallbackRateProvider(providers.ToArray());
+        }
+
+        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,82 @@ 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>());
+            var totalPeriod = jobj["total_period"].Value<string>();
+            if (totalPeriod == "24h")
+            {
+                response.TotalPeriod = TimeSpan.FromHours(24);
+            }
+            else if (totalPeriod == "30d")
+            {
+                response.TotalPeriod = TimeSpan.FromDays(30);
+            }
+            else
+            {
+                response.TotalPeriod = TimeSpan.FromSeconds(jobj["total_period"].Value<int>());
+            }
+            response.RequestsLeft = jobj["requests_left"].Value<int>();
+            response.RequestsPerPeriod = jobj["requests_per_period"].Value<int>();
+            return response;
+        }
+
+        public async Task<GetExchangeTickersResponse> GetExchangeTickersAsync()
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, "https://apiv2.bitcoinaverage.com/symbols/exchanges/ticker");
+            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 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; }
+        public int RequestsPerPeriod { get; set; }
+        public TimeSpan TotalPeriod { get; set; }
     }
 }

BTCPayServer/Services/Rates/CoinAverageSettings.cs

@@ -0,0 +1,119 @@
+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 CoinAverageSettingsAuthenticator : ICoinAverageAuthenticator
+    {
+        CoinAverageSettings _Settings;
+        public CoinAverageSettingsAuthenticator(CoinAverageSettings settings)
+        {
+            _Settings = settings;
+        }
+        public Task AddHeader(HttpRequestMessage message)
+        {
+            return _Settings.AddHeader(message);
+        }
+    }
+    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 CoinAverageSettings()
+        {
+            //GENERATED BY:
+            //StringBuilder b = new StringBuilder();
+            //b.AppendLine("_coinAverageSettings.AvailableExchanges = new[] {");
+            //foreach (var availableExchange in _coinAverageSettings.AvailableExchanges)
+            //{
+            //    b.AppendLine($"(DisplayName: \"{availableExchange.DisplayName}\", Name: \"{availableExchange.Name}\"),");
+            //}
+            //b.AppendLine("}.ToArray()");
+
+            AvailableExchanges = new[] {
+                (DisplayName: "BitBargain", Name: "bitbargain"),
+                (DisplayName: "Tidex", Name: "tidex"),
+                (DisplayName: "LocalBitcoins", Name: "localbitcoins"),
+                (DisplayName: "EtherDelta", Name: "etherdelta"),
+                (DisplayName: "Kraken", Name: "kraken"),
+                (DisplayName: "BitBay", Name: "bitbay"),
+                (DisplayName: "Independent Reserve", Name: "independentreserve"),
+                (DisplayName: "Exmoney", Name: "exmoney"),
+                (DisplayName: "Bitcoin.co.id", Name: "bitcoin_co_id"),
+                (DisplayName: "Huobi", Name: "huobi"),
+                (DisplayName: "GDAX", Name: "gdax"),
+                (DisplayName: "Coincheck", Name: "coincheck"),
+                (DisplayName: "Bittylicious", Name: "bittylicious"),
+                (DisplayName: "Gemini", Name: "gemini"),
+                (DisplayName: "QuadrigaCX", Name: "quadrigacx"),
+                (DisplayName: "Bit2C", Name: "bit2c"),
+                (DisplayName: "Luno", Name: "luno"),
+                (DisplayName: "Negocie Coins", Name: "negociecoins"),
+                (DisplayName: "FYB-SE", Name: "fybse"),
+                (DisplayName: "Hitbtc", Name: "hitbtc"),
+                (DisplayName: "Bitex.la", Name: "bitex"),
+                (DisplayName: "Korbit", Name: "korbit"),
+                (DisplayName: "itBit", Name: "itbit"),
+                (DisplayName: "Okex", Name: "okex"),
+                (DisplayName: "Bitsquare", Name: "bitsquare"),
+                (DisplayName: "Bitfinex", Name: "bitfinex"),
+                (DisplayName: "CoinMate", Name: "coinmate"),
+                (DisplayName: "Bitstamp", Name: "bitstamp"),
+                (DisplayName: "Cryptonit", Name: "cryptonit"),
+                (DisplayName: "Foxbit", Name: "foxbit"),
+                (DisplayName: "QuickBitcoin", Name: "quickbitcoin"),
+                (DisplayName: "Poloniex", Name: "poloniex"),
+                (DisplayName: "Bit-Z", Name: "bitz"),
+                (DisplayName: "Liqui", Name: "liqui"),
+                (DisplayName: "BitKonan", Name: "bitkonan"),
+                (DisplayName: "Kucoin", Name: "kucoin"),
+                (DisplayName: "Binance", Name: "binance"),
+                (DisplayName: "Rock Trading", Name: "rocktrading"),
+                (DisplayName: "Mercado Bitcoin", Name: "mercado"),
+                (DisplayName: "Coinsecure", Name: "coinsecure"),
+                (DisplayName: "Coinfloor", Name: "coinfloor"),
+                (DisplayName: "bitFlyer", Name: "bitflyer"),
+                (DisplayName: "BTCTurk", Name: "btcturk"),
+                (DisplayName: "Bittrex", Name: "bittrex"),
+                (DisplayName: "CampBX", Name: "campbx"),
+                (DisplayName: "Zaif", Name: "zaif"),
+                (DisplayName: "FYB-SG", Name: "fybsg"),
+                (DisplayName: "Quoine", Name: "quoine"),
+                (DisplayName: "BTC Markets", Name: "btcmarkets"),
+                (DisplayName: "Bitso", Name: "bitso"),
+                }.ToArray();
+        }
+
+        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/QuadrigacxRateProvider.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class QuadrigacxRateProvider : IRateProvider
+    {
+        public QuadrigacxRateProvider(string crypto)
+        {
+            CryptoCode = crypto;
+        }
+        public string CryptoCode { get; set; }
+        static HttpClient _Client = new HttpClient();
+        public async Task<decimal> GetRateAsync(string currency)
+        {
+            return await GetRatesAsyncCore(CryptoCode, currency);
+        }
+
+        private async Task<decimal> GetRatesAsyncCore(string cryptoCode, string currency)
+        {
+            var response = await _Client.GetAsync($"https://api.quadrigacx.com/v2/ticker?book={cryptoCode.ToLowerInvariant()}_{currency.ToLowerInvariant()}");
+            response.EnsureSuccessStatusCode();
+            var rates = JObject.Parse(await response.Content.ReadAsStringAsync());
+            if (!TryToDecimal(rates, out var result))
+                throw new RateUnavailableException(currency);
+            return result;
+        }
+
+        private bool TryToDecimal(JObject p, out decimal v)
+        {
+            v = 0.0m;
+            JToken token = p.Property("bid")?.Value;
+            if (token == null)
+                return false;
+            return decimal.TryParse(token.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out v);
+        }
+
+        public async Task<ICollection<Rate>> GetRatesAsync()
+        {
+            var response = await _Client.GetAsync($"https://api.quadrigacx.com/v2/ticker?book=all");
+            response.EnsureSuccessStatusCode();
+            var rates = JObject.Parse(await response.Content.ReadAsStringAsync());
+
+            List<Rate> result = new List<Rate>();
+            foreach (var prop in rates.Properties())
+            {
+                var rate = new Rate();
+                var splitted = prop.Name.Split('_');
+                var crypto = splitted[0].ToUpperInvariant();
+                if (crypto != CryptoCode)
+                    continue;
+                rate.Currency = splitted[1].ToUpperInvariant();
+                TryToDecimal((JObject)prop.Value, out var v);
+                rate.Value = v;
+                result.Add(rate);
+            }
+            return result;
+        }
+    }
+}

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/Services/Stores/StoreRepository.cs

@@ -20,6 +20,8 @@ namespace BTCPayServer.Services.Stores
 
         public async Task<StoreData> FindStore(string storeId)
         {
+            if (storeId == null)
+                return null;
             using (var ctx = _ContextFactory.CreateContext())
             {
                 return await ctx.FindAsync<StoreData>(storeId).ConfigureAwait(false);

BTCPayServer/Services/ThemesSettings.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services
+{
+    public class ThemeSettings
+    {
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public string BootstrapCssUri { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public string CreativeStartCssUri { get; set; }
+    }
+}

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/ExternalLogin.cshtml

@@ -22,7 +22,7 @@
                 <input asp-for="Email" class="form-control" />
                 <span asp-validation-for="Email" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Register</button>
+            <button type="submit" class="btn btn-primary">Register</button>
         </form>
     </div>
 </div>

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-default">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/Account/Login.cshtml

@@ -41,7 +41,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <button type="submit" class="btn btn-default">Log in</button>
+                            <button type="submit" class="btn btn-primary">Log in</button>
                         </div>
                         <div class="form-group">
                             <p>
@@ -76,7 +76,7 @@
                                     <p>
                                         @foreach(var provider in loginProviders)
                                         {
-                                            <button type="submit" class="btn btn-default" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.Name</button>
+                                            <button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.Name</button>
                                         }
                                     </p>
                                 </div>

BTCPayServer/Views/Account/LoginWith2fa.cshtml

@@ -31,7 +31,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <button type="submit" class="btn btn-default">Log in</button>
+                        <button type="submit" class="btn btn-primary">Log in</button>
                     </div>
                 </form>
             </div>

BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml

@@ -18,7 +18,7 @@
                 <input asp-for="RecoveryCode" class="form-control" autocomplete="off" />
                 <span asp-validation-for="RecoveryCode" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Log in</button>
+            <button type="submit" class="btn btn-primary">Log in</button>
         </form>
     </div>
 </div>

BTCPayServer/Views/Account/Register.cshtml

@@ -35,7 +35,7 @@
                         <input asp-for="ConfirmPassword" class="form-control" />
                         <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
                     </div>
-                    <button type="submit" class="btn btn-default">Register</button>
+                    <button type="submit" class="btn btn-primary">Register</button>
                 </form>
             </div>
         </div>

BTCPayServer/Views/Account/ResetPassword.cshtml

@@ -26,7 +26,7 @@
                 <input asp-for="ConfirmPassword" class="form-control" />
                 <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Reset</button>
+            <button type="submit" class="btn btn-primary">Reset</button>
         </form>
     </div>
 </div>

BTCPayServer/Views/Apps/CreateApp.cshtml

@@ -28,7 +28,7 @@
                         <select asp-for="SelectedStore" asp-items="Model.Stores" class="form-control"></select>
                     </div>
                     <div class="form-group">
-                        <input type="submit" value="Create" class="btn btn-default" />
+                        <input type="submit" value="Create" class="btn btn-primary" />
                     </div>
                 </form>
                 <a asp-action="ListApps">Back to the app list</a>

BTCPayServer/Views/Apps/ListApps.cshtml

@@ -21,9 +21,9 @@
         </div>
 
         <div class="row">
-            <a asp-action="CreateApp" class="btn btn-success" role="button"><span class="glyphicon glyphicon-plus"></span> Create a new app</a>
-            <table class="table">
-                <thead class="thead-inverse">
+            <a asp-action="CreateApp" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new app</a>
+            <table class="table table-sm table-responsive-md">
+                <thead>
                     <tr>
                         <th>Store</th>
                         <th>Name</th>
@@ -32,11 +32,11 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach(var app in Model.Apps)
+                    @foreach (var app in Model.Apps)
                     {
                         <tr>
                             <td>
-                                @if(app.IsOwner)
+                                @if (app.IsOwner)
                                 {
                                     <span><a asp-action="UpdateStore" asp-controller="Stores" asp-route-storeId="@app.StoreId">@app.StoreName</a></span>
                                 }
@@ -48,7 +48,7 @@
                             <td>@app.AppName</td>
                             <td>@app.AppType</td>
                             <td style="text-align:right">
-                                @if(app.IsOwner)
+                                @if (app.IsOwner)
                                 {
                                     <a asp-action="@app.UpdateAction" asp-controller="Apps" asp-route-appId="@app.Id">Settings</a><span> - </span>
                                 }

BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml

@@ -29,13 +29,17 @@
                         <input asp-for="Currency" class="form-control" />
                         <span asp-validation-for="Currency" class="text-danger"></span>
                     </div>
+                    <div class="form-group">
+                        <label asp-for="ShowCustomAmount"></label>
+                        <input asp-for="ShowCustomAmount" type="checkbox" class="form-check" />
+                    </div>
                     <div class="form-group">
                         <label asp-for="Template" class="control-label"></label>*
                         <textarea asp-for="Template" rows="20" cols="40" class="form-control"></textarea>
                         <span asp-validation-for="Template" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <input type="submit" class="btn btn-success" />
+                        <input type="submit" class="btn btn-primary" />
                     </div>
                 </form>
                 <a asp-action="ListApps">Back to the app list</a>

BTCPayServer/Views/Apps/ViewPointOfSale.cshtml

@@ -11,38 +11,42 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <link rel="stylesheet" href="~/vendor/bootstrap/css/bootstrap.css" />
+    <link rel="stylesheet" href="~/vendor/bootstrap4/css/bootstrap.css" />
 </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">
-                    @foreach(var item in Model.Items)
+                    @for(int i = 0; i < Model.Items.Length; i++)
                     {
-                        <div class="col-sm-4 mb-3">
+                        var className = (Model.Items.Length - i) > (Model.Items.Length % 3) ? "col-sm-4 mb-3" : "col align-self-center";
+                        var item = Model.Items[i];
+                        <div class="@className">
                             <h3>@item.Title</h3>
-                            <button type="submit" name="choiceKey" class="btn btn-secondary" value="@item.Id">Buy for @item.Price.Formatted</button>
+                            <button type="submit" name="choiceKey" class="btn btn-primary" value="@item.Id">Buy for @item.Price.Formatted</button>
                         </div>
                     }
                 </div>
             </form>
-            @*<div class="row mt-4">
+            @if(Model.ShowCustomAmount)
+            {
+                <div class="row mt-4">
                     <div class="col-md-4 offset-md-4 col-sm-6 offset-sm-3">
-                        <h3>Something else</h3>
-                        <form data-buy>
+                        <form method="post" data-buy>
                             <div class="input-group">
-                                <input class="form-control" type="number" step="0.00001" name="amount" placeholder="undefined (optional)"><div class="input-group-append">
+                                <input class="form-control" type="number" min="0" step="@Model.Step" name="amount" placeholder="amount"><div class="input-group-append">
                                     <button class="btn btn-primary" type="submit">Pay</button>
                                 </div>
                             </div>
                         </form>
                     </div>
-                </div>*@
+                </div>
+            }
         </div>
     </div>
-    <script src="~/vendor/bootstrap/js/bootstrap.js"></script>
     <script src="~/vendor/jquery/jquery.js"></script>
+    <script src="~/vendor/bootstrap4/js/bootstrap.js"></script>
 </body>
 </html>

BTCPayServer/Views/Home/Home.cshtml

@@ -6,8 +6,9 @@
 
 <header class="masthead">
     <div class="header-content">
-        <div class="header-content-inner">
-            <h1 id="homeHeading" style="padding-bottom:30px;">Welcome to BTCPay Server</h1>
+        <div class="header-content-inner text-white">
+            <h1>Welcome to BTCPay Server</h1>
+            <hr />
             <p>BTCPay Server is a free and open source server for merchants wanting to accept Bitcoin for their business. The API is compatible with Bitpay service to allow seamless migration.</p>
             <a style="background-color: #fff;color: #222;display:inline-block;text-align: center;white-space: nowrap;vertical-align: middle;user-select: none;line-height: 1.25;font-size: 1rem;text-decoration:none;font-weight: 700;    text-transform: uppercase;border: none;border-radius: 300px;padding: 15px 30px;" href="https://github.com/btcpayserver/btcpayserver-doc">Getting started</a>
         </div>
@@ -28,21 +29,21 @@
             <div class="col-lg-4 col-md-6 text-center">
                 <div class="service-box">
                     <img src="~/img/lock-logo.png" />
-                    <h3>Secure</h3>
+                    <h3 class="text-dark">Secure</h3>
                     <p class="text-muted">The payment server does not need to know your private keys, so your money can't be stolen.</p>
                 </div>
             </div>
             <div class="col-lg-4 col-md-6 text-center">
                 <div class="service-box">
                     <img src="~/img/qr-logo.png" />
-                    <h3>Easy</h3>
+                    <h3 class="text-dark">Easy</h3>
                     <p class="text-muted">A user-friendly Bitcoin checkout page for your customers.</p>
                 </div>
             </div>
             <div class="col-lg-4 col-md-6 text-center">
                 <div class="service-box">
                     <img src="~/img/money-logo.png" />
-                    <h3>Visibility</h3>
+                    <h3 class="text-dark">Visibility</h3>
                     <p class="text-muted">Manage, generate reports, and search for your invoices easily.</p>
                 </div>
             </div>
@@ -52,7 +53,7 @@
 
 
 
-<div class="call-to-action bg-dark">
+<div class="call-to-action bg-dark text-white">
     <div class="container text-center">
         <h2>Video tutorials</h2>
         <div class="row">
@@ -102,12 +103,12 @@
     </div>
 </section>
 
-<div class="call-to-action bg-dark">
+<div class="call-to-action bg-dark text-white">
     <div class="container text-center">
         <h2>Donate</h2>
         <p>Donation to this address will be reinvested into the development of this tool</p>
-        <img src="~/img/donation.jpg">
-        <p style="font-size:10px">3BpfdkF93GwFRWdrAN3SNsRAsi6d158YQi</p>
+        <p><img src="~/img/donation.jpg"></p>
+        <p>3BpfdkF93GwFRWdrAN3SNsRAsi6d158YQi</p>
     </div>
 </div>
 
@@ -117,7 +118,10 @@
             <div class="col-lg-8 mx-auto text-center">
                 <h2 class="section-heading">Let's Get In Touch!</h2>
                 <hr class="primary">
-                <p>An open source project is nothing without its community, come and get in touch with us!</p>
+                <p>
+                    An open source project is nothing without its community<br />
+                    Come and get in touch with us!
+                </p>
             </div>
         </div>
         <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">
@@ -156,7 +163,6 @@
         <div class="payment__details__instruction__open-wallet">
             <a class="payment__details__instruction__open-wallet__btn action-button" v-bind:href="srvModel.invoiceBitcoinUrl">
                 <span>{{$t("Open in wallet")}}</span>
-                <span class="glyphicon glyphicon-new-window"></span>
             </a>
         </div>
     </div>
@@ -250,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">
@@ -296,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,10 +110,12 @@
                 '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 },
                 'is-IS': { translation: locales_is }
+                'hr-HR': { translation: locales_hr }
             },
         });
 

BTCPayServer/Views/Invoice/CreateInvoice.cshtml

@@ -55,7 +55,7 @@
                         <span asp-validation-for="StoreId" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <input type="submit" value="Create" class="btn btn-default" />
+                        <input type="submit" value="Create" class="btn btn-primary" />
                     </div>
                 </form>
                 <a asp-action="ListInvoices">Back to List</a>

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -4,14 +4,21 @@
 }
 
 <style type="text/css">
-    .overflowbox {
-        max-width: 0;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+    .linethrough {
+        text-decoration: line-through;
     }
-    .money {
-        text-align: right;
+
+    .smMaxWidth {
+        max-width: 200px;
+    }
+    @@media (min-width: 768px) {
+        .smMaxWidth {
+            max-width: 400px;
+        }
+    }
+
+    .firstCol {
+        width: 140px;
     }
 </style>
 
@@ -28,14 +35,13 @@
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading">@ViewData["Title"]</h2>
                 <hr class="primary">
-                <p>Invoice details</p>
             </div>
         </div>
 
         <div class="row">
             <div class="col-md-6">
                 <h3>Information</h3>
-                <table class="table">
+                <table class="table table-sm table-responsive-md">
                     <tr>
                         <th>Store</th>
                         <td><a href="@Model.StoreLink">@Model.StoreName</a></td>
@@ -93,10 +99,9 @@
 
             <div class="col-md-6">
                 <h3>Buyer information</h3>
-                <table class="table">
+                <table class="table table-sm table-responsive-md">
                     <tr>
-                        <th>Name
-                        <th>
+                        <th>Name</th>
                         <td>@Model.BuyerInformation.BuyerName</td>
                     </tr>
                     <tr>
@@ -134,7 +139,7 @@
                 </table>
 
                 <h3>Product information</h3>
-                <table class="table">
+                <table class="table table-sm table-responsive-md">
                     <tr>
                         <th>Item code</th>
                         <td>@Model.ProductInformation.ItemCode</td>
@@ -153,77 +158,109 @@
         <div class="row">
             <div class="col-md-12">
                 <h3>Paid summary</h3>
-                <table class="table">
+                <table class="table table-sm table-responsive-md">
                     <thead class="thead-inverse">
                         <tr>
-                            <th style="white-space:nowrap;">Payment method</th>
+                            <th>Payment method</th>
                             <th>Address</th>
-                            <th class="money">Rate</th>
-                            <th class="money">Paid</th>
-                            <th class="money">Due</th>
+                            <th class="text-right">Rate</th>
+                            <th class="text-right">Paid</th>
+                            <th class="text-right">Due</th>
                         </tr>
                     </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>
-                }
+                        @foreach (var payment in Model.CryptoPayments)
+                        {
+                            <tr>
+                                <td>@payment.PaymentMethod</td>
+                                <td>@payment.Address</td>
+                                <td class="text-right">@payment.Rate</td>
+                                <td class="text-right">@payment.Paid</td>
+                                <td class="text-right">@payment.Due</td>
+                            </tr>
+                        }
                     </tbody>
                 </table>
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-12">
-                <h3>Payments</h3>
-                <table class="table">
-                    <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 table-responsive-lg">
+                        <thead class="thead-inverse">
+                            <tr>
+                                <th>Crypto</th>
+                                <th>Deposit address</th>
+                                <th>Transaction Id</th>
+                                <th class="text-right">Confirmations</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var payment in Model.OnChainPayments)
+                            {
+                                var replaced = payment.Replaced ? "class='linethrough'" : "";
+                                <tr @replaced>
+                                    <td>@payment.Crypto</td>
+                                    <td>@payment.DepositAddress</td>
+                                    <td class="smMaxWidth text-truncate">
+                                        <a href="@payment.TransactionLink" target="_blank">
+                                            @payment.TransactionId
+                                        </a>
+                                    </td>
+                                    <td class="text-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 table-responsive-md">
+                        <thead class="thead-inverse">
+                            <tr>
+                                <th class="firstCol">Crypto</th>
+                                <th>BOLT11</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var payment in Model.OffChainPayments)
+                            {
+                                <tr>
+                                    <td>@payment.Crypto</td>
+                                    <td class="smMaxWidth text-truncate">@payment.BOLT11</td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        }
         <div class="row">
             <div class="col-md-12">
                 <h3>Addresses</h3>
-                <table class="table">
+                <table class="table table-sm table-responsive-md">
                     <thead class="thead-inverse">
                         <tr>
-                            <th style="white-space:nowrap;">Payment method</th>
+                            <th class="firstCol">Payment method</th>
                             <th>Address</th>
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach(var address in Model.Addresses)
+                        @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>
-                    }
+                            var current = address.Current ? "font-weight-bold" : "";
+                            <tr>
+                                <td>@address.PaymentMethod</td>
+                                <td class="smMaxWidth text-truncate @current">@address.Destination</td>
+                            </tr>
+                        }
                     </tbody>
                 </table>
             </div>
@@ -232,7 +269,7 @@
         <div class="row">
             <div class="col-md-12">
                 <h3>Events</h3>
-                <table class="table">
+                <table class="table table-sm table-responsive-md">
                     <thead class="thead-inverse">
                         <tr>
                             <th>Date</th>
@@ -240,7 +277,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach(var evt in Model.Events)
+                        @foreach (var evt in Model.Events)
                         {
                             <tr>
                                 <td>@evt.Timestamp</td>

BTCPayServer/Views/Invoice/ListInvoices.cshtml

@@ -18,30 +18,39 @@
                 <hr class="primary">
                 <p>Create, search or pay an invoice. (<a href="#help" data-toggle="collapse">Help</a>)</p>
                 <div id="help" class="collapse text-left">
-                    <p>You can search for invoice Id, deposit address, price, order id, store id, any buyer information and any product information.</br>
-                    You can also apply filters to your search by searching for `filtername:value`, here is a list of supported filters</p>
+                    <p>
+                        You can search for invoice Id, deposit address, price, order id, store id, any buyer information and any product information.</br>
+                        You can also apply filters to your search by searching for `filtername:value`, here is a list of supported filters
+                    </p>
                     <ul>
                         <li><b>storeid:id</b> for filtering a specific store</li>
                         <li><b>status:(expired|invalid|complete|confirmed|paid|new)</b> for filtering a specific status</li>
                     </ul>
+                    <p>
+                        If you want two confirmed and complete invoices, duplicate the filter: `status:confirmed status:complete`.
+                    </p>
                 </div>
                 <div class="form-group">
                     <form asp-action="SearchInvoice" method="post">
-                        <input asp-for="SearchTerm" class="form-control" />
+                        <div class="input-group">
+                            <input asp-for="SearchTerm" class="form-control" />
+                            <span class="input-group-btn">
+                                <button type="submit" class="btn btn-primary" title="Search invoice">
+                                    <span class="fa fa-search"></span> Search
+                                </button>
+                            </span>
+                        </div>
                         <input type="hidden" asp-for="Count" />
                         <span asp-validation-for="SearchTerm" class="text-danger"></span>
-                        <button type="submit" class="btn btn-default" title="Search invoice">
-                            <span class="glyphicon glyphicon-search"></span> Search
-                        </button>
                     </form>
                 </div>
             </div>
         </div>
 
         <div class="row">
-            <a asp-action="CreateInvoice" class="btn btn-success" role="button"><span class="glyphicon glyphicon-plus"></span> Create a new invoice</a>
-            <table class="table">
-                <thead class="thead-inverse">
+            <a asp-action="CreateInvoice" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new invoice</a>
+            <table class="table table-sm table-responsive-md">
+                <thead>
                     <tr>
                         <th>Date</th>
                         <th>OrderId</th>
@@ -82,13 +91,13 @@
                             }
                             else
                             {
-                                <td >@invoice.Status</td>
+                                <td>@invoice.Status</td>
                             }
                             <td style="text-align:right">@invoice.AmountCurrency</td>
                             <td style="text-align:right">
                                 @if(invoice.Status == "new")
                                 {
-                                    <a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a> <span>-</span> 
+                                    <a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a> <span>-</span>
                                 }<a asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId">Details</a>
                             </td>
                         </tr>
@@ -134,7 +143,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="submit" class="btn btn-danger">Yes, make invoice Invalid</button>
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
                 </div>
             </div>
 

BTCPayServer/Views/Manage/ChangePassword.cshtml

@@ -1,7 +1,6 @@
 @model ChangePasswordViewModel
 @{
-    ViewData["Title"] = "Change password";
-    ViewData.AddActivePage(ManageNavPages.ChangePassword);
+    ViewData.SetActivePageAndTitle(ManageNavPages.ChangePassword, "Change password");
 }
 
 <h4>@ViewData["Title"]</h4>
@@ -25,7 +24,7 @@
                 <input asp-for="ConfirmPassword" class="form-control" />
                 <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Update password</button>
+            <button type="submit" class="btn btn-primary">Update password</button>
         </form>
     </div>
 </div>