Add extended notifications

fix typos

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -43,21 +43,15 @@ namespace BTCPayServer.Tests
         {
             get; set;
         }
-        public string CookieFile
-        {
-            get; set;
-        }
+
+        public Uri LTCNBXplorerUri { get; set; }
+        
         public Uri ServerUri
         {
             get;
             set;
         }
 
-        public ExtKey HDPrivateKey
-        {
-            get; set;
-        }
-
         public string Postgres
         {
             get; set;
@@ -73,21 +67,31 @@ namespace BTCPayServer.Tests
         {
             if (!Directory.Exists(_Directory))
                 Directory.CreateDirectory(_Directory);
+            string chain = ChainType.Regtest.ToNetwork().Name;
+            string chainDirectory = Path.Combine(_Directory, chain);
+            if (!Directory.Exists(chainDirectory))
+                Directory.CreateDirectory(chainDirectory);
+
 
-            HDPrivateKey = new ExtKey();
             StringBuilder config = new StringBuilder();
-            config.AppendLine($"regtest=1");
+            config.AppendLine($"{chain.ToLowerInvariant()}=1");
             config.AppendLine($"port={Port}");
-            config.AppendLine($"explorer.url={NBXplorerUri.AbsoluteUri}");
-            config.AppendLine($"explorer.cookiefile={CookieFile}");
-            config.AppendLine($"hdpubkey={HDPrivateKey.Neuter().ToString(Network.RegTest)}");
+            config.AppendLine($"chains=btc,ltc");
+
+            config.AppendLine($"btc.explorer.url={NBXplorerUri.AbsoluteUri}");
+            config.AppendLine($"btc.explorer.cookiefile=0");
+
+            config.AppendLine($"ltc.explorer.url={LTCNBXplorerUri.AbsoluteUri}");
+            config.AppendLine($"ltc.explorer.cookiefile=0");
+
             if (Postgres != null)
                 config.AppendLine($"postgres=" + Postgres);
-            File.WriteAllText(Path.Combine(_Directory, "settings.config"), config.ToString());
+            var confPath = Path.Combine(chainDirectory, "settings.config");
+            File.WriteAllText(confPath, config.ToString());
 
             ServerUri = new Uri("http://" + HostName + ":" + Port + "/");
 
-            var conf = new DefaultConfiguration() { Logger = Logs.LogProvider.CreateLogger("Console") }.CreateConfiguration(new[] { "--datadir", _Directory });
+            var conf = new DefaultConfiguration() { Logger = Logs.LogProvider.CreateLogger("Console") }.CreateConfiguration(new[] { "--datadir", _Directory, "--conf", confPath });
 
             _Host = new WebHostBuilder()
                     .UseConfiguration(conf)

BTCPayServer.Tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.0.0-sdk
+FROM microsoft/dotnet:2.0.5-sdk-2.1.4
 WORKDIR /app
  # caches restore result by copying csproj file separately
 COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj

BTCPayServer.Tests/EclairTester.cs

@@ -12,7 +12,7 @@ namespace BTCPayServer.Tests
         public EclairTester(ServerTester parent, string environmentName, string defaultRPC, string defaultHost)
         {
             this.parent = parent;
-            RPC = new EclairRPCClient(new Uri(parent.GetEnvironment(environmentName, defaultRPC)), parent.Network);
+            //RPC = new EclairRPCClient(new Uri(parent.GetEnvironment(environmentName, defaultRPC)), parent.Network);
             P2PHost = parent.GetEnvironment(environmentName + "_HOST", defaultHost);
         }
 

BTCPayServer.Tests/ServerTester.cs

@@ -47,11 +47,17 @@ namespace BTCPayServer.Tests
                 Directory.CreateDirectory(_Directory);
 
 
-            ExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_RPCCONNECTION", "server=http://127.0.0.1:43782;ceiwHEbqWI83:DwubwWsoo3")), Network);
-            ExplorerClient = new ExplorerClient(Network, new Uri(GetEnvironment("TESTS_NBXPLORERURL", "http://127.0.0.1:32838/")));
+            NetworkProvider = new BTCPayNetworkProvider(ChainType.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);
+
+            ExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork("BTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_BTCNBXPLORERURL", "http://127.0.0.1:32838/")));
+            LTCExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork("LTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_LTCNBXPLORERURL", "http://127.0.0.1:32838/")));
+
             PayTester = new BTCPayServerTester(Path.Combine(_Directory, "pay"))
             {
                 NBXplorerUri = ExplorerClient.Address,
+                LTCNBXplorerUri = LTCExplorerClient.Address,
                 Postgres = GetEnvironment("TESTS_POSTGRES", "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver")
             };
             PayTester.Port = int.Parse(GetEnvironment("TESTS_PORT", Utils.FreeTcpPort().ToString()));
@@ -102,15 +108,23 @@ namespace BTCPayServer.Tests
         {
             return new TestAccount(this);
         }
+
+        public BTCPayNetworkProvider NetworkProvider { get; private set; }
         public RPCClient ExplorerNode
         {
             get; set;
         }
 
+        public RPCClient LTCExplorerNode
+        {
+            get; set;
+        }
+
         public ExplorerClient ExplorerClient
         {
             get; set;
         }
+        public ExplorerClient LTCExplorerClient { get; set; }
 
         HttpClient _Http = new HttpClient();
 
@@ -212,12 +226,6 @@ namespace BTCPayServer.Tests
             get; set;
         }
 
-        public Network Network
-        {
-            get;
-            set;
-        } = Network.RegTest;
-
         public void Dispose()
         {
             if (PayTester != null)

BTCPayServer.Tests/TestAccount.cs

@@ -46,31 +46,53 @@ namespace BTCPayServer.Tests
             Assert.IsType<ViewResult>(await store.RequestPairing(pairingCode.ToString()));
             await store.Pair(pairingCode.ToString(), StoreId);
         }
-        public StoresController CreateStore()
+        public StoresController CreateStore(string cryptoCode = null)
         {
-            return CreateStoreAsync().GetAwaiter().GetResult();
+            return CreateStoreAsync(cryptoCode).GetAwaiter().GetResult();
         }
-        public async Task<StoresController> CreateStoreAsync()
+
+        public string CryptoCode { get; set; } = "BTC";
+        public async Task<StoresController> CreateStoreAsync(string cryptoCode = null)
         {
-            ExtKey = new ExtKey().GetWif(parent.Network);
+            cryptoCode = cryptoCode ?? CryptoCode;
+            SupportedNetwork = parent.NetworkProvider.GetNetwork(cryptoCode);
+            ExtKey = new ExtKey().GetWif(SupportedNetwork.NBitcoinNetwork);
             var store = parent.PayTester.GetController<StoresController>(UserId);
             await store.CreateStore(new CreateStoreViewModel() { Name = "Test Store" });
             StoreId = store.CreatedStoreId;
-            DerivationScheme = new DerivationStrategyFactory(parent.Network).Parse(ExtKey.Neuter().ToString() + "-[legacy]");
-            await store.UpdateStore(StoreId, new StoreViewModel()
-            {
-                SpeedPolicy = SpeedPolicy.MediumSpeed
-            });
+            DerivationScheme = new DerivationStrategyFactory(SupportedNetwork.NBitcoinNetwork).Parse(ExtKey.Neuter().ToString() + "-[legacy]");
+            var vm = (StoreViewModel)((ViewResult)await store.UpdateStore(StoreId)).Model;
+            vm.SpeedPolicy = SpeedPolicy.MediumSpeed;
+            await store.UpdateStore(StoreId, vm);
 
             await store.AddDerivationScheme(StoreId, new DerivationSchemeViewModel()
             {
-                CryptoCurrency = "BTC",
+                CryptoCurrency = cryptoCode,
                 DerivationSchemeFormat = "BTCPay",
                 DerivationScheme = DerivationScheme.ToString(),
             }, "Save");
             return store;
         }
 
+        public BTCPayNetwork SupportedNetwork { get; set; }
+
+        public void RegisterDerivationScheme(string crytoCode)
+        {
+            RegisterDerivationSchemeAsync(crytoCode).GetAwaiter().GetResult();
+        }
+        public async Task RegisterDerivationSchemeAsync(string crytoCode)
+        {
+            var store = parent.PayTester.GetController<StoresController>(UserId);
+            var networkProvider = parent.PayTester.GetService<BTCPayNetworkProvider>();
+            var derivation = new DerivationStrategyFactory(networkProvider.GetNetwork(crytoCode).NBitcoinNetwork).Parse(ExtKey.Neuter().ToString() + "-[legacy]");
+            await store.AddDerivationScheme(StoreId, new DerivationSchemeViewModel()
+            {
+                CryptoCurrency = crytoCode,
+                DerivationSchemeFormat = crytoCode,
+                DerivationScheme = derivation.ToString(),
+            }, "Save");
+        }
+
         public DerivationStrategyBase DerivationScheme { get; set; }
 
         private async Task RegisterAsync()

BTCPayServer.Tests/UnitTest1.cs

@@ -24,6 +24,8 @@ using BTCPayServer.Services.Rates;
 using Microsoft.Extensions.Caching.Memory;
 using BTCPayServer.Eclair;
 using System.Collections.Generic;
+using BTCPayServer.Models.StoreViewModels;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Tests
 {
@@ -43,11 +45,19 @@ namespace BTCPayServer.Tests
             entity.TxFee = Money.Coins(0.1m);
             entity.Rate = 5000;
 
-            var cryptoData = entity.GetCryptoData("BTC");
-            Assert.NotNull(cryptoData); // Should use legacy data to build itself
             entity.Payments = new System.Collections.Generic.List<PaymentEntity>();
             entity.ProductInformation = new ProductInformation() { Price = 5000 };
 
+            // Some check that handling legacy stuff does not break things
+            var cryptoData = entity.GetCryptoData("BTC", null, true);
+            cryptoData.Calculate();
+            Assert.NotNull(cryptoData);
+            Assert.Null(entity.GetCryptoData("BTC", null, false));
+            entity.SetCryptoData(new CryptoData() { ParentEntity = entity, Rate = entity.Rate, CryptoCode = "BTC", TxFee = entity.TxFee });
+            Assert.NotNull(entity.GetCryptoData("BTC", null, false));
+            Assert.NotNull(entity.GetCryptoData("BTC", null, true));
+            ////////////////////
+
             var accounting = cryptoData.Calculate();
             Assert.Equal(Money.Coins(1.1m), accounting.Due);
             Assert.Equal(Money.Coins(1.1m), accounting.TotalDue);
@@ -92,17 +102,17 @@ namespace BTCPayServer.Tests
                                                            })
             }));
             entity.Payments = new List<PaymentEntity>();
-            cryptoData = entity.GetCryptoData("BTC");
+            cryptoData = entity.GetCryptoData("BTC", null);
             accounting = cryptoData.Calculate();
             Assert.Equal(Money.Coins(5.1m), accounting.Due);
 
-            cryptoData = entity.GetCryptoData("LTC");
+            cryptoData = entity.GetCryptoData("LTC", null);
             accounting = cryptoData.Calculate();
             Assert.Equal(Money.Coins(10.01m), accounting.TotalDue);
 
             entity.Payments.Add(new PaymentEntity() { CryptoCode = "BTC", Output = new TxOut(Money.Coins(1.0m), new Key()), Accounted = true });
 
-            cryptoData = entity.GetCryptoData("BTC");
+            cryptoData = entity.GetCryptoData("BTC", null);
             accounting = cryptoData.Calculate();
             Assert.Equal(Money.Coins(4.2m), accounting.Due);
             Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
@@ -110,7 +120,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(Money.Coins(5.2m), accounting.TotalDue);
             Assert.Equal(2, accounting.TxCount);
 
-            cryptoData = entity.GetCryptoData("LTC");
+            cryptoData = entity.GetCryptoData("LTC", null);
             accounting = cryptoData.Calculate();
             Assert.Equal(Money.Coins(10.01m + 0.1m * 2 - 2.0m /* 8.21m */), accounting.Due);
             Assert.Equal(Money.Coins(0.0m), accounting.CryptoPaid);
@@ -120,7 +130,7 @@ namespace BTCPayServer.Tests
             entity.Payments.Add(new PaymentEntity() { CryptoCode = "LTC", Output = new TxOut(Money.Coins(1.0m), new Key()), Accounted = true });
 
 
-            cryptoData = entity.GetCryptoData("BTC");
+            cryptoData = entity.GetCryptoData("BTC", null);
             accounting = cryptoData.Calculate();
             Assert.Equal(Money.Coins(4.2m - 0.5m + 0.01m / 2), accounting.Due);
             Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
@@ -128,7 +138,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(Money.Coins(5.2m + 0.01m / 2), accounting.TotalDue); // The fee for LTC added
             Assert.Equal(2, accounting.TxCount);
 
-            cryptoData = entity.GetCryptoData("LTC");
+            cryptoData = entity.GetCryptoData("LTC", null);
             accounting = cryptoData.Calculate();
             Assert.Equal(Money.Coins(8.21m - 1.0m + 0.01m), accounting.Due);
             Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
@@ -139,7 +149,7 @@ namespace BTCPayServer.Tests
             var remaining = Money.Coins(4.2m - 0.5m + 0.01m / 2);
             entity.Payments.Add(new PaymentEntity() { CryptoCode = "BTC", Output = new TxOut(remaining, new Key()), Accounted = true });
 
-            cryptoData = entity.GetCryptoData("BTC");
+            cryptoData = entity.GetCryptoData("BTC", null);
             accounting = cryptoData.Calculate();
             Assert.Equal(Money.Zero, accounting.Due);
             Assert.Equal(Money.Coins(1.0m) + remaining, accounting.CryptoPaid);
@@ -148,7 +158,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(accounting.Paid, accounting.TotalDue);
             Assert.Equal(2, accounting.TxCount);
 
-            cryptoData = entity.GetCryptoData("LTC");
+            cryptoData = entity.GetCryptoData("LTC", null);
             accounting = cryptoData.Calculate();
             Assert.Equal(Money.Zero, accounting.Due);
             Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
@@ -270,7 +280,8 @@ namespace BTCPayServer.Tests
                         OrderId = "orderId",
                         NotificationURL = callbackServer.GetUri().AbsoluteUri,
                         ItemDesc = "Some description",
-                        FullNotifications = true
+                        FullNotifications = true,
+                        ExtendedNotifications = true
                     });
                     BitcoinUrlBuilder url = new BitcoinUrlBuilder(invoice.PaymentUrls.BIP21);
                     tester.ExplorerNode.SendToAddress(url.Address, url.Amount);
@@ -330,13 +341,13 @@ namespace BTCPayServer.Tests
                     false, //subtractfeefromamount
                     true, //replaceable
                 }).ResultString);
-                var invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, tester.Network);
+                var invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, user.SupportedNetwork.NBitcoinNetwork);
 
                 Eventually(() =>
                 {
                     invoice = user.BitPay.GetInvoice(invoice.Id);
                     Assert.Equal(payment1, invoice.BtcPaid);
-                    invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, tester.Network);
+                    invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, user.SupportedNetwork.NBitcoinNetwork);
                 });
 
                 var tx = tester.ExplorerNode.GetRawTransaction(new uint256(tx1));
@@ -351,7 +362,7 @@ namespace BTCPayServer.Tests
                 change.Value -= (payment2 - payment1) * 2; //Add more fees
                 var replaced = tester.ExplorerNode.SignRawTransaction(tx);
                 tester.ExplorerNode.SendRawTransaction(replaced);
-                var test = tester.ExplorerClient.Sync(user.DerivationScheme, null);
+                var test = tester.ExplorerClient.GetUTXOs(user.DerivationScheme, null);
                 Eventually(() =>
                 {
                     invoice = user.BitPay.GetInvoice(invoice.Id);
@@ -384,6 +395,196 @@ namespace BTCPayServer.Tests
             }
         }
 
+
+        [Fact]
+        public void CanTweakRate()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+
+
+                // First we try payment with a merchant having only BTC
+                var invoice1 = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 5000.0,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+
+                var storeController = tester.PayTester.GetController<StoresController>(user.UserId);
+                var vm = (StoreViewModel)((ViewResult)storeController.UpdateStore(user.StoreId).Result).Model;
+                Assert.Equal(1.0, vm.RateMultiplier);
+                vm.RateMultiplier = 0.5;
+                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);
+
+                Assert.True(invoice2.BtcPrice.Almost(invoice1.BtcPrice * 2, 0.00001m));
+            }
+        }
+
+        [Fact]
+        public void CanHaveLTCOnlyStore()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.CryptoCode = "LTC";
+                user.GrantAccess();
+
+                // First we try payment with a merchant having only BTC
+                var invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 500,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+                Assert.Single(invoice.CryptoInfo);
+                Assert.Equal("LTC", invoice.CryptoInfo[0].CryptoCode);
+                var cashCow = tester.LTCExplorerNode;
+                var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, cashCow.Network);
+                var firstPayment = Money.Coins(0.1m);
+                cashCow.SendToAddress(invoiceAddress, firstPayment);
+                Eventually(() =>
+                {
+                    invoice = user.BitPay.GetInvoice(invoice.Id);
+                    Assert.Equal(firstPayment, invoice.CryptoInfo[0].Paid);
+                });
+
+                Assert.Single(invoice.CryptoInfo); // Only BTC should be presented
+
+                var controller = tester.PayTester.GetController<InvoiceController>(null);
+                var checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, null).GetAwaiter().GetResult()).Value;
+                Assert.Single(checkout.AvailableCryptos);
+                Assert.Equal("LTC", checkout.CryptoCode);
+
+                //////////////////////
+
+                // Despite it is called BitcoinAddress it should be LTC because BTC is not available
+                Assert.Null(invoice.BitcoinAddress);
+                Assert.NotEqual(1.0, invoice.Rate);
+                Assert.NotEqual(invoice.BtcDue, invoice.CryptoInfo[0].Due); // Should be BTC rate
+                cashCow.SendToAddress(invoiceAddress, invoice.CryptoInfo[0].Due);
+
+                Eventually(() =>
+                {
+                    invoice = user.BitPay.GetInvoice(invoice.Id);
+                    Assert.Equal("paid", invoice.Status);
+                    checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, null).GetAwaiter().GetResult()).Value;
+                    Assert.Equal("paid", checkout.Status);
+                });
+
+            }
+        }
+
+        [Fact]
+        public void CanPayWithTwoCurrencies()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+
+                // First we try payment with a merchant having only BTC
+                var invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 5000.0,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+                var cashCow = tester.ExplorerNode;
+                var invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, cashCow.Network);
+                var firstPayment = Money.Coins(0.04m);
+                cashCow.SendToAddress(invoiceAddress, firstPayment);
+                Eventually(() =>
+                {
+                    invoice = user.BitPay.GetInvoice(invoice.Id);
+                    Assert.True(invoice.BtcPaid == firstPayment);
+                });
+
+                Assert.Single(invoice.CryptoInfo); // Only BTC should be presented
+
+                var controller = tester.PayTester.GetController<InvoiceController>(null);
+                var checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, null).GetAwaiter().GetResult()).Value;
+                Assert.Single(checkout.AvailableCryptos);
+                Assert.Equal("BTC", checkout.CryptoCode);
+
+                //////////////////////
+
+                // Retry now with LTC enabled
+                user.RegisterDerivationScheme("LTC");
+                invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 5000.0,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+                cashCow = tester.ExplorerNode;
+                invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, cashCow.Network);
+                firstPayment = Money.Coins(0.04m);
+                cashCow.SendToAddress(invoiceAddress, firstPayment);
+                Eventually(() =>
+                {
+                    invoice = user.BitPay.GetInvoice(invoice.Id);
+                    Assert.True(invoice.BtcPaid == firstPayment);
+                });
+
+                cashCow = tester.LTCExplorerNode;
+                var ltcCryptoInfo = invoice.CryptoInfo.FirstOrDefault(c => c.CryptoCode == "LTC");
+                Assert.NotNull(ltcCryptoInfo);
+                invoiceAddress = BitcoinAddress.Create(ltcCryptoInfo.Address, cashCow.Network);
+                var secondPayment = Money.Coins(decimal.Parse(ltcCryptoInfo.Due));
+                cashCow.Generate(2); // LTC is not worth a lot, so just to make sure we have money...
+                cashCow.SendToAddress(invoiceAddress, secondPayment);
+
+                Eventually(() =>
+                {
+                    invoice = user.BitPay.GetInvoice(invoice.Id);
+                    Assert.Equal(Money.Zero, invoice.BtcDue);
+                    var ltcPaid = invoice.CryptoInfo.First(c => c.CryptoCode == "LTC");
+                    Assert.Equal(Money.Zero, ltcPaid.Due);
+                    Assert.Equal(secondPayment, ltcPaid.CryptoPaid);
+                    Assert.Equal("paid", invoice.Status);
+                    Assert.False((bool)((JValue)invoice.ExceptionStatus).Value);
+                });
+
+                controller = tester.PayTester.GetController<InvoiceController>(null);
+                checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, "LTC").GetAwaiter().GetResult()).Value;
+                Assert.Equal(2, checkout.AvailableCryptos.Count);
+                Assert.Equal("LTC", checkout.CryptoCode);
+            }
+        }
+
         [Fact]
         public void InvoiceFlowThroughDifferentStatesCorrectly()
         {
@@ -398,8 +599,6 @@ namespace BTCPayServer.Tests
                     Currency = "USD",
                     PosData = "posData",
                     OrderId = "orderId",
-                    //RedirectURL = redirect + "redirect",
-                    //NotificationURL = CallbackUri + "/notification",
                     ItemDesc = "Some description",
                     FullNotifications = true
                 }, Facade.Merchant);

BTCPayServer.Tests/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3"
+version: "3"    
 
 # Run `docker-compose up dev` for bootstrapping your development environment
 # Doing so will expose eclair API, NBXplorer, Bitcoind RPC and postgres port to the host so that tests can Run,
@@ -10,17 +10,17 @@ services:
       context: ..
       dockerfile: BTCPayServer.Tests/Dockerfile
     environment:
-      TESTS_RPCCONNECTION: server=http://bitcoind:43782;ceiwHEbqWI83:DwubwWsoo3
-      TESTS_BTCNBXPLORERURL: http://bitcoin-nbxplorer:32838/
-      TESTS_LTCNBXPLORERURL: http://litecoin-nbxplorer:32839/
+      TESTS_BTCRPCCONNECTION: server=http://bitcoind:43782;ceiwHEbqWI83:DwubwWsoo3
+      TESTS_LTCRPCCONNECTION: server=http://litecoind:43782;ceiwHEbqWI83:DwubwWsoo3
+      TESTS_BTCNBXPLORERURL: http://nbxplorer:32838/
+      TESTS_LTCNBXPLORERURL: http://nbxplorer:32838/
       TESTS_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver
       TESTS_PORT: 80
       TESTS_HOSTNAME: tests
     expose:
       - "80"
     links:
-      - bitcoin-nbxplorer
-      - litecoin-nbxplorer
+      - nbxplorer
       - postgres
     extra_hosts: 
       - "tests:127.0.0.1"
@@ -33,45 +33,32 @@ services:
         regtest=1
         connect=bitcoind:39388
     links:
-      - bitcoin-nbxplorer
-      - litecoin-nbxplorer
+      - nbxplorer
       - postgres
 
-  bitcoin-nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.0.42
+  nbxplorer:
+    image: nicolasdorier/nbxplorer:1.0.1.3
     ports:
       - "32838:32838"
     expose: 
       - "32838"
     environment:
       NBXPLORER_NETWORK: regtest
-      NBXPLORER_RPCURL: http://bitcoind:43782/
-      NBXPLORER_RPCUSER: ceiwHEbqWI83
-      NBXPLORER_RPCPASSWORD: DwubwWsoo3
-      NBXPLORER_NODEENDPOINT: bitcoind:39388
+      NBXPLORER_CHAINS: "btc,ltc"
+      NBXPLORER_BTCRPCURL: http://bitcoind:43782/
+      NBXPLORER_BTCNODEENDPOINT: bitcoind:39388
+      NBXPLORER_BTCRPCUSER: ceiwHEbqWI83
+      NBXPLORER_BTCRPCPASSWORD: DwubwWsoo3
+      NBXPLORER_LTCRPCURL: http://litecoind:43782/
+      NBXPLORER_LTCNODEENDPOINT: litecoind:39388
+      NBXPLORER_LTCRPCUSER: ceiwHEbqWI83
+      NBXPLORER_LTCRPCPASSWORD: DwubwWsoo3
       NBXPLORER_BIND: 0.0.0.0:32838
       NBXPLORER_VERBOSE: 1
       NBXPLORER_NOAUTH: 1
     links:
       - bitcoind
-
-  litecoin-nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.0.42
-    ports:
-      - "32839:32839"
-    expose: 
-      - "32839"
-    environment:
-      NBXPLORER_NETWORK: ltc-regtest
-      NBXPLORER_RPCURL: http://litecoind:43782/
-      NBXPLORER_RPCUSER: ceiwHEbqWI83
-      NBXPLORER_RPCPASSWORD: DwubwWsoo3
-      NBXPLORER_NODEENDPOINT: litecoind:39388
-      NBXPLORER_BIND: 0.0.0.0:32839
-      NBXPLORER_VERBOSE: 1
-      NBXPLORER_NOAUTH: 1
-    links:
-        - litecoind
+      - litecoind
 
   bitcoind:
     container_name: btcpayserver_dev_bitcoind
@@ -85,15 +72,11 @@ services:
         rpcport=43782
         port=39388
         whitelist=0.0.0.0/0
-        zmqpubrawblock=tcp://0.0.0.0:29000
-        zmqpubrawtx=tcp://0.0.0.0:29000
-        txindex=1
     ports: 
       - "43782:43782"
     expose:
       - "43782" # RPC
       - "39388" # P2P
-      - "29000" # zmq
 
   litecoind:
     container_name: btcpayserver_dev_litecoind
@@ -107,15 +90,11 @@ services:
         rpcport=43782
         port=39388
         whitelist=0.0.0.0/0
-        zmqpubrawblock=tcp://0.0.0.0:29000
-        zmqpubrawtx=tcp://0.0.0.0:29000
-        txindex=1
     ports: 
       - "43783:43782"
     expose:
       - "43782" # RPC
       - "39388" # P2P
-      - "29000" # zmq
 
   postgres:
     image:  postgres:9.6.5

BTCPayServer/BTCPayNetwork.cs

@@ -1,12 +1,48 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Services.Rates;
 using NBitcoin;
+using NBXplorer;
 
 namespace BTCPayServer
 {
+    public class BTCPayDefaultSettings
+    {
+        static BTCPayDefaultSettings()
+        {
+            _Settings = new Dictionary<ChainType, BTCPayDefaultSettings>();
+            foreach (var chainType in new[] { ChainType.Main, ChainType.Test, ChainType.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.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()));
+            }
+        }
+
+        static Dictionary<ChainType, BTCPayDefaultSettings> _Settings;
+
+        public static BTCPayDefaultSettings GetDefaultSettings(ChainType 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
     {
         public Network NBitcoinNetwork { get; set; }
@@ -25,5 +61,13 @@ namespace BTCPayServer
         }
 
         public string CryptoImagePath { get; set; }
+        public NBXplorer.NBXplorerNetwork NBXplorerNetwork { get; set; }
+
+
+        public BTCPayDefaultSettings DefaultSettings { get; set; }
+        public override string ToString()
+        {
+            return CryptoCode;
+        }
     }
 }

BTCPayServer/BTCPayNetworkProvider.Bitcoin.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using NBitcoin;
+using NBitpayClient;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        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 });
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                BlockExplorerLink = "https://testnet.smartbit.com.au/tx/{0}",
+                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "bitcoin",
+                DefaultRateProvider = btcRate,
+                CryptoImagePath = "imlegacy/bitcoin-symbol.svg",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NBXplorerNetworkProvider.ChainType)
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.Litecoin.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitLitecoin()
+        {
+            NBXplorer.Altcoins.Litecoin.Networks.EnsureRegistered();
+            var ltcRate = new CoinAverageRateProvider("LTC");
+
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LTC");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                BlockExplorerLink = "https://live.blockcypher.com/ltc/tx/{0}/",
+                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "litecoin",
+                DefaultRateProvider = ltcRate,
+                CryptoImagePath = "imlegacy/litecoin-symbol.svg",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NBXplorerNetworkProvider.ChainType)
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.cs

@@ -1,93 +1,35 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Services.Rates;
 using Microsoft.Extensions.Caching.Memory;
 using NBitcoin;
 using NBitpayClient;
+using NBXplorer;
 
 namespace BTCPayServer
 {
-    public class BTCPayNetworkProvider
+    public partial class BTCPayNetworkProvider
     {
-        static BTCPayNetworkProvider()
-        {
-            NBXplorer.Altcoins.Litecoin.Networks.EnsureRegistered();
-        }
         Dictionary<string, BTCPayNetwork> _Networks = new Dictionary<string, BTCPayNetwork>();
-        public BTCPayNetworkProvider(Network network)
+
+
+        private readonly NBXplorerNetworkProvider _NBXplorerNetworkProvider;
+        public NBXplorerNetworkProvider NBXplorerNetworkProvider
         {
-            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 ltcRate = new CoinAverageRateProvider("LTC");
-            if (network == Network.Main)
+            get
             {
-                Add(new BTCPayNetwork()
-                {
-                    CryptoCode = "BTC",
-                    BlockExplorerLink = "https://www.smartbit.com.au/tx/{0}",
-                    NBitcoinNetwork = Network.Main,
-                    UriScheme = "bitcoin",
-                    DefaultRateProvider = btcRate,
-                    CryptoImagePath = "imlegacy/bitcoin-symbol.svg"
-                });
-                Add(new BTCPayNetwork()
-                {
-                    CryptoCode = "LTC",
-                    BlockExplorerLink = "https://live.blockcypher.com/ltc/tx/{0}/",
-                    NBitcoinNetwork = NBXplorer.Altcoins.Litecoin.Networks.Mainnet,
-                    UriScheme = "litecoin",
-                    DefaultRateProvider = ltcRate,
-                    CryptoImagePath = "imlegacy/litecoin-symbol.svg"
-                });
+                return _NBXplorerNetworkProvider;
             }
+        }
 
-            if (network == Network.TestNet)
-            {
-                Add(new BTCPayNetwork()
-                {
-                    CryptoCode = "BTC",
-                    BlockExplorerLink = "https://testnet.smartbit.com.au/tx/{0}",
-                    NBitcoinNetwork = Network.TestNet,
-                    UriScheme = "bitcoin",
-                    DefaultRateProvider = btcRate,
-                    CryptoImagePath = "imlegacy/bitcoin-symbol.svg"
-                });
-                Add(new BTCPayNetwork()
-                {
-                    CryptoCode = "LTC",
-                    BlockExplorerLink = "http://explorer.litecointools.com/tx/{0}",
-                    NBitcoinNetwork = NBXplorer.Altcoins.Litecoin.Networks.Testnet,
-                    UriScheme = "litecoin",
-                    DefaultRateProvider = ltcRate,
-                    CryptoImagePath = "imlegacy/litecoin-symbol.svg"
-                });
-            }
-
-            if (network == Network.RegTest)
-            {
-                Add(new BTCPayNetwork()
-                {
-                    CryptoCode = "BTC",
-                    BlockExplorerLink = "https://testnet.smartbit.com.au/tx/{0}",
-                    NBitcoinNetwork = Network.RegTest,
-                    UriScheme = "bitcoin",
-                    DefaultRateProvider = btcRate,
-                    CryptoImagePath = "imlegacy/bitcoin-symbol.svg"
-                });
-                Add(new BTCPayNetwork()
-                {
-                    CryptoCode = "LTC",
-                    BlockExplorerLink = "http://explorer.litecointools.com/tx/{0}",
-                    NBitcoinNetwork = NBXplorer.Altcoins.Litecoin.Networks.Regtest,
-                    UriScheme = "litecoin",
-                    DefaultRateProvider = ltcRate,
-                    CryptoImagePath = "imlegacy/litecoin-symbol.svg"
-                });
-            }
+        public BTCPayNetworkProvider(ChainType chainType)
+        {
+            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(chainType);
+            InitBitcoin();
+            InitLitecoin();
         }
 
         [Obsolete("To use only for legacy stuff")]

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.0.61</Version>
+		<Version>1.0.1.8</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
@@ -21,22 +21,22 @@
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
     <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
-    <PackageReference Include="NBitcoin" Version="4.0.0.51" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.14" />	  
+    <PackageReference Include="NBitcoin" Version="4.0.0.52" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.16" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.0.26" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.1.2" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.13" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.1" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.0.11" />
   </ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.1" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.2" PrivateAssets="All" />
 	</ItemGroup>
 
 	<ItemGroup>

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -13,9 +13,16 @@ using NBXplorer;
 
 namespace BTCPayServer.Configuration
 {
+    public class NBXplorerConnectionSetting
+    {
+        public string CryptoCode { get; internal set; }
+        public Uri ExplorerUri { get; internal set; }
+        public string CookieFile { get; internal set; }
+    }
+
     public class BTCPayServerOptions
     {
-        public Network Network
+        public ChainType ChainType
         {
             get; set;
         }
@@ -35,52 +42,44 @@ namespace BTCPayServer.Configuration
             set;
         }
 
+        public List<NBXplorerConnectionSetting> NBXplorerConnectionSettings
+        {
+            get;
+            set;
+        } = new List<NBXplorerConnectionSetting>();
+
         public void LoadArgs(IConfiguration conf)
         {
-            var networkInfo = DefaultConfiguration.GetNetwork(conf);
-            Network = networkInfo?.Network;
-            if (Network == null)
-                throw new ConfigException("Invalid network");
+            ChainType = DefaultConfiguration.GetChainType(conf);
+            var defaultSettings = BTCPayDefaultSettings.GetDefaultSettings(ChainType);
+            DataDir = conf.GetOrDefault<string>("datadir", defaultSettings.DefaultDataDirectory);
+            Logs.Configuration.LogInformation("Network: " + ChainType.ToString());
 
-            DataDir = conf.GetOrDefault<string>("datadir", networkInfo.DefaultDataDirectory);
-            Logs.Configuration.LogInformation("Network: " + Network);
-
-
-            
-            foreach (var net in new BTCPayNetworkProvider(Network).GetAll())
+            var supportedChains = conf.GetOrDefault<string>("chains", "btc")
+                                      .Split(',', StringSplitOptions.RemoveEmptyEntries)
+                                      .Select(t => t.ToUpperInvariant());
+            var validChains = new List<string>();
+            foreach (var net in new BTCPayNetworkProvider(ChainType).GetAll())
             {
-                var nbxplorer = NBXplorer.Configuration.NetworkInformation.GetNetworkByName(net.NBitcoinNetwork.Name);
-                var explorer = conf.GetOrDefault<Uri>($"{net.CryptoCode}.explorer.url", null);
-                var cookieFile = conf.GetOrDefault<string>($"{net.CryptoCode}.explorer.cookiefile", nbxplorer.GetDefaultCookieFile());
-                if (explorer != null)
+                if (supportedChains.Contains(net.CryptoCode))
                 {
-                    ExplorerFactories.Add(net.CryptoCode, (n) => CreateExplorerClient(n, explorer, cookieFile));
+                    validChains.Add(net.CryptoCode);
+                    NBXplorerConnectionSetting setting = new NBXplorerConnectionSetting();
+                    setting.CryptoCode = net.CryptoCode;
+                    setting.ExplorerUri = conf.GetOrDefault<Uri>($"{net.CryptoCode}.explorer.url", net.NBXplorerNetwork.DefaultSettings.DefaultUrl);
+                    setting.CookieFile = conf.GetOrDefault<string>($"{net.CryptoCode}.explorer.cookiefile", net.NBXplorerNetwork.DefaultSettings.DefaultCookieFile);
+                    NBXplorerConnectionSettings.Add(setting);
                 }
             }
+            var invalidChains = String.Join(',', supportedChains.Where(s => !validChains.Contains(s)).ToArray());
+            if(!string.IsNullOrEmpty(invalidChains))
+                throw new ConfigException($"Invalid chains {invalidChains}");
 
-            // Handle legacy explorer.url and explorer.cookiefile
-            if (ExplorerFactories.Count == 0)
-            {
-                var nbxplorer = NBXplorer.Configuration.NetworkInformation.GetNetworkByName(Network.Name); // Will get BTC info
-                var explorer = conf.GetOrDefault<Uri>($"explorer.url", new Uri(nbxplorer.GetDefaultExplorerUrl(), UriKind.Absolute));
-                var cookieFile = conf.GetOrDefault<string>($"explorer.cookiefile", nbxplorer.GetDefaultCookieFile());
-                ExplorerFactories.Add("BTC", (n) => CreateExplorerClient(n, explorer, cookieFile));
-            }
-            //////
-
+            Logs.Configuration.LogInformation("Supported chains: " + String.Join(',', supportedChains.ToArray()));
             PostgresConnectionString = conf.GetOrDefault<string>("postgres", null);
             ExternalUrl = conf.GetOrDefault<Uri>("externalurl", null);
         }
 
-        private static ExplorerClient CreateExplorerClient(BTCPayNetwork n, Uri uri, string cookieFile)
-        {
-            var explorer = new ExplorerClient(n.NBitcoinNetwork, uri);
-            if (!explorer.SetCookieAuth(cookieFile))
-                explorer.SetNoAuth();
-            return explorer;
-        }
-
-        public Dictionary<string, Func<BTCPayNetwork, ExplorerClient>> ExplorerFactories = new Dictionary<string, Func<BTCPayNetwork, ExplorerClient>>();
         public string PostgresConnectionString
         {
             get;

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using NBitcoin;
 using System.Text;
 using CommandLine;
+using NBXplorer;
 
 namespace BTCPayServer.Configuration
 {
@@ -17,20 +18,24 @@ namespace BTCPayServer.Configuration
     {
         protected override CommandLineApplication CreateCommandLineApplicationCore()
         {
+            var provider = new BTCPayNetworkProvider(ChainType.Main);
+            var chains = string.Join(",", provider.GetAll().Select(n => n.CryptoCode.ToLowerInvariant()).ToArray());
             CommandLineApplication app = new CommandLineApplication(true)
             {
                 FullName = "BTCPay\r\nOpen source, self-hosted payment processor.",
                 Name = "BTCPay"
             };
             app.HelpOption("-? | -h | --help");
-            app.Option("-n | --network", $"Set the network among ({NetworkInformation.ToStringAll()}) (default: {Network.Main.ToString()})", CommandOptionType.SingleValue);
-            app.Option("--testnet | -testnet", $"Use testnet", CommandOptionType.BoolValue);
-            app.Option("--regtest | -regtest", $"Use regtest", CommandOptionType.BoolValue);
+            app.Option("-n | --network", $"Set the network among (mainnet,testnet,regtest) (default: mainnet)", CommandOptionType.SingleValue);
+            app.Option("--testnet | -testnet", $"Use testnet (Deprecated, use --network instead)", CommandOptionType.BoolValue);
+            app.Option("--regtest | -regtest", $"Use regtest (Deprecated, use --network instead)", CommandOptionType.BoolValue);
+            app.Option("--chains | -c", $"Chains to support comma separated (default: btc, available: {chains})", CommandOptionType.SingleValue);
             app.Option("--postgres", $"Connection string to postgres database (default: sqlite is used)", CommandOptionType.SingleValue);
-            foreach (var network in new BTCPayNetworkProvider(Network.Main).GetAll())
+            foreach (var network in provider.GetAll())
             {
-                app.Option($"--{network.CryptoCode}explorerurl", $"Url of the NBxplorer for {network.CryptoCode} (default: If no explorer is specified, the default for Bitcoin will be selected)", CommandOptionType.SingleValue);
-                app.Option($"--{network.CryptoCode}explorercookiefile", $"Path to the cookie file (default: Default setting of NBXplorer for the network)", CommandOptionType.SingleValue);
+                var crypto = network.CryptoCode.ToLowerInvariant();
+                app.Option($"--{crypto}explorerurl", $"Url of the NBxplorer for {network.CryptoCode} (default: {network.NBXplorerNetwork.DefaultSettings.DefaultUrl})", CommandOptionType.SingleValue);
+                app.Option($"--{crypto}explorercookiefile", $"Path to the cookie file (default: {network.NBXplorerNetwork.DefaultSettings.DefaultCookieFile})", CommandOptionType.SingleValue);
             }
             app.Option("--externalurl", $"The expected external url of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
             return app;
@@ -40,57 +45,64 @@ namespace BTCPayServer.Configuration
 
         protected override string GetDefaultDataDir(IConfiguration conf)
         {
-            return GetNetwork(conf).DefaultDataDirectory;
+            return BTCPayDefaultSettings.GetDefaultSettings(GetChainType(conf)).DefaultDataDirectory;
         }
 
         protected override string GetDefaultConfigurationFile(IConfiguration conf)
         {
-            var network = GetNetwork(conf);
+            var network = BTCPayDefaultSettings.GetDefaultSettings(GetChainType(conf));
             var dataDir = conf["datadir"];
             if (dataDir == null)
                 return network.DefaultConfigurationFile;
             var fileName = Path.GetFileName(network.DefaultConfigurationFile);
-            return Path.Combine(dataDir, fileName);
+            var chainDir = Path.GetFileName(Path.GetDirectoryName(network.DefaultConfigurationFile));
+            chainDir = Path.Combine(dataDir, chainDir);
+            try
+            {
+                if (!Directory.Exists(chainDir))
+                    Directory.CreateDirectory(chainDir);
+            }
+            catch { }
+            return Path.Combine(chainDir, fileName);
         }
 
-        public static NetworkInformation GetNetwork(IConfiguration conf)
+        public static ChainType GetChainType(IConfiguration conf)
         {
             var network = conf.GetOrDefault<string>("network", null);
             if (network != null)
             {
-                var info = NetworkInformation.GetNetworkByName(network);
-                if (info == null)
-                    throw new ConfigException($"Invalid network name {network}");
-                return info;
+                var n = Network.GetNetwork(network);
+                if (n == null)
+                {
+                    throw new ConfigException($"Invalid network parameter '{network}'");
+                }
+                return n.ToChainType();
             }
+            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) ? Network.RegTest :
-                        conf.GetOrDefault<bool>("testnet", false) ? Network.TestNet : Network.Main;
-
-            return NetworkInformation.GetNetworkByName(net.Name);
+            return net;
         }
 
         protected override string GetDefaultConfigurationFileTemplate(IConfiguration conf)
         {
-            var network = GetNetwork(conf);
+            var defaultSettings = BTCPayDefaultSettings.GetDefaultSettings(GetChainType(conf));
             StringBuilder builder = new StringBuilder();
             builder.AppendLine("### Global settings ###");
-            builder.AppendLine("#testnet=0");
-            builder.AppendLine("#regtest=0");
+            builder.AppendLine("#network=mainnet");
             builder.AppendLine();
             builder.AppendLine("### Server settings ###");
-            builder.AppendLine("#port=" + network.DefaultPort);
+            builder.AppendLine("#port=" + defaultSettings.DefaultPort);
             builder.AppendLine("#bind=127.0.0.1");
             builder.AppendLine();
             builder.AppendLine("### Database ###");
             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(network.Network).GetAll())
+            foreach (var n in new BTCPayNetworkProvider(defaultSettings.ChainType).GetAll())
             {
-                var nbxplorer = NBXplorer.Configuration.NetworkInformation.GetNetworkByName(n.NBitcoinNetwork.ToString());
-                builder.AppendLine($"#{n.CryptoCode}.explorer.url={nbxplorer.GetDefaultExplorerUrl()}");
-                builder.AppendLine($"#{n.CryptoCode}.explorer.cookiefile={ nbxplorer.GetDefaultCookieFile()}");
+                builder.AppendLine($"#{n.CryptoCode}.explorer.url={n.NBXplorerNetwork.DefaultSettings.DefaultUrl}");
+                builder.AppendLine($"#{n.CryptoCode}.explorer.cookiefile={ n.NBXplorerNetwork.DefaultSettings.DefaultCookieFile}");
             }
             return builder.ToString();
         }
@@ -99,7 +111,7 @@ namespace BTCPayServer.Configuration
 
         protected override IPEndPoint GetDefaultEndpoint(IConfiguration conf)
         {
-            return new IPEndPoint(IPAddress.Parse("127.0.0.1"), GetNetwork(conf).DefaultPort);
+            return new IPEndPoint(IPAddress.Parse("127.0.0.1"), BTCPayDefaultSettings.GetDefaultSettings(GetChainType(conf)).DefaultPort);
         }
     }
 }

BTCPayServer/Configuration/NetworkInformation.cs

@@ -1,83 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using NBitcoin;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Configuration
-{
-    public class NetworkInformation
-    {
-        static NetworkInformation()
-        {
-            _Networks = new Dictionary<string, NetworkInformation>();
-            foreach (var network in new[] { Network.Main, Network.TestNet, Network.RegTest })
-            {
-                NetworkInformation info = new NetworkInformation();
-                info.DefaultDataDirectory = StandardConfiguration.DefaultDataDirectory.GetDirectory("BTCPayServer", network.Name);
-                info.DefaultConfigurationFile = Path.Combine(info.DefaultDataDirectory, "settings.config");
-                info.Network = network;
-                info.DefaultPort = 23002;
-                _Networks.Add(network.Name, info);
-                if (network == Network.Main)
-                {
-                    info.DefaultPort = 23000;
-                }
-                if (network == Network.TestNet)
-                {
-                    info.DefaultPort = 23001;
-                }
-            }
-        }
-
-        static Dictionary<string, NetworkInformation> _Networks;
-        public static NetworkInformation GetNetworkByName(string name)
-        {
-            var value = _Networks.TryGet(name);
-            if (value != null)
-                return value;
-
-            //Maybe alias ?
-            var network = Network.GetNetwork(name);
-            if (network != null)
-            {
-                value = _Networks.TryGet(network.Name);
-                if (value != null)
-                    return value;
-            }
-            return null;
-        }
-        
-        public Network Network
-        {
-            get; set;
-        }
-        public string DefaultConfigurationFile
-        {
-            get;
-            set;
-        }
-        public string DefaultDataDirectory
-        {
-            get;
-            set;
-        }
-        public int DefaultPort
-        {
-            get;
-            private set;
-        }
-
-        public override string ToString()
-        {
-            return Network.ToString();
-        }
-
-        public static string ToStringAll()
-        {
-            return string.Join(", ", _Networks.Select(n => n.Key).ToArray());
-        }
-    }
-}

BTCPayServer/Controllers/AccountController.cs

@@ -15,6 +15,7 @@ using BTCPayServer.Models.AccountViewModels;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Mails;
 using BTCPayServer.Services.Stores;
+using BTCPayServer.Logging;
 
 namespace BTCPayServer.Controllers
 {
@@ -25,10 +26,10 @@ namespace BTCPayServer.Controllers
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
         private readonly IEmailSender _emailSender;
-        private readonly ILogger _logger;
         StoreRepository storeRepository;
         RoleManager<IdentityRole> _RoleManager;
         SettingsRepository _SettingsRepository;
+        ILogger _logger;
 
         public AccountController(
             UserManager<ApplicationUser> userManager,
@@ -36,16 +37,15 @@ namespace BTCPayServer.Controllers
             StoreRepository storeRepository,
             SignInManager<ApplicationUser> signInManager,
             IEmailSender emailSender,
-            SettingsRepository settingsRepository,
-            ILogger<AccountController> logger)
+            SettingsRepository settingsRepository)
         {
             this.storeRepository = storeRepository;
             _userManager = userManager;
             _signInManager = signInManager;
             _emailSender = emailSender;
-            _logger = logger;
             _RoleManager = roleManager;
             _SettingsRepository = settingsRepository;
+            _logger = Logs.PayServer;
         }
 
         [TempData]
@@ -259,12 +259,10 @@ namespace BTCPayServer.Controllers
                 var result = await _userManager.CreateAsync(user, model.Password);
                 if (result.Succeeded)
                 {
-                    _logger.LogInformation("User created a new account with password.");
-
                     var admin = await _userManager.GetUsersInRoleAsync(Roles.ServerAdmin);
+                    Logs.PayServer.LogInformation($"A new user just registered {user.Email} {(admin.Count == 0 ? "(admin)" : "")}");
                     if (admin.Count == 0)
                     {
-                        _logger.LogInformation("Admin created.");
                         await _RoleManager.CreateAsync(new IdentityRole(Roles.ServerAdmin));
                         await _userManager.AddToRoleAsync(user, Roles.ServerAdmin);
                     }
@@ -291,7 +289,7 @@ namespace BTCPayServer.Controllers
             return View(model);
         }
 
-        /// <summary>
+        /// <summary> 
         /// Test property
         /// </summary>
         public string RegisteredUserId

BTCPayServer/Controllers/InvoiceController.PaymentProtocol.cs

@@ -66,14 +66,18 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> PostPayment(string invoiceId, string cryptoCode = null)
         {
             var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId);
-            if (invoice == null || invoice.IsExpired())
-                return NotFound();
             if (cryptoCode == null)
                 cryptoCode = "BTC";
             var network = _NetworkProvider.GetNetwork(cryptoCode);
+            if (network == null || invoice == null || invoice.IsExpired() || !invoice.Support(network))
+                return NotFound();
+
+            var wallet = _WalletProvider.GetWallet(network);
+            if (wallet == null)
+                return NotFound();
             var payment = PaymentMessage.Load(Request.Body);
-            var unused = _Wallet.BroadcastTransactionsAsync(network, payment.Transactions);
-            await _InvoiceRepository.AddRefundsAsync(invoiceId, payment.RefundTo.Select(p => new TxOut(p.Amount, p.Script)).ToArray());
+            var unused = wallet.BroadcastTransactionsAsync(payment.Transactions);
+            await _InvoiceRepository.AddRefundsAsync(invoiceId, payment.RefundTo.Select(p => new TxOut(p.Amount, p.Script)).ToArray(), network.NBitcoinNetwork);
             return new PaymentAckActionResult(payment.CreateACK(invoiceId + " is currently processing, thanks for your purchase..."));
         }
     }

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -33,7 +33,8 @@ namespace BTCPayServer.Controllers
             {
                 UserId = GetUserId(),
                 InvoiceId = invoiceId,
-                IncludeAddresses = true
+                IncludeAddresses = true,
+                IncludeEvents = true
             })).FirstOrDefault();
             if (invoice == null)
                 return NotFound();
@@ -55,10 +56,13 @@ namespace BTCPayServer.Controllers
                 BuyerInformation = invoice.BuyerInformation,
                 Fiat = FormatCurrency((decimal)dto.Price, dto.Currency),
                 NotificationUrl = invoice.NotificationURL,
+                RedirectUrl = invoice.RedirectURL,
                 ProductInformation = invoice.ProductInformation,
+                StatusException = invoice.ExceptionStatus,
+                Events = invoice.Events
             };
 
-            foreach (var data in invoice.GetCryptoData())
+            foreach (var data in invoice.GetCryptoData(null))
             {
                 var cryptoInfo = dto.CryptoInfo.First(o => o.CryptoCode.Equals(data.Key, StringComparison.OrdinalIgnoreCase));
                 var accounting = data.Value.Calculate();
@@ -74,7 +78,7 @@ namespace BTCPayServer.Controllers
             }
 
             var payments = invoice
-                .Payments
+                .GetPayments()
                 .Select(async payment =>
                 {
                     var m = new InvoiceDetailsModel.Payment();
@@ -85,6 +89,7 @@ namespace BTCPayServer.Controllers
                     m.TransactionId = payment.Outpoint.Hash.ToString();
                     m.ReceivedTime = payment.ReceivedTime;
                     m.TransactionLink = string.Format(paymentNetwork.BlockExplorerLink, m.TransactionId);
+                    m.Replaced = !payment.Accounted;
                     return m;
                 })
                 .ToArray();
@@ -118,14 +123,26 @@ namespace BTCPayServer.Controllers
         private async Task<PaymentModel> GetInvoiceModel(string invoiceId, string cryptoCode)
         {
             var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId);
-
-            var store = await _StoreRepository.FindStore(invoice.StoreId);
-            if (cryptoCode == null)
-                cryptoCode = store.GetDefaultCrypto();
-            var network = _NetworkProvider.GetNetwork(cryptoCode);
-            if (invoice == null || network == null || !invoice.Support(network))
+            if (invoice == null)
                 return null;
-            var cryptoData = invoice.GetCryptoData(network);
+            var store = await _StoreRepository.FindStore(invoice.StoreId);
+            bool isDefaultCrypto = false;
+            if (cryptoCode == null)
+            { 
+                cryptoCode = store.GetDefaultCrypto();
+                isDefaultCrypto = true;
+            }
+            var network = _NetworkProvider.GetNetwork(cryptoCode);
+            if (invoice == null || network == null)
+                return null;
+
+            if(!invoice.Support(network))
+            {
+                if(!isDefaultCrypto)
+                    return null;
+                network = invoice.GetCryptoData(_NetworkProvider).First().Value.Network;
+            }
+            var cryptoData = invoice.GetCryptoData(network, _NetworkProvider);
 
             var dto = invoice.EntityToDTO(_NetworkProvider);
             var cryptoInfo = dto.CryptoInfo.First(o => o.CryptoCode == network.CryptoCode);
@@ -154,15 +171,18 @@ namespace BTCPayServer.Controllers
                 Status = invoice.Status,
                 CryptoImage = "/" + Url.Content(network.CryptoImagePath),
                 NetworkFeeDescription = $"{accounting.TxCount} transaction{(accounting.TxCount > 1 ? "s" : "")} x {cryptoData.TxFee} {network.CryptoCode}",
-                AvailableCryptos = invoice.GetCryptoData().Select(kv=> new PaymentModel.AvailableCrypto()
-                {
-                    CryptoCode = kv.Key,
-                    CryptoImage = "/" + _NetworkProvider.GetNetwork(kv.Key).CryptoImagePath,
-                    Link = Url.Action(nameof(Checkout), new { invoiceId = invoiceId, cryptoCode = kv.Key })
-                }).ToList()
+                AvailableCryptos = invoice.GetCryptoData(_NetworkProvider)
+                                          .Where(i => i.Value.Network != null)
+                                          .Select(kv=> new PaymentModel.AvailableCrypto()
+                                            {
+                                                CryptoCode = kv.Key,
+                                                CryptoImage = "/" + kv.Value.Network.CryptoImagePath,
+                                                Link = Url.Action(nameof(Checkout), new { invoiceId = invoiceId, cryptoCode = kv.Key })
+                                            }).Where(c => c.CryptoImage != "/")
+                .ToList()
             };
 
-            var isMultiCurrency = invoice.Payments.Select(p=>p.GetCryptoCode()).Concat(new[] { network.CryptoCode }).Distinct().Count() > 1;
+            var isMultiCurrency = invoice.GetPayments().Select(p=>p.GetCryptoCode()).Concat(new[] { network.CryptoCode }).Distinct().Count() > 1;
             if (isMultiCurrency)
                 model.NetworkFeeDescription = $"{accounting.NetworkFee} {network.CryptoCode}";
 
@@ -217,8 +237,7 @@ namespace BTCPayServer.Controllers
             try
             {
                 leases.Add(_EventAggregator.Subscribe<Events.InvoiceDataChangedEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
-                leases.Add(_EventAggregator.Subscribe<Events.InvoicePaymentEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
-                leases.Add(_EventAggregator.Subscribe<Events.InvoiceStatusChangedEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
+                leases.Add(_EventAggregator.Subscribe<Events.InvoiceEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
                 while (true)
                 {
                     var message = await webSocket.ReceiveAsync(DummyBuffer, default(CancellationToken));
@@ -245,7 +264,7 @@ namespace BTCPayServer.Controllers
             {
                 await webSocket.SendAsync(DummyBuffer, WebSocketMessageType.Binary, true, cts.Token);
             }
-            catch { await CloseSocket(webSocket); }
+            catch { try { webSocket.Dispose(); } catch { } }
         }
 
         private static async Task CloseSocket(WebSocket webSocket)
@@ -260,7 +279,7 @@ namespace BTCPayServer.Controllers
                 }
             }
             catch { }
-            finally { webSocket.Dispose(); }
+            finally { try { webSocket.Dispose(); } catch { } }
         }
 
         [HttpPost]
@@ -394,6 +413,7 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> InvalidatePaidInvoice(string invoiceId)
         {
             await _InvoiceRepository.UpdatePaidInvoiceToInvalid(invoiceId);
+            _EventAggregator.Publish(new InvoiceEvent(invoiceId, 1008, "invoice_markedInvalid"));
             return RedirectToAction(nameof(ListInvoices));
         }
 

BTCPayServer/Controllers/InvoiceController.cs

@@ -45,7 +45,7 @@ namespace BTCPayServer.Controllers
     public partial class InvoiceController : Controller
     {
         InvoiceRepository _InvoiceRepository;
-        BTCPayWallet _Wallet;
+        BTCPayWalletProvider _WalletProvider;
         IRateProviderFactory _RateProviders;
         StoreRepository _StoreRepository;
         UserManager<ApplicationUser> _UserManager;
@@ -57,7 +57,7 @@ namespace BTCPayServer.Controllers
         public InvoiceController(InvoiceRepository invoiceRepository,
             CurrencyNameTable currencyNameTable,
             UserManager<ApplicationUser> userManager,
-            BTCPayWallet wallet,
+            BTCPayWalletProvider walletProvider,
             IRateProviderFactory rateProviders,
             StoreRepository storeRepository,
             EventAggregator eventAggregator,
@@ -69,7 +69,7 @@ namespace BTCPayServer.Controllers
             _CurrencyNameTable = currencyNameTable ?? throw new ArgumentNullException(nameof(currencyNameTable));
             _StoreRepository = storeRepository ?? throw new ArgumentNullException(nameof(storeRepository));
             _InvoiceRepository = invoiceRepository ?? throw new ArgumentNullException(nameof(invoiceRepository));
-            _Wallet = wallet ?? throw new ArgumentNullException(nameof(wallet));
+            _WalletProvider = walletProvider ?? throw new ArgumentNullException(nameof(walletProvider));
             _RateProviders = rateProviders ?? throw new ArgumentNullException(nameof(rateProviders));
             _UserManager = userManager;
             _FeeProviderFactory = feeProviderFactory ?? throw new ArgumentNullException(nameof(feeProviderFactory));
@@ -78,7 +78,7 @@ namespace BTCPayServer.Controllers
         }
 
 
-        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl, double expiryMinutes = 15)
+        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl)
         {
             var derivationStrategies = store.GetDerivationStrategies(_NetworkProvider).ToList();
             if (derivationStrategies.Count == 0)
@@ -94,7 +94,7 @@ namespace BTCPayServer.Controllers
             if (notificationUri == null || (notificationUri.Scheme != "http" && notificationUri.Scheme != "https")) //TODO: Filer non routable addresses ?
                 notificationUri = null;
             EmailAddressAttribute emailValidator = new EmailAddressAttribute();
-            entity.ExpirationTime = entity.InvoiceTime.AddMinutes(expiryMinutes);
+            entity.ExpirationTime = entity.InvoiceTime.AddMinutes(storeBlob.InvoiceExpiration);
             entity.MonitoringExpiration = entity.ExpirationTime + TimeSpan.FromMinutes(storeBlob.MonitoringExpiration);
             entity.OrderId = invoice.OrderId;
             entity.ServerUrl = serverUrl;
@@ -116,30 +116,40 @@ namespace BTCPayServer.Controllers
             entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);
 
             var queries = derivationStrategies
-                    .Select(derivationStrategy =>
+                    .Select(derivationStrategy => (Wallet: _WalletProvider.GetWallet(derivationStrategy.Network),
+                                                    DerivationStrategy: derivationStrategy.DerivationStrategyBase,
+                                                    Network: derivationStrategy.Network,
+                                                    RateProvider: _RateProviders.GetRateProvider(derivationStrategy.Network),
+                                                    FeeRateProvider: _FeeProviderFactory.CreateFeeProvider(derivationStrategy.Network)))
+                    .Where(_ => _.Wallet != null &&
+                                _.FeeRateProvider != null &&
+                                _.RateProvider != null)
+                    .Select(_ =>
                     {
                         return new
                         {
-                            network = derivationStrategy.Network,
-                            getFeeRate = _FeeProviderFactory.CreateFeeProvider(derivationStrategy.Network).GetFeeRateAsync(),
-                            getRate = _RateProviders.GetRateProvider(derivationStrategy.Network).GetRateAsync(invoice.Currency),
-                            getAddress = _Wallet.ReserveAddressAsync(derivationStrategy)
+                            network = _.Network,
+                            getFeeRate = _.FeeRateProvider.GetFeeRateAsync(),
+                            getRate = storeBlob.ApplyRateRules(_.Network, _.RateProvider).GetRateAsync(invoice.Currency),
+                            getAddress = _.Wallet.ReserveAddressAsync(_.DerivationStrategy)
                         };
                     });
 
+            bool legacyBTCisSet = false;
             var cryptoDatas = new Dictionary<string, CryptoData>();
             foreach (var q in queries)
             {
                 CryptoData cryptoData = new CryptoData();
                 cryptoData.CryptoCode = q.network.CryptoCode;
                 cryptoData.FeeRate = (await q.getFeeRate);
-                cryptoData.TxFee = storeBlob.NetworkFeeDisabled ? Money.Zero : cryptoData.FeeRate.GetFee(100); // assume price for 100 bytes
+                cryptoData.TxFee = GetTxFee(storeBlob, cryptoData.FeeRate); // assume price for 100 bytes
                 cryptoData.Rate = await q.getRate;
                 cryptoData.DepositAddress = (await q.getAddress).ToString();
 
 #pragma warning disable CS0618
                 if (q.network.IsBTC)
                 {
+                    legacyBTCisSet = true;
                     entity.TxFee = cryptoData.TxFee;
                     entity.Rate = cryptoData.Rate;
                     entity.DepositAddress = cryptoData.DepositAddress;
@@ -147,14 +157,37 @@ namespace BTCPayServer.Controllers
 #pragma warning restore CS0618
                 cryptoDatas.Add(cryptoData.CryptoCode, cryptoData);
             }
+
+            if (!legacyBTCisSet)
+            {
+                // Legacy Bitpay clients expect information for BTC information, even if the store do not support it
+#pragma warning disable CS0618
+                var btc = _NetworkProvider.BTC;
+                var feeProvider = _FeeProviderFactory.CreateFeeProvider(btc);
+                var rateProvider = storeBlob.ApplyRateRules(btc, _RateProviders.GetRateProvider(btc));
+                if (feeProvider != null && rateProvider != null)
+                {
+                    var gettingFee = feeProvider.GetFeeRateAsync();
+                    var gettingRate = rateProvider.GetRateAsync(invoice.Currency);
+                    entity.TxFee = GetTxFee(storeBlob, await gettingFee);
+                    entity.Rate = await gettingRate;
+                }
+#pragma warning restore CS0618
+            }
+
             entity.SetCryptoData(cryptoDatas);
             entity.PosData = invoice.PosData;
             entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, _NetworkProvider);
-            _EventAggregator.Publish(new Events.InvoiceCreatedEvent(entity.Id));
+            _EventAggregator.Publish(new Events.InvoiceEvent(entity, 1001, "invoice_created"));
             var resp = entity.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }
 
+        private static Money GetTxFee(StoreBlob storeBlob, FeeRate feeRate)
+        {
+            return storeBlob.NetworkFeeDisabled ? Money.Zero : feeRate.GetFee(100);
+        }
+
         private SpeedPolicy ParseSpeedPolicy(string transactionSpeed, SpeedPolicy defaultPolicy)
         {
             if (transactionSpeed == null)

BTCPayServer/Controllers/ManageController.cs

@@ -33,7 +33,6 @@ namespace BTCPayServer.Controllers
         private readonly ILogger _logger;
         private readonly UrlEncoder _urlEncoder;
         TokenRepository _TokenRepository;
-        private readonly BTCPayWallet _Wallet;
         IHostingEnvironment _Env;
         StoreRepository _StoreRepository;
 
@@ -47,7 +46,7 @@ namespace BTCPayServer.Controllers
           ILogger<ManageController> logger,
           UrlEncoder urlEncoder,
           TokenRepository tokenRepository,
-          BTCPayWallet wallet,
+          BTCPayWalletProvider walletProvider,
           StoreRepository storeRepository,
           IHostingEnvironment env)
         {
@@ -57,7 +56,6 @@ namespace BTCPayServer.Controllers
             _logger = logger;
             _urlEncoder = urlEncoder;
             _TokenRepository = tokenRepository;
-            _Wallet = wallet;
             _Env = env;
             _StoreRepository = storeRepository;
         }

BTCPayServer/Controllers/StoresController.cs

@@ -32,7 +32,7 @@ namespace BTCPayServer.Controllers
             TokenRepository tokenRepo,
             UserManager<ApplicationUser> userManager,
             AccessTokenController tokenController,
-            BTCPayWallet wallet,
+            BTCPayWalletProvider walletProvider,
             BTCPayNetworkProvider networkProvider,
             ExplorerClientProvider explorerProvider,
             IHostingEnvironment env)
@@ -41,14 +41,14 @@ namespace BTCPayServer.Controllers
             _TokenRepository = tokenRepo;
             _UserManager = userManager;
             _TokenController = tokenController;
-            _Wallet = wallet;
+            _WalletProvider = walletProvider;
             _Env = env;
             _NetworkProvider = networkProvider;
             _ExplorerProvider = explorerProvider;
         }
         BTCPayNetworkProvider _NetworkProvider;
         private ExplorerClientProvider _ExplorerProvider;
-        BTCPayWallet _Wallet;
+        BTCPayWalletProvider _WalletProvider;
         AccessTokenController _TokenController;
         StoreRepository _Repo;
         TokenRepository _TokenRepository;
@@ -95,7 +95,10 @@ namespace BTCPayServer.Controllers
             var stores = await _Repo.GetStoresByUserId(GetUserId());
             var balances = stores
                                 .Select(s => s.GetDerivationStrategies(_NetworkProvider)
-                                              .Select(async ss => (await _Wallet.GetBalance(ss)).ToString() + " " + ss.Network.CryptoCode))
+                                              .Select(d => (Wallet: _WalletProvider.GetWallet(d.Network), 
+                                                            DerivationStrategy: d.DerivationStrategyBase))
+                                              .Where(_ => _.Wallet != null)
+                                              .Select(async _ => (await _.Wallet.GetBalance(_.DerivationStrategy)).ToString() + " " + _.Wallet.Network.CryptoCode))
                                 .ToArray();
 
             await Task.WhenAll(balances.SelectMany(_ => _));
@@ -160,6 +163,8 @@ namespace BTCPayServer.Controllers
             AddDerivationSchemes(store, vm);
             vm.StatusMessage = StatusMessage;
             vm.MonitoringExpiration = storeBlob.MonitoringExpiration;
+            vm.InvoiceExpiration = storeBlob.InvoiceExpiration;
+            vm.RateMultiplier = (double)storeBlob.GetRateMultiplier();
             return View(vm);
         }
 
@@ -210,6 +215,12 @@ namespace BTCPayServer.Controllers
                 ModelState.AddModelError(nameof(vm.CryptoCurrency), "Invalid network");
                 return View(vm);
             }
+            var wallet = _WalletProvider.GetWallet(network);
+            if (wallet == null)
+            {
+                ModelState.AddModelError(nameof(vm.CryptoCurrency), "Invalid network");
+                return View(vm);
+            }
 
             if (command == "Save")
             {
@@ -218,7 +229,7 @@ namespace BTCPayServer.Controllers
                     if (!string.IsNullOrEmpty(vm.DerivationScheme))
                     {
                         var strategy = ParseDerivationStrategy(vm.DerivationScheme, vm.DerivationSchemeFormat, network);
-                        await _Wallet.TrackAsync(strategy);
+                        await wallet.TrackAsync(strategy);
                         vm.DerivationScheme = strategy.ToString();
                     }
                     store.SetDerivationStrategy(network, vm.DerivationScheme);
@@ -240,12 +251,12 @@ namespace BTCPayServer.Controllers
                     try
                     {
                         var scheme = ParseDerivationStrategy(vm.DerivationScheme, vm.DerivationSchemeFormat, network);
-                        var line = scheme.DerivationStrategyBase.GetLineFor(DerivationFeature.Deposit);
+                        var line = scheme.GetLineFor(DerivationFeature.Deposit);
 
                         for (int i = 0; i < 10; i++)
                         {
                             var address = line.Derive((uint)i);
-                            vm.AddressSamples.Add((line.Path.Derive((uint)i).ToString(), address.ScriptPubKey.GetDestinationAddress(scheme.Network.NBitcoinNetwork).ToString()));
+                            vm.AddressSamples.Add((line.Path.Derive((uint)i).ToString(), address.ScriptPubKey.GetDestinationAddress(network.NBitcoinNetwork).ToString()));
                         }
                     }
                     catch
@@ -297,6 +308,8 @@ namespace BTCPayServer.Controllers
             var blob = store.GetStoreBlob();
             blob.NetworkFeeDisabled = !model.NetworkFee;
             blob.MonitoringExpiration = model.MonitoringExpiration;
+            blob.InvoiceExpiration = model.InvoiceExpiration;
+            blob.SetRateMultiplier(model.RateMultiplier);
 
             if (store.SetStoreBlob(blob))
             {
@@ -315,7 +328,7 @@ namespace BTCPayServer.Controllers
             });
         }
 
-        private DerivationStrategy ParseDerivationStrategy(string derivationScheme, string format, BTCPayNetwork network)
+        private DerivationStrategyBase ParseDerivationStrategy(string derivationScheme, string format, BTCPayNetwork network)
         {
             if (format == "Electrum")
             {
@@ -337,7 +350,7 @@ namespace BTCPayServer.Controllers
                 var prefix = Utils.ToUInt32(data, false);
                 if (!electrumMapping.TryGetValue(prefix, out string[] labels))
                     throw new FormatException("!electrumMapping.TryGetValue(prefix, out string[] labels)");
-                var standardPrefix = Utils.ToBytes(network.NBitcoinNetwork == Network.Main ? 0x0488b21eU : 0x043587cf, false);
+                var standardPrefix = Utils.ToBytes(network.NBXplorerNetwork.DefaultSettings.ChainType == NBXplorer.ChainType.Main ? 0x0488b21eU : 0x043587cf, false);
 
                 for (int i = 0; i < 4; i++)
                     data[i] = standardPrefix[i];
@@ -349,7 +362,7 @@ namespace BTCPayServer.Controllers
                 }
             }
 
-            return DerivationStrategy.Parse(new DerivationStrategyFactory(network.NBitcoinNetwork).Parse(derivationScheme).ToString(), network);
+            return new DerivationStrategyFactory(network.NBitcoinNetwork).Parse(derivationScheme);
         }
 
         [HttpGet]

BTCPayServer/Data/ApplicationDbContext.cs

@@ -26,6 +26,11 @@ namespace BTCPayServer.Data
             get; set;
         }
 
+        public DbSet<InvoiceEventData> InvoiceEvents
+        {
+            get; set;
+        }
+
         public DbSet<HistoricalAddressInvoiceData> HistoricalAddressInvoices
         {
             get; set;
@@ -132,6 +137,15 @@ namespace BTCPayServer.Data
                     o.InvoiceDataId,
 #pragma warning disable CS0618
                     o.Address
+#pragma warning restore CS0618
+                });
+
+            builder.Entity<InvoiceEventData>()
+                .HasKey(o => new
+                {
+                    o.InvoiceDataId,
+#pragma warning disable CS0618
+                    o.UniqueId
 #pragma warning restore CS0618
                 });
         }

BTCPayServer/Data/InvoiceData.cs

@@ -32,6 +32,11 @@ namespace BTCPayServer.Data
             get; set;
         }
 
+        public List<InvoiceEventData> Events
+        {
+            get; set;
+        }
+
         public List<RefundAddressesData> RefundAddresses
         {
             get; set;

BTCPayServer/Data/InvoiceEventData.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Data
+{
+    public class InvoiceEventData
+    {
+        public string InvoiceDataId
+        {
+            get; set;
+        }
+        public string UniqueId { get; internal set; }
+        public DateTimeOffset Timestamp
+        {
+            get; set;
+        }
+
+        public string Message { get; set; }
+    }
+}

BTCPayServer/Data/StoreData.cs

@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using System.ComponentModel;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using BTCPayServer.Services.Rates;
 
 namespace BTCPayServer.Data
 {
@@ -99,10 +100,10 @@ namespace BTCPayServer.Data
 
             if (!existing && string.IsNullOrEmpty(derivationScheme))
             {
-                if(network.IsBTC)
+                if (network.IsBTC)
                     DerivationStrategy = null;
             }
-            else if(!existing)
+            else if (!existing)
                 strategies.Add(new JProperty(network.CryptoCode, new JValue(derivationScheme)));
             // This is deprecated so we don't have to set anymore
             //if (network.IsBTC)
@@ -173,10 +174,27 @@ namespace BTCPayServer.Data
         }
     }
 
+    public class RateRule
+    {
+        public RateRule()
+        {
+            RuleName = "Multiplier";
+        }
+        public string RuleName { get; set; }
+
+        public double Multiplier { get; set; }
+
+        public decimal Apply(BTCPayNetwork network, decimal rate)
+        {
+            return rate * (decimal)Multiplier;
+        }
+    }
+
     public class StoreBlob
     {
         public StoreBlob()
         {
+            InvoiceExpiration = 15;
             MonitoringExpiration = 60;
         }
         public bool NetworkFeeDisabled
@@ -190,5 +208,39 @@ namespace BTCPayServer.Data
             get;
             set;
         }
+
+        [DefaultValue(15)]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public int InvoiceExpiration
+        {
+            get;
+            set;
+        }
+
+        public void SetRateMultiplier(double rate)
+        {
+            RateRules = new List<RateRule>();
+            RateRules.Add(new RateRule() { Multiplier = rate });
+        }
+        public decimal GetRateMultiplier()
+        {
+            decimal rate = 1.0m;
+            if (RateRules == null || RateRules.Count == 0)
+                return rate;
+            foreach (var rule in RateRules)
+            {
+                rate = rule.Apply(null, rate);
+            }
+            return rate;
+        }
+
+        public List<RateRule> RateRules { get; set; } = new List<RateRule>();
+
+        public IRateProvider ApplyRateRules(BTCPayNetwork network, IRateProvider rateProvider)
+        {
+            if (RateRules == null || RateRules.Count == 0)
+                return rateProvider;
+            return new TweakRateProvider(network, rateProvider, RateRules.ToList());
+        }
     }
 }

BTCPayServer/EventAggregator.cs

@@ -88,7 +88,7 @@ namespace BTCPayServer
                 }
             }
 
-            Logs.Events.LogInformation($"New event: {evt.ToString()}");
+            Logs.Events.LogInformation(evt.ToString());
             foreach (var sub in actionList)
             {
                 try

BTCPayServer/Events/InvoiceDataChangedEvent.cs

@@ -8,10 +8,19 @@ namespace BTCPayServer.Events
     public class InvoiceDataChangedEvent
     {
         public string InvoiceId { get; set; }
+        public string Status { get; internal set; }
+        public string ExceptionStatus { get; internal set; }
 
         public override string ToString()
         {
-            return $"Invoice {InvoiceId} data changed";
+            if (string.IsNullOrEmpty(ExceptionStatus) || ExceptionStatus == "false")
+            { 
+                return $"Invoice status is {Status}";
+            }
+            else
+            {
+                return $"Invoice status is {Status} (Exception status: {ExceptionStatus})";
+            }
         }
     }
 }

BTCPayServer/Events/InvoiceEvent.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Invoices;
+
+namespace BTCPayServer.Events
+{
+    public class InvoiceEvent
+    {
+        public InvoiceEvent(InvoiceEntity invoice, int code, string name) : this(invoice.Id, code, name)
+        {
+
+        }
+        public InvoiceEvent(string invoiceId, int code, string name)
+        {
+            InvoiceId = invoiceId;
+            EventCode = code;
+            Name = name;
+        }
+
+        public string InvoiceId { get; set; }
+        public int EventCode { get; set; }
+        public string Name { get; set; }
+
+        public override string ToString()
+        {
+            return $"Invoice {InvoiceId} new event: {Name} ({EventCode})";
+        }
+    }
+}

BTCPayServer/Events/InvoiceIPNEvent.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Events
+{
+    public class InvoiceIPNEvent
+    {
+        public InvoiceIPNEvent(string invoiceId, int? eventCode, string name)
+        {
+            InvoiceId = invoiceId;
+            EventCode = eventCode;
+            Name = name;
+        }
+
+        public int? EventCode { get; set; }
+        public string Name { get; set; }
+
+        public string InvoiceId { get; set; }
+        public string Error { get; set; }
+
+        public override string ToString()
+        {
+            string ipnType = "IPN";
+            if(EventCode.HasValue)
+            {
+                ipnType = $"IPN ({EventCode.Value} {Name})";
+            }
+            if (Error == null)
+                return $"{ipnType} sent for invoice {InvoiceId}";
+            return $"Error while sending {ipnType}: {Error}";
+        }
+    }
+}

BTCPayServer/Events/InvoicePaymentEvent.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Services.Invoices;
-
-namespace BTCPayServer.Events
-{
-    public class InvoicePaymentEvent
-    {
-        
-        public InvoicePaymentEvent(string invoiceId)
-        {
-            InvoiceId = invoiceId;
-        }
-
-        public string InvoiceId { get; set; }
-
-        public override string ToString()
-        {
-            return $"Invoice {InvoiceId} received a payment";
-        }
-    }
-}

BTCPayServer/Events/InvoiceStatusChangedEvent.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Services.Invoices;
-
-namespace BTCPayServer.Events
-{
-    public class InvoiceStatusChangedEvent
-    {
-        public InvoiceStatusChangedEvent()
-        {
-
-        }
-        public InvoiceStatusChangedEvent(InvoiceEntity invoice, string newState)
-        {
-            OldState = invoice.Status;
-            InvoiceId = invoice.Id;
-            NewState = newState;
-        }
-        public string InvoiceId { get; set; }
-        public string OldState { get; set; }
-        public string NewState { get; set; }
-
-        public override string ToString()
-        {
-            return $"Invoice {InvoiceId} changed status: {OldState} => {NewState}";
-        }
-    }
-}

BTCPayServer/Events/InvoiceStopWatchedEvent.cs

@@ -5,18 +5,12 @@ using System.Threading.Tasks;
 
 namespace BTCPayServer.Events
 {
-    public class InvoiceCreatedEvent
+    public class InvoiceStopWatchedEvent
     {
-        public InvoiceCreatedEvent(string id)
-        {
-            InvoiceId = id;
-        }
-
         public string InvoiceId { get; set; }
-
         public override string ToString()
         {
-            return $"Invoice {InvoiceId} created";
+            return $"Invoice {InvoiceId} is not monitored anymore.";
         }
     }
 }

BTCPayServer/Events/NBXplorerStateChangedEvent.cs

@@ -6,6 +6,21 @@ using BTCPayServer.HostedServices;
 
 namespace BTCPayServer.Events
 {
+    public class NBXplorerErrorEvent
+    {
+        public NBXplorerErrorEvent(BTCPayNetwork network, string errorMessage)
+        {
+            Message = errorMessage;
+            Network = network;
+        }
+        public string Message { get; set; }
+        public BTCPayNetwork Network { get; set; }
+
+        public override string ToString()
+        {
+            return $"{Network.CryptoCode}: NBXplorer error `{Message}`";
+        }
+    }
     public class NBXplorerStateChangedEvent
     {
         public NBXplorerStateChangedEvent(BTCPayNetwork network, NBXplorerState old, NBXplorerState newState)

BTCPayServer/Events/NewBlockEvent.cs

@@ -7,9 +7,10 @@ namespace BTCPayServer.Events
 {
     public class NewBlockEvent
     {
+        public string CryptoCode { get; set; }
         public override string ToString()
         {
-            return "New block";
+            return $"{CryptoCode}: New block";
         }
     }
 }

BTCPayServer/Events/TxOutReceivedEvent.cs

@@ -14,7 +14,7 @@ namespace BTCPayServer.Events
         public override string ToString()
         {
             String address = ScriptPubKey.GetDestinationAddress(Network.NBitcoinNetwork)?.ToString() ?? ScriptPubKey.ToString();
-            return $"{address} received a transaction";
+            return $"{address} received a transaction ({Network.CryptoCode})";
         }
     }
 }

BTCPayServer/ExplorerClientProvider.cs

@@ -1,8 +1,10 @@
 using System;
+using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Configuration;
+using BTCPayServer.Logging;
 using NBXplorer;
 
 namespace BTCPayServer
@@ -18,22 +20,51 @@ namespace BTCPayServer
         {
             _NetworkProviders = networkProviders;
             _Options = options;
+
+            foreach (var setting in options.NBXplorerConnectionSettings)
+            {
+                var cookieFile = setting.CookieFile;
+                if (cookieFile.Trim() == "0" || string.IsNullOrEmpty(cookieFile.Trim()))
+                    cookieFile = null;
+                Logs.Configuration.LogInformation($"{setting.CryptoCode}: Explorer url is {(setting.ExplorerUri.AbsoluteUri ?? "not set")}");
+                Logs.Configuration.LogInformation($"{setting.CryptoCode}: Cookie file is {(setting.CookieFile ?? "not set")}");
+                if (setting.ExplorerUri != null)
+                {
+                    _Clients.TryAdd(setting.CryptoCode, CreateExplorerClient(_NetworkProviders.GetNetwork(setting.CryptoCode), setting.ExplorerUri, setting.CookieFile));
+                }
+            }
         }
 
+        private static ExplorerClient CreateExplorerClient(BTCPayNetwork n, Uri uri, string cookieFile)
+        {
+            var explorer = new ExplorerClient(n.NBXplorerNetwork, uri);
+            if (cookieFile == null)
+            {
+                Logs.Configuration.LogWarning($"{n.CryptoCode}: Not using cookie authentication");
+                explorer.SetNoAuth();
+            }
+            if(!explorer.SetCookieAuth(cookieFile))
+            {
+                Logs.Configuration.LogWarning($"{n.CryptoCode}: Using cookie auth against NBXplorer, but {cookieFile} is not found");
+            }
+            return explorer;
+        }
+
+        Dictionary<string, ExplorerClient> _Clients = new Dictionary<string, ExplorerClient>();
+
         public ExplorerClient GetExplorerClient(string cryptoCode)
         {
             var network = _NetworkProviders.GetNetwork(cryptoCode);
             if (network == null)
                 return null;
-            if (_Options.ExplorerFactories.TryGetValue(network.CryptoCode, out Func<BTCPayNetwork, ExplorerClient> factory))
-            {
-                return factory(network);
-            }
-            return null;
+            _Clients.TryGetValue(network.CryptoCode, out ExplorerClient client);
+            return client;
         }
 
         public ExplorerClient GetExplorerClient(BTCPayNetwork network)
         {
+            if (network == null)
+                throw new ArgumentNullException(nameof(network));
             return GetExplorerClient(network.CryptoCode);
         }
 
@@ -42,18 +73,18 @@ namespace BTCPayServer
             var network = _NetworkProviders.GetNetwork(cryptoCode);
             if (network == null)
                 return null;
-            if (_Options.ExplorerFactories.ContainsKey(network.CryptoCode))
+            if (_Clients.ContainsKey(network.CryptoCode))
                 return network;
             return null;
         }
 
         public IEnumerable<(BTCPayNetwork, ExplorerClient)> GetAll()
         {
-            foreach(var net in _NetworkProviders.GetAll())
+            foreach (var net in _NetworkProviders.GetAll())
             {
-                if(_Options.ExplorerFactories.TryGetValue(net.CryptoCode, out Func<BTCPayNetwork, ExplorerClient> factory))
+                if (_Clients.TryGetValue(net.CryptoCode, out ExplorerClient explorer))
                 {
-                    yield return (net, factory(net));
+                    yield return (net, explorer);
                 }
             }
         }

BTCPayServer/Extensions.cs

@@ -19,29 +19,23 @@ using System.Linq;
 using System.Threading;
 using BTCPayServer.Services.Wallets;
 using System.IO;
+using BTCPayServer.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace BTCPayServer
 {
     public static class Extensions
     {
-        public static string GetDefaultExplorerUrl(this NBXplorer.Configuration.NetworkInformation networkInfo)
-        {
-            return $"http://127.0.0.1:{networkInfo.DefaultExplorerPort}/";
-        }
-        public static string GetDefaultCookieFile(this NBXplorer.Configuration.NetworkInformation networkInfo)
-        {
-            return Path.Combine(networkInfo.DefaultDataDirectory, ".cookie");
-        }
         public static bool SupportDropColumn(this Microsoft.EntityFrameworkCore.Migrations.Migration migration, string activeProvider)
         {
             return activeProvider != "Microsoft.EntityFrameworkCore.Sqlite";
         }
 
-        public static async Task<Dictionary<uint256, TransactionResult>> GetTransactions(this BTCPayWallet client, BTCPayNetwork network, uint256[] hashes, CancellationToken cts = default(CancellationToken))
+        public static async Task<Dictionary<uint256, TransactionResult>> GetTransactions(this BTCPayWallet client, uint256[] hashes, CancellationToken cts = default(CancellationToken))
         {
             hashes = hashes.Distinct().ToArray();
             var transactions = hashes
-                                        .Select(async o => await client.GetTransactionAsync(network, o, cts))
+                                        .Select(async o => await client.GetTransactionAsync(o, cts))
                                         .ToArray();
             await Task.WhenAll(transactions).ConfigureAwait(false);
             return transactions.Select(t => t.Result).Where(t => t != null).ToDictionary(o => o.Transaction.GetHash());

BTCPayServer/HostedServices/InvoiceNotificationManager.cs

@@ -37,6 +37,9 @@ namespace BTCPayServer.HostedServices
             {
                 get; set;
             }
+
+            public int? EventCode { get; set; }
+            public string Message { get; set; }
         }
 
         public ILogger Logger
@@ -63,18 +66,32 @@ namespace BTCPayServer.HostedServices
             _NetworkProvider = networkProvider;
         }
 
-        async Task Notify(InvoiceEntity invoice)
+        async Task Notify(InvoiceEntity invoice, int? eventCode = null, string name = null)
         {
             CancellationTokenSource cts = new CancellationTokenSource(10000);
             try
             {
-                await SendNotification(invoice, cts.Token);
+                if (string.IsNullOrEmpty(invoice.NotificationURL))
+                    return;
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name));
+                await SendNotification(invoice, eventCode, name, cts.Token);
                 return;
             }
-            catch // It fails, it is OK because we try with hangfire after
+            catch (OperationCanceledException) when (cts.IsCancellationRequested)
             {
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name)
+                {
+                    Error = "Timeout"
+                });
             }
-            var invoiceStr = NBitcoin.JsonConverters.Serializer.ToString(new ScheduledJob() { TryCount = 0, Invoice = invoice });
+            catch (Exception ex) // It fails, it is OK because we try with hangfire after
+            {
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name)
+                {
+                    Error = ex.Message
+                });
+            }
+            var invoiceStr = NBitcoin.JsonConverters.Serializer.ToString(new ScheduledJob() { TryCount = 0, Invoice = invoice, EventCode = eventCode, Message = name });
             if (!string.IsNullOrEmpty(invoice.NotificationURL))
                 _JobClient.Schedule(() => NotifyHttp(invoiceStr), TimeSpan.Zero);
         }
@@ -93,14 +110,45 @@ namespace BTCPayServer.HostedServices
             CancellationTokenSource cts = new CancellationTokenSource(10000);
             try
             {
-                HttpResponseMessage response = await SendNotification(job.Invoice, cts.Token);
+                HttpResponseMessage response = await SendNotification(job.Invoice, job.EventCode, job.Message, cts.Token);
                 reschedule = response.StatusCode != System.Net.HttpStatusCode.OK;
                 Logger.LogInformation("Job " + jobId + " returned " + response.StatusCode);
+
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
+                {
+                    Error = reschedule ? $"Unexpected return code: {(int)response.StatusCode}" : null
+                });
             }
-            catch (Exception ex)
+            catch (OperationCanceledException) when (cts.IsCancellationRequested)
             {
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
+                {
+                    Error = "Timeout"
+                });
                 reschedule = true;
-                Logger.LogInformation("Job " + jobId + " threw exception " + ex.Message);
+                Logger.LogInformation("Job " + jobId + " timed out");
+            }
+            catch (Exception ex) // It fails, it is OK because we try with hangfire after
+            {
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
+                {
+                    Error = ex.Message
+                });
+                reschedule = true;
+
+                List<string> messages = new List<string>();
+                while(ex != null)
+                {
+                    messages.Add(ex.Message);
+                    ex = ex.InnerException;
+                }
+                string message = String.Join(',', messages.ToArray());
+                Logger.LogInformation("Job " + jobId + " threw exception " + message);
+
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
+                {
+                    Error = $"Unexpected error: {message}"
+                });
             }
             finally { cts.Dispose(); _Executing.TryRemove(jobId, out jobId); }
 
@@ -115,8 +163,23 @@ namespace BTCPayServer.HostedServices
             }
         }
 
+        public class InvoicePaymentNotificationEvent
+        {
+            [JsonProperty("code")]
+            public int Code { get; set; }
+            [JsonProperty("name")]
+            public string Name { get; set; }
+        }
+        public class InvoicePaymentNotificationEventWrapper
+        {
+            [JsonProperty("event")]
+            public InvoicePaymentNotificationEvent Event { get; set; }
+            [JsonProperty("data")]
+            public InvoicePaymentNotification Data { get; set; }
+        }
+
         Encoding UTF8 = new UTF8Encoding(false);
-        private async Task<HttpResponseMessage> SendNotification(InvoiceEntity invoice, CancellationToken cancellation)
+        private async Task<HttpResponseMessage> SendNotification(InvoiceEntity invoice, int? eventCode, string name, CancellationToken cancellation)
         {
             var request = new HttpRequestMessage();
             request.Method = HttpMethod.Post;
@@ -139,7 +202,7 @@ namespace BTCPayServer.HostedServices
             // We keep backward compatibility with bitpay by passing BTC info to the notification
             // we don't pass other info, as it is a bad idea to use IPN data for logic processing (can be faked)
             var btcCryptoInfo = dto.CryptoInfo.FirstOrDefault(c => c.CryptoCode == "BTC");
-            if(btcCryptoInfo != null)
+            if (btcCryptoInfo != null)
             {
 #pragma warning disable CS0618
                 notification.Rate = (double)dto.Rate;
@@ -149,8 +212,22 @@ namespace BTCPayServer.HostedServices
                 notification.BTCPrice = dto.BTCPrice;
 #pragma warning restore CS0618
             }
+
+            string notificationString = null;
+            if (eventCode.HasValue)
+            {
+                var wrapper = new InvoicePaymentNotificationEventWrapper();
+                wrapper.Data = notification;
+                wrapper.Event = new InvoicePaymentNotificationEvent() { Code = eventCode.Value, Name = name };
+                notificationString = JsonConvert.SerializeObject(wrapper);
+            }
+            else
+            {
+                notificationString = JsonConvert.SerializeObject(notification);
+            }
+
             request.RequestUri = new Uri(invoice.NotificationURL, UriKind.Absolute);
-            request.Content = new StringContent(JsonConvert.SerializeObject(notification), UTF8, "application/json");
+            request.Content = new StringContent(notificationString, UTF8, "application/json");
             var response = await _Client.SendAsync(request, cancellation);
             return response;
         }
@@ -165,29 +242,60 @@ namespace BTCPayServer.HostedServices
         CompositeDisposable leases = new CompositeDisposable();
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            leases.Add(_EventAggregator.Subscribe<InvoiceStatusChangedEvent>(async e => 
+            leases.Add(_EventAggregator.Subscribe<InvoiceEvent>(async e =>
             {
                 var invoice = await _InvoiceRepository.GetInvoice(null, e.InvoiceId);
+                await SaveEvent(invoice.Id, e);
 
                 // we need to use the status in the event and not in the invoice. The invoice might now be in another status.
                 if (invoice.FullNotifications)
                 {
-                    if (e.NewState == "expired" ||
-                       e.NewState == "paid" ||
-                       e.NewState == "invalid" ||
-                       e.NewState == "complete"
+                    if (e.Name == "invoice_expired" ||
+                       e.Name == "invoice_paidInFull" ||
+                       e.Name == "invoice_failedToConfirm" ||
+                       e.Name == "invoice_markedInvalid" ||
+                       e.Name == "invoice_failedToConfirm" ||
+                       e.Name == "invoice_completed"
                      )
                         await Notify(invoice);
                 }
-                
-                if(e.NewState == "confirmed")
+
+                if (e.Name == "invoice_confirmed")
                 {
                     await Notify(invoice);
                 }
+
+                if (invoice.ExtendedNotifications)
+                {
+                    await Notify(invoice, e.EventCode, e.Name);
+                }
             }));
+
+
+            leases.Add(_EventAggregator.Subscribe<InvoiceDataChangedEvent>(async e =>
+            {
+                await SaveEvent(e.InvoiceId, e);
+            }));
+
+
+            leases.Add(_EventAggregator.Subscribe<InvoiceStopWatchedEvent>(async e =>
+            {
+                await SaveEvent(e.InvoiceId, e);
+            }));
+
+            leases.Add(_EventAggregator.Subscribe<InvoiceIPNEvent>(async e =>
+            {
+                await SaveEvent(e.InvoiceId, e);
+            }));
+
             return Task.CompletedTask;
         }
 
+        private Task SaveEvent(string invoiceId, object evt)
+        {
+            return _InvoiceRepository.AddInvoiceEvent(invoiceId, evt);
+        }
+
         public Task StopAsync(CancellationToken cancellationToken)
         {
             leases.Dispose();

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -17,6 +17,7 @@ using BTCPayServer.Controllers;
 using BTCPayServer.Events;
 using Microsoft.AspNetCore.Hosting;
 using BTCPayServer.Services.Invoices;
+using BTCPayServer.Services;
 
 namespace BTCPayServer.HostedServices
 {
@@ -45,7 +46,7 @@ namespace BTCPayServer.HostedServices
 
         InvoiceRepository _InvoiceRepository;
         EventAggregator _EventAggregator;
-        BTCPayWallet _Wallet;
+        BTCPayWalletProvider _WalletProvider;
         BTCPayNetworkProvider _NetworkProvider;
 
         public InvoiceWatcher(
@@ -53,10 +54,10 @@ namespace BTCPayServer.HostedServices
             BTCPayNetworkProvider networkProvider,
             InvoiceRepository invoiceRepository,
             EventAggregator eventAggregator,
-            BTCPayWallet wallet)
+            BTCPayWalletProvider walletProvider)
         {
             PollInterval = TimeSpan.FromMinutes(1.0);
-            _Wallet = wallet ?? throw new ArgumentNullException(nameof(wallet));
+            _WalletProvider = walletProvider ?? throw new ArgumentNullException(nameof(walletProvider));
             _InvoiceRepository = invoiceRepository ?? throw new ArgumentNullException(nameof(invoiceRepository));
             _EventAggregator = eventAggregator ?? throw new ArgumentNullException(nameof(eventAggregator));
             _NetworkProvider = networkProvider;
@@ -98,7 +99,7 @@ namespace BTCPayServer.HostedServices
                     if (updateContext.Dirty)
                     {
                         await _InvoiceRepository.UpdateInvoiceStatus(invoice.Id, invoice.Status, invoice.ExceptionStatus).ConfigureAwait(false);
-                        _EventAggregator.Publish(new InvoiceDataChangedEvent() { InvoiceId = invoice.Id });
+                        updateContext.Events.Add(new InvoiceDataChangedEvent() { Status = invoice.Status, ExceptionStatus = invoice.ExceptionStatus, InvoiceId = invoice.Id });
                     }
 
                     var changed = stateBefore != invoice.Status;
@@ -117,7 +118,7 @@ namespace BTCPayServer.HostedServices
                        ((invoice.Status == "invalid" || invoice.Status == "expired") && invoice.MonitoringExpiration < DateTimeOffset.UtcNow))
                     {
                         if (await _InvoiceRepository.RemovePendingInvoice(invoice.Id).ConfigureAwait(false))
-                            Logs.PayServer.LogInformation("Stopped watching invoice " + invoiceId);
+                            _EventAggregator.Publish<InvoiceStopWatchedEvent>(new InvoiceStopWatchedEvent() { InvoiceId = invoice.Id });
                         break;
                     }
 
@@ -140,193 +141,261 @@ namespace BTCPayServer.HostedServices
         private async Task UpdateInvoice(UpdateInvoiceContext context)
         {
             var invoice = context.Invoice;
-            //Fetch unknown payments
-            var strategies = invoice.GetDerivationStrategies(_NetworkProvider).ToArray();
-            var getCoinsResponsesAsync = strategies
-                                .Select(d => _Wallet.GetCoins(d, context.KnownStates.TryGet(d.Network)))
-                                .ToArray();
-            await Task.WhenAll(getCoinsResponsesAsync);
-            var getCoinsResponses = getCoinsResponsesAsync.Select(g => g.Result).ToArray();
-            foreach (var response in getCoinsResponses)
-            {
-                response.Coins = response.Coins.Where(c => invoice.AvailableAddressHashes.Contains(c.ScriptPubKey.Hash.ToString() + response.Strategy.Network.CryptoCode)).ToArray();
-            }
-            var coins = getCoinsResponses.Where(s => s.Coins.Length != 0).FirstOrDefault();
-            bool dirtyAddress = false;
-            if (coins != null)
-            {
-                if (coins.State != null)
-                    context.ModifiedKnownStates.Add(coins.Strategy.Network, coins.State);
-                var alreadyAccounted = new HashSet<OutPoint>(invoice.Payments.Select(p => p.Outpoint));
-                foreach (var coin in coins.Coins.Where(c => !alreadyAccounted.Contains(c.Outpoint)))
-                {
-                    var payment = await _InvoiceRepository.AddPayment(invoice.Id, coin, coins.Strategy.Network.CryptoCode).ConfigureAwait(false);
-                    invoice.Payments.Add(payment);
-                    context.Events.Add(new InvoicePaymentEvent(invoice.Id));
-                    dirtyAddress = true;
-                }
-            }
-            //////
-            var network = coins?.Strategy?.Network ?? _NetworkProvider.GetNetwork(invoice.GetCryptoData().First().Key);
-            var cryptoData = invoice.GetCryptoData(network);
-            var cryptoDataAll = invoice.GetCryptoData();
-            var accounting = cryptoData.Calculate();
             if (invoice.Status == "new" && invoice.ExpirationTime < DateTimeOffset.UtcNow)
             {
                 context.MarkDirty();
                 await _InvoiceRepository.UnaffectAddress(invoice.Id);
 
-                context.Events.Add(new InvoiceStatusChangedEvent(invoice, "expired"));
+                context.Events.Add(new InvoiceEvent(invoice, 1004, "invoice_expired"));
                 invoice.Status = "expired";
             }
 
-            if (invoice.Status == "new" || invoice.Status == "expired")
+            var derivationStrategies = invoice.GetDerivationStrategies(_NetworkProvider).ToArray();
+            var payments = await GetPaymentsWithTransaction(derivationStrategies, invoice);
+            foreach (Task<NetworkCoins> coinsAsync in GetCoinsPerNetwork(context, invoice, derivationStrategies))
             {
-                var totalPaid = (await GetPaymentsWithTransaction(network, invoice)).Select(p => p.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
-                if (totalPaid >= accounting.TotalDue)
+                var coins = await coinsAsync;
+                if (coins.TimestampedCoins.Length == 0)
+                    continue;
+                bool dirtyAddress = false;
+                if (coins.State != null)
+                    context.ModifiedKnownStates.AddOrReplace(coins.Wallet.Network, coins.State);
+                var alreadyAccounted = new HashSet<OutPoint>(invoice.GetPayments(coins.Wallet.Network).Select(p => p.Outpoint));
+
+                foreach (var coin in coins.TimestampedCoins.Where(c => !alreadyAccounted.Contains(c.Coin.Outpoint)))
                 {
-                    if (invoice.Status == "new")
+                    var payment = await _InvoiceRepository.AddPayment(invoice.Id, coin.DateTime, coin.Coin, coins.Wallet.Network.CryptoCode).ConfigureAwait(false);
+#pragma warning disable CS0618
+                    invoice.Payments.Add(payment);
+#pragma warning restore CS0618
+                    alreadyAccounted.Add(coin.Coin.Outpoint);
+                    context.Events.Add(new InvoiceEvent(invoice, 1002, "invoice_receivedPayment"));
+                    dirtyAddress = true;
+                }
+                if (dirtyAddress)
+                {
+                    payments = await GetPaymentsWithTransaction(derivationStrategies, invoice);
+                }
+                var network = coins.Wallet.Network;
+                var cryptoData = invoice.GetCryptoData(network, _NetworkProvider);
+                var cryptoDataAll = invoice.GetCryptoData(_NetworkProvider);
+                var accounting = cryptoData.Calculate();
+
+                if (invoice.Status == "new" || invoice.Status == "expired")
+                {
+                    var totalPaid = payments.Select(p => p.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
+                    if (totalPaid >= accounting.TotalDue)
                     {
-                        context.Events.Add(new InvoiceStatusChangedEvent(invoice, "paid"));
-                        invoice.Status = "paid";
-                        invoice.ExceptionStatus = null;
+                        if (invoice.Status == "new")
+                        {
+                            context.Events.Add(new InvoiceEvent(invoice, 1003, "invoice_paidInFull"));
+                            invoice.Status = "paid";
+                            invoice.ExceptionStatus = null;
+                            await _InvoiceRepository.UnaffectAddress(invoice.Id);
+                            context.MarkDirty();
+                        }
+                        else if (invoice.Status == "expired")
+                        {
+                            invoice.ExceptionStatus = "paidLate";
+                            context.Events.Add(new InvoiceEvent(invoice, 1009, "invoice_paidAfterExpiration"));
+                            context.MarkDirty();
+                        }
+                    }
+
+                    if (totalPaid > accounting.TotalDue && invoice.ExceptionStatus != "paidOver")
+                    {
+                        invoice.ExceptionStatus = "paidOver";
                         await _InvoiceRepository.UnaffectAddress(invoice.Id);
                         context.MarkDirty();
                     }
-                    else if (invoice.Status == "expired")
+
+                    if (totalPaid < accounting.TotalDue && invoice.GetPayments().Count != 0 && invoice.ExceptionStatus != "paidPartial")
                     {
-                        invoice.ExceptionStatus = "paidLate";
+                        invoice.ExceptionStatus = "paidPartial";
+                        context.MarkDirty();
+                        if (dirtyAddress)
+                        {
+                            var address = await coins.Wallet.ReserveAddressAsync(coins.Strategy);
+                            Logs.PayServer.LogInformation("Generate new " + address);
+                            await _InvoiceRepository.NewAddress(invoice.Id, address, network);
+                        }
+                    }
+                }
+
+                if (invoice.Status == "paid")
+                {
+                    IEnumerable<AccountedPaymentEntity> transactions = payments;
+                    if (invoice.SpeedPolicy == SpeedPolicy.HighSpeed)
+                    {
+                        transactions = transactions.Where(t => t.Confirmations >= 1 || !t.Transaction.RBF);
+                    }
+                    else if (invoice.SpeedPolicy == SpeedPolicy.MediumSpeed)
+                    {
+                        transactions = transactions.Where(t => t.Confirmations >= 1);
+                    }
+                    else if (invoice.SpeedPolicy == SpeedPolicy.LowSpeed)
+                    {
+                        transactions = transactions.Where(t => t.Confirmations >= 6);
+                    }
+
+                    var totalConfirmed = transactions.Select(t => t.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
+
+                    if (// Is after the monitoring deadline
+                       (invoice.MonitoringExpiration < DateTimeOffset.UtcNow)
+                       &&
+                       // And not enough amount confirmed
+                       (totalConfirmed < accounting.TotalDue))
+                    {
+                        await _InvoiceRepository.UnaffectAddress(invoice.Id);
+                        context.Events.Add(new InvoiceEvent(invoice, 1013, "invoice_failedToConfirm"));
+                        invoice.Status = "invalid";
+                        context.MarkDirty();
+                    }
+                    else if (totalConfirmed >= accounting.TotalDue)
+                    {
+                        await _InvoiceRepository.UnaffectAddress(invoice.Id);
+                        context.Events.Add(new InvoiceEvent(invoice, 1005, "invoice_confirmed"));
+                        invoice.Status = "confirmed";
                         context.MarkDirty();
                     }
                 }
 
-                if (totalPaid > accounting.TotalDue && invoice.ExceptionStatus != "paidOver")
-                {
-                    invoice.ExceptionStatus = "paidOver";
-                    await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    context.MarkDirty();
-                }
-
-                if (totalPaid < accounting.TotalDue && invoice.Payments.Count != 0 && invoice.ExceptionStatus != "paidPartial")
-                {
-                    invoice.ExceptionStatus = "paidPartial";
-                    context.MarkDirty();
-                    if (dirtyAddress)
-                    {
-                        var address = await _Wallet.ReserveAddressAsync(coins.Strategy);
-                        Logs.PayServer.LogInformation("Generate new " + address);
-                        await _InvoiceRepository.NewAddress(invoice.Id, address, network);
-                    }
-                }
-            }
-
-            if (invoice.Status == "paid")
-            {
-                var transactions = await GetPaymentsWithTransaction(network, invoice);
-                if (invoice.SpeedPolicy == SpeedPolicy.HighSpeed)
-                {
-                    transactions = transactions.Where(t => t.Confirmations >= 1 || !t.Transaction.RBF);
-                }
-                else if (invoice.SpeedPolicy == SpeedPolicy.MediumSpeed)
-                {
-                    transactions = transactions.Where(t => t.Confirmations >= 1);
-                }
-                else if (invoice.SpeedPolicy == SpeedPolicy.LowSpeed)
+                if (invoice.Status == "confirmed")
                 {
+                    IEnumerable<AccountedPaymentEntity> transactions = payments;
                     transactions = transactions.Where(t => t.Confirmations >= 6);
-                }
-
-                var totalConfirmed = transactions.Select(t => t.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
-
-                if (// Is after the monitoring deadline
-                   (invoice.MonitoringExpiration < DateTimeOffset.UtcNow)
-                   &&
-                   // And not enough amount confirmed
-                   (totalConfirmed < accounting.TotalDue))
-                {
-                    await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    context.Events.Add(new InvoiceStatusChangedEvent(invoice, "invalid"));
-                    invoice.Status = "invalid";
-                    context.MarkDirty();
-                }
-                else if (totalConfirmed >= accounting.TotalDue)
-                {
-                    await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    context.Events.Add(new InvoiceStatusChangedEvent(invoice, "confirmed"));
-                    invoice.Status = "confirmed";
-                    context.MarkDirty();
-                }
-            }
-
-            if (invoice.Status == "confirmed")
-            {
-                var transactions = await GetPaymentsWithTransaction(network, invoice);
-                transactions = transactions.Where(t => t.Confirmations >= 6);
-                var totalConfirmed = transactions.Select(t => t.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
-                if (totalConfirmed >= accounting.TotalDue)
-                {
-                    context.Events.Add(new InvoiceStatusChangedEvent(invoice, "complete"));
-                    invoice.Status = "complete";
-                    context.MarkDirty();
+                    var totalConfirmed = transactions.Select(t => t.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
+                    if (totalConfirmed >= accounting.TotalDue)
+                    {
+                        context.Events.Add(new InvoiceEvent(invoice, 1006, "invoice_completed"));
+                        invoice.Status = "complete";
+                        context.MarkDirty();
+                    }
                 }
             }
         }
 
-        private async Task<IEnumerable<AccountedPaymentEntity>> GetPaymentsWithTransaction(BTCPayNetwork network, InvoiceEntity invoice)
+        private IEnumerable<Task<NetworkCoins>> GetCoinsPerNetwork(UpdateInvoiceContext context, InvoiceEntity invoice, DerivationStrategy[] strategies)
         {
-            var transactions = await _Wallet.GetTransactions(network, invoice.Payments.Select(t => t.Outpoint.Hash).ToArray());
+            return strategies
+                                .Select(d => (Wallet: _WalletProvider.GetWallet(d.Network),
+                                              Network: d.Network,
+                                              Strategy: d.DerivationStrategyBase))
+                                .Where(d => d.Wallet != null)
+                                .Select(d => (Network: d.Network,
+                                              Coins: d.Wallet.GetCoins(d.Strategy, context.KnownStates.TryGet(d.Network))))
+                                .Select(async d =>
+                                {
+                                    var coins = await d.Coins;
+                                    // Keep only coins from the invoice
+                                    coins.TimestampedCoins = coins.TimestampedCoins.Where(c => invoice.AvailableAddressHashes.Contains(c.Coin.ScriptPubKey.Hash.ToString() + d.Network.CryptoCode)).ToArray();
+                                    return coins;
+                                })
+                                .ToArray();
+        }
 
-            var spentTxIn = new Dictionary<OutPoint, AccountedPaymentEntity>();
-            var result = invoice.Payments.Select(p => p.Outpoint).ToHashSet();
-            List<AccountedPaymentEntity> payments = new List<AccountedPaymentEntity>();
-            foreach (var payment in invoice.Payments)
+
+        private async Task<IEnumerable<AccountedPaymentEntity>> GetPaymentsWithTransaction(DerivationStrategy[] derivations, InvoiceEntity invoice)
+        {
+            List<PaymentEntity> updatedPaymentEntities = new List<PaymentEntity>();
+            List<AccountedPaymentEntity> accountedPayments = new List<AccountedPaymentEntity>();
+            foreach (var network in derivations.Select(d => d.Network))
             {
-                TransactionResult tx;
-                if (!transactions.TryGetValue(payment.Outpoint.Hash, out tx))
-                {
-                    result.Remove(payment.Outpoint);
+                var wallet = _WalletProvider.GetWallet(network);
+                if (wallet == null)
                     continue;
-                }
-                AccountedPaymentEntity accountedPayment = new AccountedPaymentEntity()
-                {
-                    Confirmations = tx.Confirmations,
-                    Transaction = tx.Transaction,
-                    Payment = payment
-                };
-                payments.Add(accountedPayment);
-                foreach (var txin in tx.Transaction.Inputs)
-                {
-                    if (!spentTxIn.TryAdd(txin.PrevOut, accountedPayment))
-                    {
-                        //We get a double spend
-                        var existing = spentTxIn[txin.PrevOut];
 
-                        //Take the most recent, the full node is already comparing fees correctly so we have the most likely to be confirmed
-                        if (accountedPayment.Confirmations > 1 || existing.Payment.ReceivedTime < accountedPayment.Payment.ReceivedTime)
-                        {
-                            spentTxIn[txin.PrevOut] = accountedPayment;
-                            result.Remove(existing.Payment.Outpoint);
-                        }
+                var transactions = await wallet.GetTransactions(invoice.GetPayments(wallet.Network)
+                    .Select(t => t.Outpoint.Hash)
+                    .ToArray());
+                var conflicts = GetConflicts(transactions.Select(t => t.Value));
+                foreach (var payment in invoice.GetPayments(network))
+                {
+                    if (!transactions.TryGetValue(payment.Outpoint.Hash, out TransactionResult tx))
+                        continue;
+
+                    AccountedPaymentEntity accountedPayment = new AccountedPaymentEntity()
+                    {
+                        Confirmations = tx.Confirmations,
+                        Transaction = tx.Transaction,
+                        Payment = payment
+                    };
+                    var txId = accountedPayment.Transaction.GetHash();
+                    var txConflict = conflicts.GetConflict(txId);
+                    var accounted = txConflict == null || txConflict.IsWinner(txId);
+                    if (accounted != payment.Accounted)
+                    {
+                        updatedPaymentEntities.Add(payment);
+                        payment.Accounted = accounted;
                     }
+
+                    if (accounted)
+                        accountedPayments.Add(accountedPayment);
                 }
             }
-
-            List<PaymentEntity> updated = new List<PaymentEntity>();
-            var accountedPayments = payments.Where(p =>
-            {
-                var accounted = result.Contains(p.Payment.Outpoint);
-                if (p.Payment.Accounted != accounted)
-                {
-                    p.Payment.Accounted = accounted;
-                    updated.Add(p.Payment);
-                }
-                return accounted;
-            }).ToArray();
-
-            await _InvoiceRepository.UpdatePayments(payments);
+            await _InvoiceRepository.UpdatePayments(updatedPaymentEntities);
             return accountedPayments;
         }
 
+        class TransactionConflict
+        {
+            public Dictionary<uint256, TransactionResult> Transactions { get; set; } = new Dictionary<uint256, TransactionResult>();
+
+
+            uint256 _Winner;
+            public bool IsWinner(uint256 txId)
+            {
+                if (_Winner == null)
+                {
+                    var confirmed = Transactions.FirstOrDefault(t => t.Value.Confirmations >= 1);
+                    if (!confirmed.Equals(default(KeyValuePair<uint256, TransactionResult>)))
+                    {
+                        _Winner = confirmed.Key;
+                    }
+                    else
+                    {
+                        // Take the most recent (bitcoin node would not forward a conflict without a successfull RBF)
+                        _Winner = Transactions
+                                .OrderByDescending(t => t.Value.Timestamp)
+                                .First()
+                                .Key;
+                    }
+                }
+                return _Winner == txId;
+            }
+        }
+        class TransactionConflicts : List<TransactionConflict>
+        {
+            public TransactionConflicts(IEnumerable<TransactionConflict> collection) : base(collection)
+            {
+
+            }
+
+            public TransactionConflict GetConflict(uint256 txId)
+            {
+                return this.FirstOrDefault(c => c.Transactions.ContainsKey(txId));
+            }
+        }
+        private TransactionConflicts GetConflicts(IEnumerable<TransactionResult> transactions)
+        {
+            Dictionary<OutPoint, TransactionConflict> conflictsByOutpoint = new Dictionary<OutPoint, TransactionConflict>();
+            foreach (var tx in transactions)
+            {
+                var hash = tx.Transaction.GetHash();
+                foreach (var input in tx.Transaction.Inputs)
+                {
+                    TransactionConflict conflict = new TransactionConflict();
+                    if (!conflictsByOutpoint.TryAdd(input.PrevOut, conflict))
+                    {
+                        conflict = conflictsByOutpoint[input.PrevOut];
+                    }
+                    if (!conflict.Transactions.ContainsKey(hash))
+                        conflict.Transactions.Add(hash, tx);
+                }
+            }
+            return new TransactionConflicts(conflictsByOutpoint.Where(c => c.Value.Transactions.Count > 1).Select(c => c.Value));
+        }
+
         TimeSpan _PollInterval;
         public TimeSpan PollInterval
         {
@@ -340,11 +409,23 @@ namespace BTCPayServer.HostedServices
             }
         }
 
-        private void Watch(string invoiceId)
+        private async Task Watch(string invoiceId)
         {
             if (invoiceId == null)
                 throw new ArgumentNullException(nameof(invoiceId));
             _WatchRequests.Add(invoiceId);
+            var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId);
+            try
+            {
+                var now = DateTimeOffset.UtcNow;
+                if (invoice.ExpirationTime > now)
+                {
+                    await Task.Delay(invoice.ExpirationTime - now, _Cts.Token);
+                    _WatchRequests.Add(invoiceId);
+                }
+            }
+            catch when (_Cts.IsCancellationRequested)
+            { }
         }
 
         BlockingCollection<string> _WatchRequests = new BlockingCollection<string>(new ConcurrentQueue<string>());
@@ -362,7 +443,13 @@ namespace BTCPayServer.HostedServices
 
             leases.Add(_EventAggregator.Subscribe<Events.NewBlockEvent>(async b => { await NotifyBlock(); }));
             leases.Add(_EventAggregator.Subscribe<Events.TxOutReceivedEvent>(async b => { await NotifyReceived(b.ScriptPubKey, b.Network); }));
-            leases.Add(_EventAggregator.Subscribe<Events.InvoiceCreatedEvent>(b => { Watch(b.InvoiceId); }));
+            leases.Add(_EventAggregator.Subscribe<Events.InvoiceEvent>(async b =>
+            {
+                if(b.Name == "invoice_created")
+                { 
+                    await Watch(b.InvoiceId);
+                }
+            }));
 
             return Task.CompletedTask;
         }
@@ -401,19 +488,25 @@ namespace BTCPayServer.HostedServices
             {
                 foreach (var item in _WatchRequests.GetConsumingEnumerable(cancellation))
                 {
+                    bool added = false;
                     var task = executing.GetOrAdd(item, async i =>
                     {
                         try
                         {
+                            added = true;
                             await UpdateInvoice(i, cancellation);
                         }
                         catch (Exception ex) when (!cancellation.IsCancellationRequested)
                         {
-                            Logs.PayServer.LogCritical(ex, $"Error in the InvoiceWatcher loop (Invoice {item})");
-                            await Task.Delay(2000, cancellation);
+                            Logs.PayServer.LogCritical(ex, $"Error in the InvoiceWatcher loop (Invoice {i})");
                         }
-                        finally { executing.TryRemove(item, out Task useless); }
                     });
+
+                    if (!added && task.Status == TaskStatus.RanToCompletion)
+                    {
+                        executing.TryRemove(item, out Task t);
+                        _WatchRequests.Add(item);
+                    }
                 }
             }
             catch when (cancellation.IsCancellationRequested)

BTCPayServer/HostedServices/NBXplorerListener.cs

@@ -12,6 +12,7 @@ using NBXplorer;
 using System.Collections.Concurrent;
 using NBXplorer.DerivationStrategy;
 using BTCPayServer.Events;
+using BTCPayServer.Services;
 
 namespace BTCPayServer.HostedServices
 {
@@ -24,9 +25,11 @@ namespace BTCPayServer.HostedServices
         private TaskCompletionSource<bool> _RunningTask;
         private CancellationTokenSource _Cts;
         NBXplorerDashboard _Dashboards;
+        TransactionCacheProvider _TxCache;
 
         public NBXplorerListener(ExplorerClientProvider explorerClients,
                                 NBXplorerDashboard dashboard,
+                                TransactionCacheProvider cacheProvider,
                                 InvoiceRepository invoiceRepository,
                                 EventAggregator aggregator, IApplicationLifetime lifetime)
         {
@@ -36,6 +39,7 @@ namespace BTCPayServer.HostedServices
             _ExplorerClients = explorerClients;
             _Aggregator = aggregator;
             _Lifetime = lifetime;
+            _TxCache = cacheProvider;
         }
 
         CompositeDisposable leases = new CompositeDisposable();
@@ -83,19 +87,22 @@ namespace BTCPayServer.HostedServices
             }, null, 0, (int)PollInterval.TotalMilliseconds);
             leases.Add(_ListenPoller);
 
-            leases.Add(_Aggregator.Subscribe<Events.InvoiceCreatedEvent>(async inv =>
+            leases.Add(_Aggregator.Subscribe<Events.InvoiceEvent>(async inv =>
             {
-                var invoice = await _InvoiceRepository.GetInvoice(null, inv.InvoiceId);
-                List<Task> listeningDerivations = new List<Task>();
-                foreach (var notificationSessions in _Sessions)
+                if (inv.Name == "invoice_created")
                 {
-                    var derivationStrategy = GetStrategy(notificationSessions.Key, invoice);
-                    if (derivationStrategy != null)
+                    var invoice = await _InvoiceRepository.GetInvoice(null, inv.InvoiceId);
+                    List<Task> listeningDerivations = new List<Task>();
+                    foreach (var notificationSessions in _Sessions)
                     {
-                        listeningDerivations.Add(notificationSessions.Value.ListenDerivationSchemesAsync(new[] { derivationStrategy }, _Cts.Token));
+                        var derivationStrategy = GetStrategy(notificationSessions.Key, invoice);
+                        if (derivationStrategy != null)
+                        {
+                            listeningDerivations.Add(notificationSessions.Value.ListenDerivationSchemesAsync(new[] { derivationStrategy }, _Cts.Token));
+                        }
                     }
+                    await Task.WhenAll(listeningDerivations.ToArray()).ConfigureAwait(false);
                 }
-                await Task.WhenAll(listeningDerivations.ToArray()).ConfigureAwait(false);
             }));
             return Task.CompletedTask;
         }
@@ -130,11 +137,13 @@ namespace BTCPayServer.HostedServices
                         switch (newEvent)
                         {
                             case NBXplorer.Models.NewBlockEvent evt:
-                                _Aggregator.Publish(new Events.NewBlockEvent());
+                                _TxCache.GetTransactionCache(network).NewBlock(evt.Hash, evt.PreviousBlockHash);
+                                _Aggregator.Publish(new Events.NewBlockEvent() { CryptoCode = evt.CryptoCode });
                                 break;
                             case NBXplorer.Models.NewTransactionEvent evt:
-                                foreach (var txout in evt.Match.Outputs)
+                                foreach (var txout in evt.Outputs)
                                 {
+                                    _TxCache.GetTransactionCache(network).AddToCache(evt.TransactionData);
                                     _Aggregator.Publish(new Events.TxOutReceivedEvent()
                                     {
                                         Network = network,

BTCPayServer/HostedServices/NBXplorerWaiter.cs

@@ -27,11 +27,12 @@ namespace BTCPayServer.HostedServices
             public BTCPayNetwork Network { get; set; }
             public NBXplorerState State { get; set; }
             public StatusResult Status { get; set; }
+            public string Error { get; set; }
         }
         ConcurrentDictionary<string, NBXplorerSummary> _Summaries = new ConcurrentDictionary<string, NBXplorerSummary>();
-        public void Publish(BTCPayNetwork network, NBXplorerState state, StatusResult status)
+        public void Publish(BTCPayNetwork network, NBXplorerState state, StatusResult status, string error)
         {
-            var summary = new NBXplorerSummary() { Network = network, State = state, Status = status };
+            var summary = new NBXplorerSummary() { Network = network, State = state, Status = status, Error = error };
             _Summaries.AddOrUpdate(network.CryptoCode, summary, (k, v) => summary);
         }
 
@@ -120,6 +121,7 @@ namespace BTCPayServer.HostedServices
         private async Task<bool> StepAsync(CancellationToken cancellation)
         {
             var oldState = State;
+            string error = null;
             StatusResult status = null;
             try
             {
@@ -164,15 +166,28 @@ namespace BTCPayServer.HostedServices
                 }
 
             }
-            catch when (cancellation.IsCancellationRequested)
+            catch (Exception ex) when (!cancellation.IsCancellationRequested)
             {
-
+                error = ex.Message;
             }
-            catch (Exception ex)
+
+
+            if(status == null && error == null)
+                error = $"{_Network.CryptoCode}: NBXplorer does not support this cryptocurrency";
+
+            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 (error != null)
             {
                 State = NBXplorerState.NotConnected;
-                Logs.PayServer.LogError(ex, $"Error while trying to connect to NBXplorer ({_Network.CryptoCode})");
+                status = null;
+                _Aggregator.Publish(new NBXplorerErrorEvent(_Network, error));
             }
+
             if (oldState != State)
             {
                 if (State == NBXplorerState.Synching)
@@ -185,7 +200,7 @@ namespace BTCPayServer.HostedServices
                 }
                 _Aggregator.Publish(new NBXplorerStateChangedEvent(_Network, oldState, State));
             }
-            _Dashboard.Publish(_Network, State, status);
+            _Dashboard.Publish(_Network, State, status, error);
             return oldState != State;
         }
 

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -103,7 +103,7 @@ namespace BTCPayServer.Hosting
                 var dbpath = Path.Combine(opts.DataDir, "InvoiceDB");
                 if (!Directory.Exists(dbpath))
                     Directory.CreateDirectory(dbpath);
-                return new InvoiceRepository(dbContext, dbpath, opts.Network);
+                return new InvoiceRepository(dbContext, dbpath);
             });
             services.AddSingleton<BTCPayServerEnvironment>();
             services.TryAddSingleton<TokenRepository>();
@@ -129,12 +129,12 @@ namespace BTCPayServer.Hosting
             services.TryAddSingleton<BTCPayNetworkProvider>(o => 
             {
                 var opts = o.GetRequiredService<BTCPayServerOptions>();
-                return new BTCPayNetworkProvider(opts.Network);
+                return new BTCPayNetworkProvider(opts.ChainType);
             });
 
             services.TryAddSingleton<NBXplorerDashboard>();
             services.TryAddSingleton<StoreRepository>();
-            services.TryAddSingleton<BTCPayWallet>();
+            services.TryAddSingleton<BTCPayWalletProvider>();
             services.TryAddSingleton<CurrencyNameTable>();
             services.TryAddSingleton<IFeeProviderFactory>(o => new NBXplorerFeeProviderFactory(o.GetRequiredService<ExplorerClientProvider>())
             {
@@ -142,6 +142,8 @@ namespace BTCPayServer.Hosting
                 BlockTarget = 20
             });
 
+            services.AddSingleton<TransactionCacheProvider>();
+
             services.AddSingleton<IHostedService, NBXplorerWaiters>();
             services.AddSingleton<IHostedService, NBXplorerListener>();
             services.AddSingleton<IHostedService, InvoiceNotificationManager>();
@@ -150,7 +152,7 @@ namespace BTCPayServer.Hosting
             services.TryAddSingleton<ExplorerClientProvider>();
             services.TryAddSingleton<Bitpay>(o =>
             {
-                if (o.GetRequiredService<BTCPayServerOptions>().Network == Network.Main)
+                if (o.GetRequiredService<BTCPayServerOptions>().ChainType == ChainType.Main)
                     return new Bitpay(new Key(), new Uri("https://bitpay.com/"));
                 else
                     return new Bitpay(new Key(), new Uri("https://test.bitpay.com/"));

BTCPayServer/Logging/ConsoleLogger.cs

@@ -12,7 +12,11 @@ namespace BTCPayServer.Logging
 {
     public class CustomConsoleLogProvider : ILoggerProvider
     {
-        ConsoleLoggerProcessor _Processor = new ConsoleLoggerProcessor();
+        ConsoleLoggerProcessor _Processor;
+        public CustomConsoleLogProvider(ConsoleLoggerProcessor processor)
+        {
+            _Processor = processor;
+        }
         public ILogger CreateLogger(string categoryName)
         {
             return new CustomConsoleLogger(categoryName, (a, b) => true, false, _Processor);

BTCPayServer/Migrations/20180114123253_events.Designer.cs

@@ -0,0 +1,508 @@
+// <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("20180114123253_events")]
+    partial class events
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.0.1-rtm-125");
+
+            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.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.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/20180114123253_events.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+
+namespace BTCPayServer.Migrations
+{
+    public partial class events : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "InvoiceEvents",
+                columns: table => new
+                {
+                    InvoiceDataId = table.Column<string>(nullable: false),
+                    UniqueId = table.Column<string>(nullable: false),
+                    Message = table.Column<string>(nullable: true),
+                    Timestamp = table.Column<DateTimeOffset>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InvoiceEvents", x => new { x.InvoiceDataId, x.UniqueId });
+                    table.ForeignKey(
+                        name: "FK_InvoiceEvents_Invoices_InvoiceDataId",
+                        column: x => x.InvoiceDataId,
+                        principalTable: "Invoices",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "InvoiceEvents");
+        }
+    }
+}

BTCPayServer/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -81,6 +81,21 @@ namespace BTCPayServer.Migrations
                     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")
@@ -407,6 +422,14 @@ namespace BTCPayServer.Migrations
                         .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")

BTCPayServer/Models/InvoiceResponse.cs

@@ -37,81 +37,6 @@ namespace BTCPayServer.Models
         }
     }
 
-    public class InvoiceCryptoInfo
-    {
-        [JsonProperty("cryptoCode")]
-        public string CryptoCode { get; set; }
-
-        [JsonProperty("rate")]
-        public decimal Rate { get; set; }
-
-        //"exRates":{"USD":4320.02}
-        [JsonProperty("exRates")]
-        public Dictionary<string, double> ExRates
-        {
-            get; set;
-        }
-
-        //"btcPaid":"0.000000"
-        [JsonProperty("paid")]
-        public string Paid
-        {
-            get; set;
-        }
-
-        //"btcPrice":"0.001157"
-        [JsonProperty("price")]
-        public string Price
-        {
-            get; set;
-        }
-
-        //"btcDue":"0.001160"
-        /// <summary>
-        /// Amount of crypto remaining to pay this invoice
-        /// </summary>
-        [JsonProperty("due")]
-        public string Due
-        {
-            get; set;
-        }
-
-        [JsonProperty("paymentUrls")]
-        public NBitpayClient.InvoicePaymentUrls PaymentUrls
-        {
-            get; set;
-        }
-
-        [JsonProperty("address")]
-        public string Address { get; set; }
-        [JsonProperty("url")]
-        public string Url { get; set; }
-
-        /// <summary>
-        /// Total amount of this invoice
-        /// </summary>
-        [JsonProperty("totalDue")]
-        public string TotalDue { get; set; }
-
-        /// <summary>
-        /// Total amount of network fee to pay to the invoice
-        /// </summary>
-        [JsonProperty("networkFee")]
-        public string NetworkFee { get; set; }
-
-        /// <summary>
-        /// Number of transactions required to pay
-        /// </summary>
-        [JsonProperty("txCount")]
-        public int TxCount { get; set; }
-
-        /// <summary>
-        /// Total amount of the invoice paid in this crypto
-        /// </summary>
-        [JsonProperty("cryptoPaid")]
-        public Money CryptoPaid { get; set; }
-    }
-
     //{"facade":"pos/invoice","data":{,}}
     public class InvoiceResponse
     {
@@ -151,7 +76,7 @@ namespace BTCPayServer.Models
         }
 
         [JsonProperty("cryptoInfo")]
-        public List<InvoiceCryptoInfo> CryptoInfo { get; set; }
+        public List<NBitpayClient.InvoiceCryptoInfo> CryptoInfo { get; set; }
 
         //"price":5
         [JsonProperty("price")]

BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs

@@ -48,6 +48,8 @@ namespace BTCPayServer.Models.InvoicingModels
                 get;
                 set;
             }
+
+            public bool Replaced { get; set; }
         }
 
         public string StatusMessage
@@ -70,7 +72,7 @@ namespace BTCPayServer.Models.InvoicingModels
         {
             get; set;
         }
-
+        public string StatusException { get; set; }
         public DateTimeOffset CreatedDate
         {
             get; set;
@@ -110,6 +112,8 @@ namespace BTCPayServer.Models.InvoicingModels
             get;
             internal set;
         }
+
+        public string RedirectUrl { get; set; }
         public string Fiat
         {
             get;
@@ -122,5 +126,6 @@ namespace BTCPayServer.Models.InvoicingModels
         }
         public HistoricalAddressInvoiceData[] Addresses { get; set; }
         public DateTimeOffset MonitoringDate { get; internal set; }
+        public List<Data.InvoiceEventData> Events { get; internal set; }
     }
 }

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -47,7 +47,23 @@ namespace BTCPayServer.Models.StoreViewModels
 
         public List<StoreViewModel.DerivationScheme> DerivationSchemes { get; set; } = new List<StoreViewModel.DerivationScheme>();
 
-        [Display(Name = "Payment invalid if transactions fails to confirm after ... minutes")]
+        [Display(Name = "Multiply the original rate by ...")]
+        [Range(0.01, 10.0)]
+        public double RateMultiplier
+        {
+            get;
+            set;
+        }
+
+        [Display(Name = "Invoice expires if the full amount has not been paid after ... minutes")]
+        [Range(1, 60 * 24 * 31)]
+        public int InvoiceExpiration
+        {
+            get;
+            set;
+        }
+
+        [Display(Name = "Payment invalid if transactions fails to confirm ... minutes after invoice expiration")]
         [Range(10, 60 * 24 * 31)]
         public int MonitoringExpiration
         {

BTCPayServer/Program.cs

@@ -24,7 +24,8 @@ namespace BTCPayServer
         {
             ServicePointManager.DefaultConnectionLimit = 100;
             IWebHost host = null;
-            CustomConsoleLogProvider loggerProvider = new CustomConsoleLogProvider();
+            var processor = new ConsoleLoggerProcessor();
+            CustomConsoleLogProvider loggerProvider = new CustomConsoleLogProvider(processor);
 
             var loggerFactory = new LoggerFactory();
             loggerFactory.AddProvider(loggerProvider);
@@ -44,7 +45,8 @@ namespace BTCPayServer
                     .ConfigureLogging(l =>
                     {
                         l.AddFilter("Microsoft", LogLevel.Error);
-                        l.AddProvider(new CustomConsoleLogProvider());
+                        l.AddFilter("Microsoft.AspNetCore.Antiforgery.Internal", LogLevel.Critical);
+                        l.AddProvider(new CustomConsoleLogProvider(processor));
                     })
                     .UseStartup<Startup>()
                     .Build();
@@ -61,13 +63,9 @@ namespace BTCPayServer
                 if (!string.IsNullOrEmpty(ex.Message))
                     Logs.Configuration.LogError(ex.Message);
             }
-            catch (Exception exception)
-            {
-                logger.LogError("Exception thrown while running the server");
-                logger.LogError(exception.ToString());
-            }
             finally
             {
+                processor.Dispose();
                 if (host != null)
                     host.Dispose();
                 loggerProvider.Dispose();

BTCPayServer/Properties/launchSettings.json

@@ -1,27 +1,29 @@
 {
-    "iisSettings": {
-        "windowsAuthentication": false,
-        "anonymousAuthentication": true,
-        "iisExpress": {
-            "applicationUrl": "http://localhost:14139/",
-            "sslPort": 0
-        }
-    },
-    "profiles": {
-        "Default": {
-            "commandName": "Project"
-        },
-        "Docker-Regtest": {
-            "commandName": "Project",
-            "launchBrowser": true,
-            "environmentVariables": {
-                "BTCPAY_BTCEXPLORERURL": "http://127.0.0.1:32838/",
-                "BTCPAY_LTCEXPLORERURL": "http://127.0.0.1:32839/",
-                "BTCPAY_NETWORK": "regtest",
-                "ASPNETCORE_ENVIRONMENT": "Development",
-                "BTCPAY_POSTGRES": "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver"
-            },
-            "applicationUrl": "http://localhost:14142/"
-        }
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:14139/",
+      "sslPort": 0
     }
-}
+  },
+  "profiles": {
+    "Default": {
+      "commandName": "Project",
+      "commandLineArgs": "--network testnet --chains ltc --ltcexplorerurl http://127.0.0.1:2727/"
+    },
+    "Docker-Regtest": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "BTCPAY_NETWORK": "regtest",
+        "BTCPAY_LTCEXPLORERURL": "http://127.0.0.1:32838/",
+        "BTCPAY_BTCEXPLORERURL": "http://127.0.0.1:32838/",
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "BTCPAY_CHAINS": "btc,ltc",
+        "BTCPAY_POSTGRES": "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver"
+      },
+      "applicationUrl": "http://localhost:14142/"
+    }
+  }
+}

BTCPayServer/Services/BTCPayServerEnvironment.cs

@@ -5,12 +5,13 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Text;
+using NBXplorer;
 
 namespace BTCPayServer.Services
 {
     public class BTCPayServerEnvironment
     {
-        public BTCPayServerEnvironment(IHostingEnvironment env)
+        public BTCPayServerEnvironment(IHostingEnvironment env, BTCPayNetworkProvider provider)
         {
             Version = typeof(BTCPayServerEnvironment).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
 #if DEBUG
@@ -19,11 +20,13 @@ namespace BTCPayServer.Services
 			Build = "Release";
 #endif
             Environment = env;
+            ChainType = provider.NBXplorerNetworkProvider.ChainType;
         }
         public IHostingEnvironment Environment
         {
             get; set;
         }
+        public ChainType ChainType { get; set; }
         public string Version
         {
             get; set;

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using BTCPayServer.Models;
-using NBitpayClient;
 using Newtonsoft.Json.Linq;
 using NBitcoin.DataEncoders;
 using BTCPayServer.Data;
@@ -180,7 +179,7 @@ namespace BTCPayServer.Services.Invoices
                     var network = networks.GetNetwork(strat.Name);
                     if (network != null)
                     {
-                        if (network == networks.BTC && btcReturned)
+                        if (network == networks.BTC)
                             btcReturned = true;
                         yield return BTCPayServer.DerivationStrategy.Parse(strat.Value.Value<string>(), network);
                     }
@@ -220,10 +219,27 @@ namespace BTCPayServer.Services.Invoices
         {
             get; set;
         }
+
+        [Obsolete("Use GetPayments instead")]
         public List<PaymentEntity> Payments
         {
             get; set;
         }
+
+#pragma warning disable CS0618
+        public List<PaymentEntity> GetPayments()
+        {
+            return Payments.ToList();
+        }
+        public List<PaymentEntity> GetPayments(string cryptoCode)
+        {
+            return Payments.Where(p => p.CryptoCode == cryptoCode).ToList();
+        }
+        public List<PaymentEntity> GetPayments(BTCPayNetwork network)
+        {
+            return GetPayments(network.CryptoCode);
+        }
+#pragma warning restore CS0618
         public bool Refundable
         {
             get;
@@ -283,6 +299,7 @@ namespace BTCPayServer.Services.Invoices
             set;
         }
         public bool ExtendedNotifications { get; set; }
+        public List<InvoiceEventData> Events { get; internal set; }
 
         public bool IsExpired()
         {
@@ -306,11 +323,11 @@ namespace BTCPayServer.Services.Invoices
                 Flags = new Flags() { Refundable = Refundable }
             };
 
-            dto.CryptoInfo = new List<InvoiceCryptoInfo>();
-            foreach (var info in this.GetCryptoData().Values)
+            dto.CryptoInfo = new List<NBitpayClient.InvoiceCryptoInfo>();
+            foreach (var info in this.GetCryptoData(networkProvider, true).Values)
             {
                 var accounting = info.Calculate();
-                var cryptoInfo = new InvoiceCryptoInfo();
+                var cryptoInfo = new NBitpayClient.InvoiceCryptoInfo();
                 cryptoInfo.CryptoCode = info.CryptoCode;
                 cryptoInfo.Rate = info.Rate;
                 cryptoInfo.Price = Money.Coins(ProductInformation.Price / cryptoInfo.Rate).ToString();
@@ -320,7 +337,7 @@ namespace BTCPayServer.Services.Invoices
                 cryptoInfo.TotalDue = accounting.TotalDue.ToString();
                 cryptoInfo.NetworkFee = accounting.NetworkFee.ToString();
                 cryptoInfo.TxCount = accounting.TxCount;
-                cryptoInfo.CryptoPaid = accounting.CryptoPaid;
+                cryptoInfo.CryptoPaid = accounting.CryptoPaid.ToString();
 
                 cryptoInfo.Address = info.DepositAddress;
                 cryptoInfo.ExRates = new Dictionary<string, double>
@@ -328,12 +345,12 @@ namespace BTCPayServer.Services.Invoices
                     { ProductInformation.Currency, (double)cryptoInfo.Rate }
                 };
 
-                var scheme = networkProvider.GetNetwork(info.CryptoCode)?.UriScheme ?? "BTC";
+                var scheme = info.Network.UriScheme;
                 var cryptoSuffix = cryptoInfo.CryptoCode == "BTC" ? "" : "/" + cryptoInfo.CryptoCode;
                 cryptoInfo.Url = ServerUrl.WithTrailingSlash() + $"invoice{cryptoSuffix}?id=" + Id;
 
 
-                cryptoInfo.PaymentUrls = new InvoicePaymentUrls()
+                cryptoInfo.PaymentUrls = new NBitpayClient.InvoicePaymentUrls()
                 {
                     BIP72 = $"{scheme}:{cryptoInfo.Address}?amount={cryptoInfo.Due}&r={ServerUrl.WithTrailingSlash() + ($"i/{Id}{cryptoSuffix}")}",
                     BIP72b = $"{scheme}:?r={ServerUrl.WithTrailingSlash() + ($"i/{Id}{cryptoSuffix}")}",
@@ -353,8 +370,8 @@ namespace BTCPayServer.Services.Invoices
                     dto.PaymentUrls = cryptoInfo.PaymentUrls;
                 }
 #pragma warning restore CS0618
-
-                dto.CryptoInfo.Add(cryptoInfo);
+                if(!info.IsPhantomBTC)
+                    dto.CryptoInfo.Add(cryptoInfo);
             }
 
             Populate(ProductInformation, dto);
@@ -375,40 +392,46 @@ namespace BTCPayServer.Services.Invoices
 
         internal bool Support(BTCPayNetwork network)
         {
-            var rates = GetCryptoData();
+            var rates = GetCryptoData(null);
             return rates.TryGetValue(network.CryptoCode, out var data);
         }
 
-        public CryptoData GetCryptoData(string cryptoCode)
+        public CryptoData GetCryptoData(string cryptoCode, BTCPayNetworkProvider networkProvider, bool alwaysIncludeBTC = false)
         {
-            GetCryptoData().TryGetValue(cryptoCode, out var data);
+            GetCryptoData(networkProvider, alwaysIncludeBTC).TryGetValue(cryptoCode, out var data);
             return data;
         }
 
-        public CryptoData GetCryptoData(BTCPayNetwork network)
+        public CryptoData GetCryptoData(BTCPayNetwork network, BTCPayNetworkProvider networkProvider)
         {
-            GetCryptoData().TryGetValue(network.CryptoCode, out var data);
+            GetCryptoData(networkProvider).TryGetValue(network.CryptoCode, out var data);
             return data;
         }
 
-        public Dictionary<string, CryptoData> GetCryptoData()
+        public Dictionary<string, CryptoData> GetCryptoData(BTCPayNetworkProvider networkProvider, bool alwaysIncludeBTC = false)
         {
             Dictionary<string, CryptoData> rates = new Dictionary<string, CryptoData>();
             var serializer = new Serializer(Dummy);
+            CryptoData phantom = null;
 #pragma warning disable CS0618
             // Legacy
-            if (Rate != 0.0m)
+            if (alwaysIncludeBTC)
             {
-                rates.TryAdd("BTC", new CryptoData() { ParentEntity = this, Rate = Rate, CryptoCode = "BTC", TxFee = TxFee, FeeRate = new FeeRate(TxFee, 100), DepositAddress = DepositAddress });
+                var btcNetwork = networkProvider?.GetNetwork("BTC");
+                phantom = new CryptoData() { ParentEntity = this, IsPhantomBTC = true, Rate = Rate, CryptoCode = "BTC", TxFee = TxFee, FeeRate = new FeeRate(TxFee, 100), DepositAddress = DepositAddress, Network = btcNetwork };
+                rates.Add("BTC", phantom);
             }
             if (CryptoData != null)
             {
                 foreach (var prop in CryptoData.Properties())
                 {
+                    if (prop.Name == "BTC" && phantom != null)
+                        rates.Remove("BTC");
                     var r = serializer.ToObject<CryptoData>(prop.Value.ToString());
                     r.CryptoCode = prop.Name;
                     r.ParentEntity = this;
-                    rates.TryAdd(r.CryptoCode, r);
+                    r.Network = networkProvider?.GetNetwork(r.CryptoCode);
+                    rates.Add(r.CryptoCode, r);
                 }
             }
 #pragma warning restore CS0618
@@ -416,6 +439,14 @@ namespace BTCPayServer.Services.Invoices
         }
 
         Network Dummy = Network.Main;
+
+        public void SetCryptoData(CryptoData cryptoData)
+        {
+            var dict = GetCryptoData(null);
+            dict.AddOrReplace(cryptoData.CryptoCode, cryptoData);
+            SetCryptoData(dict);
+        }
+
         public void SetCryptoData(Dictionary<string, CryptoData> cryptoData)
         {
             var obj = new JObject();
@@ -468,6 +499,8 @@ namespace BTCPayServer.Services.Invoices
     {
         [JsonIgnore]
         public InvoiceEntity ParentEntity { get; set; }
+        [JsonIgnore]
+        public BTCPayNetwork Network { get; set; }
         [JsonProperty(PropertyName = "cryptoCode", DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string CryptoCode { get; set; }
         [JsonProperty(PropertyName = "rate")]
@@ -479,9 +512,12 @@ namespace BTCPayServer.Services.Invoices
         [JsonProperty(PropertyName = "depositAddress")]
         public string DepositAddress { get; set; }
 
+        [JsonIgnore]
+        public bool IsPhantomBTC { get; set; }
+
         public CryptoDataAccounting Calculate()
         {
-            var cryptoData = ParentEntity.GetCryptoData();
+            var cryptoData = ParentEntity.GetCryptoData(null, IsPhantomBTC);
             var totalDue = Money.Coins(ParentEntity.ProductInformation.Price / Rate);
             var paid = Money.Zero;
             var cryptoPaid = Money.Zero;
@@ -490,9 +526,9 @@ namespace BTCPayServer.Services.Invoices
             bool paidEnough = totalDue <= paid;
             int txCount = 0;
             var payments =
-                ParentEntity.Payments
+                ParentEntity.GetPayments()
                 .Where(p => p.Accounted)
-                .OrderByDescending(p => p.ReceivedTime)
+                .OrderBy(p => p.ReceivedTime)
                 .Select(_ =>
                 {
                     var txFee = _.GetValue(cryptoData, CryptoCode, cryptoData[_.GetCryptoCode()].TxFee);

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -1,4 +1,5 @@
 using DBreeze;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -16,6 +17,7 @@ using System.Threading.Tasks;
 using BTCPayServer.Data;
 using System.Globalization;
 using BTCPayServer.Models.InvoicingModels;
+using BTCPayServer.Logging;
 
 namespace BTCPayServer.Services.Invoices
 {
@@ -32,32 +34,18 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
-
-        Network _Network;
-        public Network Network
-        {
-            get
-            {
-                return _Network;
-            }
-            set
-            {
-                _Network = value;
-            }
-        }
-
         private ApplicationDbContextFactory _ContextFactory;
         private CustomThreadPool _IndexerThread;
-        public InvoiceRepository(ApplicationDbContextFactory contextFactory, string dbreezePath, Network network)
+        public InvoiceRepository(ApplicationDbContextFactory contextFactory, string dbreezePath)
         {
             _Engine = new DBreezeEngine(dbreezePath);
             _IndexerThread = new CustomThreadPool(1, "Invoice Indexer");
-            _Network = network;
             _ContextFactory = contextFactory;
         }
 
         public async Task<bool> RemovePendingInvoice(string invoiceId)
         {
+            Logs.PayServer.LogInformation($"Remove pending invoice {invoiceId}");
             using (var ctx = _ContextFactory.CreateContext())
             {
                 ctx.PendingInvoices.Remove(new PendingInvoiceData() { Id = invoiceId });
@@ -105,9 +93,11 @@ namespace BTCPayServer.Services.Invoices
         public async Task<InvoiceEntity> CreateInvoiceAsync(string storeId, InvoiceEntity invoice, BTCPayNetworkProvider networkProvider)
         {
             List<string> textSearch = new List<string>();
-            invoice = Clone(invoice);
+            invoice = Clone(invoice, null);
             invoice.Id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(16));
+#pragma warning disable CS0618
             invoice.Payments = new List<PaymentEntity>();
+#pragma warning restore CS0618
             invoice.StoreId = storeId;
             using (var context = _ContextFactory.CreateContext())
             {
@@ -116,23 +106,22 @@ namespace BTCPayServer.Services.Invoices
                     StoreDataId = storeId,
                     Id = invoice.Id,
                     Created = invoice.InvoiceTime,
-                    Blob = ToBytes(invoice),
+                    Blob = ToBytes(invoice, null),
                     OrderId = invoice.OrderId,
                     Status = invoice.Status,
                     ItemCode = invoice.ProductInformation.ItemCode,
                     CustomerEmail = invoice.RefundMail
                 });
 
-                foreach (var cryptoData in invoice.GetCryptoData().Values)
+                foreach (var cryptoData in invoice.GetCryptoData(networkProvider).Values)
                 {
-                    var network = networkProvider.GetNetwork(cryptoData.CryptoCode);
-                    if (network == null)
+                    if (cryptoData.Network == null)
                         throw new InvalidOperationException("CryptoCode unsupported");
                     context.AddressInvoices.Add(new AddressInvoiceData()
                     {
                         InvoiceDataId = invoice.Id,
                         CreatedTime = DateTimeOffset.UtcNow,
-                    }.SetHash(BitcoinAddress.Create(cryptoData.DepositAddress, network.NBitcoinNetwork).ScriptPubKey.Hash, network.CryptoCode));
+                    }.SetHash(BitcoinAddress.Create(cryptoData.DepositAddress, cryptoData.Network.NBitcoinNetwork).ScriptPubKey.Hash, cryptoData.CryptoCode));
                     context.HistoricalAddressInvoices.Add(new HistoricalAddressInvoiceData()
                     {
                         InvoiceDataId = invoice.Id,
@@ -149,8 +138,8 @@ namespace BTCPayServer.Services.Invoices
             textSearch.Add(invoice.InvoiceTime.ToString(CultureInfo.InvariantCulture));
             textSearch.Add(invoice.ProductInformation.Price.ToString(CultureInfo.InvariantCulture));
             textSearch.Add(invoice.OrderId);
-            textSearch.Add(ToString(invoice.BuyerInformation));
-            textSearch.Add(ToString(invoice.ProductInformation));
+            textSearch.Add(ToString(invoice.BuyerInformation, null));
+            textSearch.Add(ToString(invoice.ProductInformation, null));
             textSearch.Add(invoice.StoreId);
 
             AddToTextSearch(invoice.Id, textSearch.ToArray());
@@ -166,9 +155,8 @@ namespace BTCPayServer.Services.Invoices
                 if (invoice == null)
                     return false;
 
-                var invoiceEntity = ToObject<InvoiceEntity>(invoice.Blob);
-                var cryptoData = invoiceEntity.GetCryptoData();
-                var currencyData = cryptoData.Where(c => c.Value.CryptoCode == network.CryptoCode).Select(f => f.Value).FirstOrDefault();
+                var invoiceEntity = ToObject<InvoiceEntity>(invoice.Blob, network.NBitcoinNetwork);
+                var currencyData = invoiceEntity.GetCryptoData(network, null);
                 if (currencyData == null)
                     return false;
 
@@ -185,11 +173,14 @@ namespace BTCPayServer.Services.Invoices
                     invoiceEntity.DepositAddress = currencyData.DepositAddress;
                 }
 #pragma warning restore CS0618
-                invoiceEntity.SetCryptoData(cryptoData);
-                invoice.Blob = ToBytes(invoiceEntity);
+                invoiceEntity.SetCryptoData(currencyData);
+                invoice.Blob = ToBytes(invoiceEntity, network.NBitcoinNetwork);
 
-                context.AddressInvoices.Add(new AddressInvoiceData() {
-                    InvoiceDataId = invoiceId, CreatedTime = DateTimeOffset.UtcNow }
+                context.AddressInvoices.Add(new AddressInvoiceData()
+                {
+                    InvoiceDataId = invoiceId,
+                    CreatedTime = DateTimeOffset.UtcNow
+                }
                 .SetHash(bitcoinAddress.ScriptPubKey.Hash, network.CryptoCode));
                 context.HistoricalAddressInvoices.Add(new HistoricalAddressInvoiceData()
                 {
@@ -203,15 +194,30 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
+        public async Task AddInvoiceEvent(string invoiceId, object evt)
+        {
+            using (var context = _ContextFactory.CreateContext())
+            {
+                context.InvoiceEvents.Add(new InvoiceEventData()
+                {
+                    InvoiceDataId = invoiceId,
+                    Message = evt.ToString(),
+                    Timestamp = DateTimeOffset.UtcNow,
+                    UniqueId = Encoders.Hex.EncodeData(RandomUtils.GetBytes(10))
+                });
+                await context.SaveChangesAsync();
+            }
+        }
+
         private static void MarkUnassigned(string invoiceId, InvoiceEntity entity, ApplicationDbContext context, string cryptoCode)
         {
-            foreach (var address in entity.GetCryptoData())
+            foreach (var address in entity.GetCryptoData(null))
             {
                 if (cryptoCode != null && cryptoCode != address.Value.CryptoCode)
                     continue;
                 var historical = new HistoricalAddressInvoiceData();
                 historical.InvoiceDataId = invoiceId;
-                historical.SetAddress(address.Value.DepositAddress, cryptoCode);
+                historical.SetAddress(address.Value.DepositAddress, address.Value.CryptoCode);
                 historical.UnAssigned = DateTimeOffset.UtcNow;
                 context.Attach(historical);
                 context.Entry(historical).Property(o => o.UnAssigned).IsModified = true;
@@ -225,7 +231,7 @@ namespace BTCPayServer.Services.Invoices
                 var invoiceData = await context.FindAsync<InvoiceData>(invoiceId).ConfigureAwait(false);
                 if (invoiceData == null)
                     return;
-                var invoiceEntity = ToObject<InvoiceEntity>(invoiceData.Blob);
+                var invoiceEntity = ToObject<InvoiceEntity>(invoiceData.Blob, null);
                 MarkUnassigned(invoiceId, invoiceEntity, context, null);
                 try
                 {
@@ -308,13 +314,15 @@ namespace BTCPayServer.Services.Invoices
 
         private InvoiceEntity ToEntity(InvoiceData invoice)
         {
-            var entity = ToObject<InvoiceEntity>(invoice.Blob);
+            var entity = ToObject<InvoiceEntity>(invoice.Blob, null);
+#pragma warning disable CS0618
             entity.Payments = invoice.Payments.Select(p =>
             {
-                var paymentEntity = ToObject<PaymentEntity>(p.Blob);
+                var paymentEntity = ToObject<PaymentEntity>(p.Blob, null);
                 paymentEntity.Accounted = p.Accounted;
                 return paymentEntity;
             }).ToList();
+#pragma warning restore CS0618
             entity.ExceptionStatus = invoice.ExceptionStatus;
             entity.Status = invoice.Status;
             entity.RefundMail = invoice.CustomerEmail;
@@ -327,6 +335,10 @@ namespace BTCPayServer.Services.Invoices
             {
                 entity.AvailableAddressHashes = invoice.AddressInvoices.Select(a => a.GetHash() + a.GetCryptoCode()).ToHashSet();
             }
+            if(invoice.Events != null)
+            {
+                entity.Events = invoice.Events.OrderBy(c => c.Timestamp).ToList();
+            }
             return entity;
         }
 
@@ -339,8 +351,10 @@ namespace BTCPayServer.Services.Invoices
                     .Invoices
                     .Include(o => o.Payments)
                     .Include(o => o.RefundAddresses);
-                if(queryObject.IncludeAddresses)
+                if (queryObject.IncludeAddresses)
                     query = query.Include(o => o.HistoricalAddressInvoices).Include(o => o.AddressInvoices);
+                if (queryObject.IncludeEvents)
+                    query = query.Include(o => o.Events);
                 if (!string.IsNullOrEmpty(queryObject.InvoiceId))
                 {
                     query = query.Where(i => i.Id == queryObject.InvoiceId);
@@ -394,7 +408,7 @@ namespace BTCPayServer.Services.Invoices
 
         }
 
-        public async Task AddRefundsAsync(string invoiceId, TxOut[] outputs)
+        public async Task AddRefundsAsync(string invoiceId, TxOut[] outputs, Network network)
         {
             if (outputs.Length == 0)
                 return;
@@ -408,18 +422,18 @@ namespace BTCPayServer.Services.Invoices
                     {
                         Id = invoiceId + "-" + i,
                         InvoiceDataId = invoiceId,
-                        Blob = ToBytes(output)
+                        Blob = ToBytes(output, network)
                     });
                     i++;
                 }
                 await context.SaveChangesAsync().ConfigureAwait(false);
             }
 
-            var addresses = outputs.Select(o => o.ScriptPubKey.GetDestinationAddress(_Network)).Where(a => a != null).ToArray();
+            var addresses = outputs.Select(o => o.ScriptPubKey.GetDestinationAddress(network)).Where(a => a != null).ToArray();
             AddToTextSearch(invoiceId, addresses.Select(a => a.ToString()).ToArray());
         }
 
-        public async Task<PaymentEntity> AddPayment(string invoiceId, Coin receivedCoin, string cryptoCode)
+        public async Task<PaymentEntity> AddPayment(string invoiceId, DateTimeOffset date, Coin receivedCoin, string cryptoCode)
         {
             using (var context = _ContextFactory.CreateContext())
             {
@@ -430,13 +444,13 @@ namespace BTCPayServer.Services.Invoices
                     Output = receivedCoin.TxOut,
                     CryptoCode = cryptoCode,
 #pragma warning restore CS0618
-                    ReceivedTime = DateTime.UtcNow
+                    ReceivedTime = date.UtcDateTime
                 };
 
                 PaymentData data = new PaymentData
                 {
                     Id = receivedCoin.Outpoint.ToString(),
-                    Blob = ToBytes(entity),
+                    Blob = ToBytes(entity, null),
                     InvoiceDataId = invoiceId
                 };
 
@@ -448,7 +462,7 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
-        public async Task UpdatePayments(List<AccountedPaymentEntity> payments)
+        public async Task UpdatePayments(List<PaymentEntity> payments)
         {
             if (payments.Count == 0)
                 return;
@@ -457,8 +471,8 @@ namespace BTCPayServer.Services.Invoices
                 foreach (var payment in payments)
                 {
                     var data = new PaymentData();
-                    data.Id = payment.Payment.Outpoint.ToString();
-                    data.Accounted = payment.Payment.Accounted;
+                    data.Id = payment.Outpoint.ToString();
+                    data.Accounted = payment.Accounted;
                     context.Attach(data);
                     context.Entry(data).Property(o => o.Accounted).IsModified = true;
                 }
@@ -466,24 +480,24 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
-        private T ToObject<T>(byte[] value)
+        private T ToObject<T>(byte[] value, Network network)
         {
-            return NBitcoin.JsonConverters.Serializer.ToObject<T>(ZipUtils.Unzip(value), Network);
+            return NBitcoin.JsonConverters.Serializer.ToObject<T>(ZipUtils.Unzip(value), network);
         }
 
-        private byte[] ToBytes<T>(T obj)
+        private byte[] ToBytes<T>(T obj, Network network)
         {
-            return ZipUtils.Zip(NBitcoin.JsonConverters.Serializer.ToString(obj));
+            return ZipUtils.Zip(NBitcoin.JsonConverters.Serializer.ToString(obj, network));
         }
 
-        private T Clone<T>(T invoice)
+        private T Clone<T>(T invoice, Network network)
         {
-            return NBitcoin.JsonConverters.Serializer.ToObject<T>(ToString(invoice), Network);
+            return NBitcoin.JsonConverters.Serializer.ToObject<T>(ToString(invoice, network), network);
         }
 
-        private string ToString<T>(T data)
+        private string ToString<T>(T data, Network network)
         {
-            return NBitcoin.JsonConverters.Serializer.ToString(data, Network);
+            return NBitcoin.JsonConverters.Serializer.ToString(data, network);
         }
 
         public void Dispose()
@@ -549,5 +563,7 @@ namespace BTCPayServer.Services.Invoices
             set;
         }
         public bool IncludeAddresses { get; set; }
+
+        public bool IncludeEvents { get; set; }
     }
 }

BTCPayServer/Services/Mails/EmailSender.cs

@@ -1,4 +1,6 @@
-using Hangfire;
+using BTCPayServer.Logging;
+using Microsoft.Extensions.Logging;
+using Hangfire;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,10 +22,16 @@ namespace BTCPayServer.Services.Mails
             _JobClient = jobClient;
             _Repository = repository;
         }
-        public Task SendEmailAsync(string email, string subject, string message)
+        public async Task SendEmailAsync(string email, string subject, string message)
         {
+            var settings = await _Repository.GetSettingAsync<EmailSettings>();
+            if (settings == null)
+            {
+                Logs.Configuration.LogWarning("Should have sent email, but email settings are not configured");
+                return;
+            }
             _JobClient.Schedule(() => SendMailCore(email, subject, message), TimeSpan.Zero);
-            return Task.CompletedTask;
+            return;
         }
 
         public async Task SendMailCore(string email, string subject, string message)

BTCPayServer/Services/Rates/CachedRateProvider.cs

@@ -37,13 +37,7 @@ namespace BTCPayServer.Services.Rates
                 return _Inner.GetRateAsync(currency);
             });
         }
-
-        private bool TryGetFromCache(string key, out object obj)
-        {
-            obj = _MemoryCache.Get(key);
-            return obj != null;
-        }
-
+        
         public Task<ICollection<Rate>> GetRatesAsync()
         {
             return _MemoryCache.GetOrCreateAsync("GLOBAL_RATES", (ICacheEntry entry) =>

BTCPayServer/Services/Rates/TweakRateProvider.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class TweakRateProvider : IRateProvider
+    {
+        private BTCPayNetwork network;
+        private IRateProvider rateProvider;
+        private List<RateRule> rateRules;
+
+        public TweakRateProvider(BTCPayNetwork network, IRateProvider rateProvider, List<RateRule> rateRules)
+        {
+            if (network == null)
+                throw new ArgumentNullException(nameof(network));
+            if (rateProvider == null)
+                throw new ArgumentNullException(nameof(rateProvider));
+            if (rateRules == null)
+                throw new ArgumentNullException(nameof(rateRules));
+            this.network = network;
+            this.rateProvider = rateProvider;
+            this.rateRules = rateRules;
+        }
+
+        public async Task<decimal> GetRateAsync(string currency)
+        {
+            var rate = await rateProvider.GetRateAsync(currency);
+            foreach(var rule in rateRules)
+            {
+                rate = rule.Apply(network, rate);
+            }
+            return rate;
+        }
+
+        public async Task<ICollection<Rate>> GetRatesAsync()
+        {
+            List<Rate> rates = new List<Rate>();
+            foreach (var rate in await rateProvider.GetRatesAsync())
+            {
+                var localRate = rate.Value;
+                foreach (var rule in rateRules)
+                {
+                    localRate = rule.Apply(network, localRate);
+                }
+                rates.Add(new Rate(rate.Currency, localRate));
+            }
+            return rates;
+        }
+    }
+}

BTCPayServer/Services/TransactionCache.cs

@@ -0,0 +1,96 @@
+using System;
+using Microsoft.Extensions.Logging;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Options;
+using NBitcoin;
+using NBXplorer.Models;
+
+namespace BTCPayServer.Services
+{
+    public class TransactionCacheProvider
+    {
+        IOptions<MemoryCacheOptions> _Options;
+        public TransactionCacheProvider(IOptions<MemoryCacheOptions> options)
+        {
+            _Options = options;
+        }
+
+        ConcurrentDictionary<string, TransactionCache> _TransactionCaches = new ConcurrentDictionary<string, TransactionCache>();
+        public TransactionCache GetTransactionCache(BTCPayNetwork network)
+        {
+            if (network == null)
+                throw new ArgumentNullException(nameof(network));
+            return _TransactionCaches.GetOrAdd(network.CryptoCode, c => new TransactionCache(_Options, network));
+        }
+    }
+    public class TransactionCache : IDisposable
+    {
+        //IOptions<MemoryCacheOptions> _Options;
+        public TransactionCache(IOptions<MemoryCacheOptions> options, BTCPayNetwork network)
+        {
+            //if (network == null)
+            //    throw new ArgumentNullException(nameof(network));
+            //_Options = options;
+            //_MemoryCache = new MemoryCache(_Options);
+            //Network = network;
+        }
+
+        //uint256 _LastHash;
+        //int _ConfOffset;
+        //IMemoryCache _MemoryCache;
+        
+        public void NewBlock(uint256 newHash, uint256 previousHash)
+        {
+            //if (_LastHash != previousHash)
+            //{
+            //    var old = _MemoryCache;
+            //    _ConfOffset = 0;
+            //    _MemoryCache = new MemoryCache(_Options);
+            //    Thread.MemoryBarrier();
+            //    old.Dispose();
+            //}
+            //else
+            //    _ConfOffset++;
+            //_LastHash = newHash;
+        }
+
+        public TimeSpan CacheSpan { get; private set; } = TimeSpan.FromMinutes(60);
+
+        public BTCPayNetwork Network { get; private set; }
+
+        public void AddToCache(TransactionResult tx)
+        {
+            //Logging.Logs.PayServer.LogInformation($"ADD CACHE: {tx.Transaction.GetHash()} ({tx.Confirmations} conf)");
+            //_MemoryCache.Set(tx.Transaction.GetHash(), tx, DateTimeOffset.UtcNow + CacheSpan);
+        }
+
+
+        public TransactionResult GetTransaction(uint256 txId)
+        {
+            //var ok = _MemoryCache.TryGetValue(txId.ToString(), out object tx);
+            //Logging.Logs.PayServer.LogInformation($"GET CACHE: {txId} ({ok} plus {_ConfOffset})");
+
+            //var result = tx as TransactionResult;
+            //var confOffset = _ConfOffset;
+            //if (result != null && result.Confirmations > 0 && confOffset > 0)
+            //{
+            //    var serializer = new NBXplorer.Serializer(Network.NBitcoinNetwork);
+            //    result = serializer.ToObject<TransactionResult>(serializer.ToString(result));
+            //    result.Confirmations += confOffset;
+            //    result.Height += confOffset;
+            //}
+            //return result;
+            return null; // Does not work correctly yet
+        }
+
+        public void Dispose()
+        {
+            //_MemoryCache.Dispose();
+        }
+    }
+}

BTCPayServer/Services/Wallets/BTCPayWallet.cs

@@ -9,84 +9,115 @@ using System.Threading.Tasks;
 using BTCPayServer.Data;
 using System.Threading;
 using NBXplorer.Models;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace BTCPayServer.Services.Wallets
 {
     public class KnownState
     {
-        public uint256 UnconfirmedHash { get; set; }
-        public uint256 ConfirmedHash { get; set; }
+        public UTXOChanges PreviousCall { get; set; }
     }
-    public class GetCoinsResult
+    public class NetworkCoins
     {
-        public Coin[] Coins { get; set; }
+        public class TimestampedCoin
+        {
+            public DateTimeOffset DateTime { get; set; }
+            public Coin Coin { get; set; }
+        }
+        public TimestampedCoin[] TimestampedCoins { get; set; }
         public KnownState State { get; set; }
-        public DerivationStrategy Strategy { get; set; }
+        public DerivationStrategyBase Strategy { get; set; }
+        public BTCPayWallet Wallet { get; set; }
     }
     public class BTCPayWallet
     {
-        private ExplorerClientProvider _Client;
-        ApplicationDbContextFactory _DBFactory;
-
-        public BTCPayWallet(ExplorerClientProvider client, ApplicationDbContextFactory factory)
+        private ExplorerClient _Client;
+        private TransactionCache _Cache;
+        public BTCPayWallet(ExplorerClient client, TransactionCache cache, BTCPayNetwork network)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));
-            if (factory == null)
-                throw new ArgumentNullException(nameof(factory));
             _Client = client;
-            _DBFactory = factory;
+            _Network = network;
+            _Cache = cache;
         }
 
 
-        public async Task<BitcoinAddress> ReserveAddressAsync(DerivationStrategy derivationStrategy)
+        private readonly BTCPayNetwork _Network;
+        public BTCPayNetwork Network
         {
-            var client = _Client.GetExplorerClient(derivationStrategy.Network);
-            var pathInfo = await client.GetUnusedAsync(derivationStrategy.DerivationStrategyBase, DerivationFeature.Deposit, 0, true).ConfigureAwait(false);
-            return pathInfo.ScriptPubKey.GetDestinationAddress(client.Network);
-        }
-
-        public async Task TrackAsync(DerivationStrategy derivationStrategy)
-        {
-            var client = _Client.GetExplorerClient(derivationStrategy.Network);
-            await client.TrackAsync(derivationStrategy.DerivationStrategyBase);
-        }
-
-        public Task<TransactionResult> GetTransactionAsync(BTCPayNetwork network, uint256 txId, CancellationToken cancellation = default(CancellationToken))
-        {
-            var client = _Client.GetExplorerClient(network);
-            return client.GetTransactionAsync(txId, cancellation);
-        }
-
-        public async Task<GetCoinsResult> GetCoins(DerivationStrategy strategy, KnownState state, CancellationToken cancellation = default(CancellationToken))
-        {
-            var client = _Client.GetExplorerClient(strategy.Network);
-            if (client == null)
-                return new GetCoinsResult() { Coins = new Coin[0], State = null, Strategy = strategy };
-            var changes = await client.SyncAsync(strategy.DerivationStrategyBase, state?.ConfirmedHash, state?.UnconfirmedHash, true, cancellation).ConfigureAwait(false);
-            var utxos = changes.Confirmed.UTXOs.Concat(changes.Unconfirmed.UTXOs).Select(c => c.AsCoin()).ToArray();
-            return new GetCoinsResult()
+            get
             {
-                Coins = utxos,
-                State = new KnownState() { ConfirmedHash = changes.Confirmed.Hash, UnconfirmedHash = changes.Unconfirmed.Hash },
+                return _Network;
+            }
+        }
+
+        public TimeSpan CacheSpan { get; private set; } = TimeSpan.FromMinutes(60);
+
+        public async Task<BitcoinAddress> ReserveAddressAsync(DerivationStrategyBase derivationStrategy)
+        {
+            if (derivationStrategy == null)
+                throw new ArgumentNullException(nameof(derivationStrategy));
+            var pathInfo = await _Client.GetUnusedAsync(derivationStrategy, DerivationFeature.Deposit, 0, true).ConfigureAwait(false);
+            // Might happen on some broken install
+            if (pathInfo == null)
+            {
+                await _Client.TrackAsync(derivationStrategy).ConfigureAwait(false);
+                pathInfo = await _Client.GetUnusedAsync(derivationStrategy, DerivationFeature.Deposit, 0, true).ConfigureAwait(false);
+            }
+            return pathInfo.ScriptPubKey.GetDestinationAddress(Network.NBitcoinNetwork);
+        }
+
+        public async Task TrackAsync(DerivationStrategyBase derivationStrategy)
+        {
+            await _Client.TrackAsync(derivationStrategy);
+        }
+
+        public async Task<TransactionResult> GetTransactionAsync(uint256 txId, CancellationToken cancellation = default(CancellationToken))
+        {
+            if (txId == null)
+                throw new ArgumentNullException(nameof(txId));
+            var tx = _Cache.GetTransaction(txId);
+            if (tx != null)
+                return tx;
+            tx = await _Client.GetTransactionAsync(txId, cancellation);
+            _Cache.AddToCache(tx);
+            return tx;
+        }
+
+        public async Task<NetworkCoins> GetCoins(DerivationStrategyBase strategy, KnownState state, CancellationToken cancellation = default(CancellationToken))
+        {
+            var changes = await _Client.GetUTXOsAsync(strategy, state?.PreviousCall, false, cancellation).ConfigureAwait(false);
+            return new NetworkCoins()
+            {
+                TimestampedCoins = changes.Confirmed.UTXOs.Concat(changes.Unconfirmed.UTXOs).Select(c => new NetworkCoins.TimestampedCoin() { Coin = c.AsCoin(), DateTime = c.Timestamp }).ToArray(),
+                State = new KnownState() { PreviousCall = changes },
                 Strategy = strategy,
+                Wallet = this
             };
         }
 
-        public Task BroadcastTransactionsAsync(BTCPayNetwork network, List<Transaction> transactions)
+        public Task BroadcastTransactionsAsync(List<Transaction> transactions)
         {
-            var client = _Client.GetExplorerClient(network);
-            var tasks = transactions.Select(t => client.BroadcastAsync(t)).ToArray();
+            var tasks = transactions.Select(t => _Client.BroadcastAsync(t)).ToArray();
             return Task.WhenAll(tasks);
         }
 
-        public async Task<Money> GetBalance(DerivationStrategy derivationStrategy)
+
+        public async Task<Money> GetBalance(DerivationStrategyBase derivationStrategy)
         {
-            var client = _Client.GetExplorerClient(derivationStrategy.Network);
-            var result = await client.SyncAsync(derivationStrategy.DerivationStrategyBase, null, true);
-            return result.Confirmed.UTXOs.Select(u => u.Value)
-                         .Concat(result.Unconfirmed.UTXOs.Select(u => u.Value))
-                         .Sum();
+            var result = await _Client.GetUTXOsAsync(derivationStrategy, null, true);
+
+            Dictionary<OutPoint, UTXO> received = new Dictionary<OutPoint, UTXO>();
+            foreach(var utxo in result.Confirmed.UTXOs.Concat(result.Unconfirmed.UTXOs))
+            {
+                received.TryAdd(utxo.Outpoint, utxo);
+            }
+            foreach (var utxo in result.Confirmed.SpentOutpoints.Concat(result.Unconfirmed.SpentOutpoints))
+            {
+                received.Remove(utxo);
+            }
+            return received.Values.Select(c => c.Value).Sum();
         }
     }
 }

BTCPayServer/Services/Wallets/BTCPayWalletProvider.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace BTCPayServer.Services.Wallets
+{
+    public class BTCPayWalletProvider
+    {
+        private ExplorerClientProvider _Client;
+        BTCPayNetworkProvider _NetworkProvider;
+        TransactionCacheProvider _TransactionCacheProvider;
+        public BTCPayWalletProvider(ExplorerClientProvider client,
+                                    TransactionCacheProvider transactionCacheProvider,
+                                    BTCPayNetworkProvider networkProvider)
+        {
+            if (client == null)
+                throw new ArgumentNullException(nameof(client));
+            _Client = client;
+            _TransactionCacheProvider = transactionCacheProvider;
+            _NetworkProvider = networkProvider;
+        }
+
+        public BTCPayWallet GetWallet(BTCPayNetwork network)
+        {
+            if (network == null)
+                throw new ArgumentNullException(nameof(network));
+            return GetWallet(network.CryptoCode);
+        }
+        public BTCPayWallet GetWallet(string cryptoCode)
+        {
+            if (cryptoCode == null)
+                throw new ArgumentNullException(nameof(cryptoCode));
+            var network = _NetworkProvider.GetNetwork(cryptoCode);
+            var client = _Client.GetExplorerClient(cryptoCode);
+            if (network == null || client == null)
+                return null;
+            return new BTCPayWallet(client, _TransactionCacheProvider.GetTransactionCache(network), network);
+        }
+    }
+}

BTCPayServer/Views/Home/Home.cshtml

@@ -57,10 +57,10 @@
         <h2>Video tutorials</h2>
         <div class="row">
             <div class="col-md-6 text-center">
-                <iframe width="560" height="315" src="https://www.youtube.com/embed/xh3Eac66qc4" frameborder="0" allowfullscreen></iframe>
+                <iframe width="400" height="225" src="https://www.youtube.com/embed/xh3Eac66qc4" frameborder="0" allowfullscreen></iframe>
             </div>
             <div class="col-md-6 text-center">
-                <iframe width="560" height="315" src="https://www.youtube.com/embed/Xo_vApXTZBU" frameborder="0" allowfullscreen></iframe>
+                <iframe width="400" height="225" src="https://www.youtube.com/embed/Xo_vApXTZBU" frameborder="0" allowfullscreen></iframe>
             </div>
         </div>
     </div>
@@ -122,10 +122,10 @@
         </div>
         <div class="row">
             <div class="col-lg-4 ml-auto text-center">
-                <a href="http://52.191.212.129:3000/">
+                <a href="http://slack.forkbitpay.ninja/">
                     <img src="~/img/slack.png" height="100" />
                 </a>
-                <p><a href="http://52.191.212.129:3000/">On Slack</a></p>
+                <p><a href="http://slack.forkbitpay.ninja/">On Slack</a></p>
             </div>
             <div class="col-lg-4 mr-auto text-center">
                 <a href="https://twitter.com/BtcpayServer">

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -613,7 +613,7 @@
                                 <div style="text-align:center">
                                     @foreach(var crypto in Model.AvailableCryptos)
                                     {
-                                        <a style="text-decoration:none;" href="@crypto.Link" onclick="srvModel.cryptoCode='@crypto.CryptoCode'; return false;"><img style="height:32px; margin-right:5px; margin-left:5px;" alt="@crypto.CryptoCode" src="@crypto.CryptoImage" /></a>
+                                        <a style="text-decoration:none;" href="@crypto.Link" onclick="srvModel.cryptoCode='@crypto.CryptoCode'; fetchStatus(); return false;"><img style="height:32px; margin-right:5px; margin-left:5px;" alt="@crypto.CryptoCode" src="@crypto.CryptoImage" /></a>
                                     }
                                 </div>
                             }

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -57,6 +57,10 @@
                         <th>Status</th>
                         <td>@Model.Status</td>
                     </tr>
+                    <tr>
+                        <th>Status Exception</th>
+                        <td>@Model.StatusException</td>
+                    </tr>
                     <tr>
                         <th>Refund email</th>
                         <td>@Model.RefundEmail</td>
@@ -73,6 +77,10 @@
                         <th>Notification Url</th>
                         <td>@Model.NotificationUrl</td>
                     </tr>
+                    <tr>
+                        <th>Redirect Url</th>
+                        <td>@Model.RedirectUrl</td>
+                    </tr>
                 </table>
             </div>
 
@@ -174,6 +182,7 @@
                             <th>Deposit address</th>
                             <th>Transaction Id</th>
                             <th>Confirmations</th>
+                            <th>Replaced</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -185,6 +194,7 @@
                             <td>@payment.DepositAddress</td>
                             <td><a href="@payment.TransactionLink" target="_blank">@payment.TransactionId</a></td>
                             <td>@payment.Confirmations</td>
+                            <td>@payment.Replaced</td>
                         </tr>
                 }
                     </tbody>
@@ -215,5 +225,28 @@
                 </table>
             </div>
         </div>
+
+        <div class="row">
+            <div class="col-md-12">
+                <h3>Events</h3>
+                <table class="table">
+                    <thead class="thead-inverse">
+                        <tr>
+                            <th>Date</th>
+                            <th>Message</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach(var evt in Model.Events)
+                        {
+                            <tr>
+                                <td>@evt.Timestamp</td>
+                                <td>@evt.Message</td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        </div>
     </div>
 </section>

BTCPayServer/Views/Shared/SyncModal.cshtml

@@ -0,0 +1,94 @@
+@inject BTCPayServer.HostedServices.NBXplorerDashboard dashboard
+<!-- Modal -->
+<div id="modalDialog" class="modal-dialog animated bounceInRight">
+
+    <!-- Modal content-->
+    <div class="modal-content">
+        <div class="modal-header">
+            <h4 class="modal-title">Your nodes are synching...</h4>
+            <button type="button" class="close" onclick="dismissSyncModal()">&times;</button>
+        </div>
+        <div class="modal-body">
+            <p>
+                Some of your nodes are still synching...<br />
+                BTCPay Server will not work correctly until it is over.
+            </p>
+            @foreach (var line in dashboard.GetAll())
+            {
+                <h4>@line.Network.CryptoCode</h4>
+                @if (line.Status == null)
+                {
+                    <ul>
+                        <li>The node is offline</li>
+                        @if (line.Error != null)
+                        {
+                            <li>Last error: @line.Error</li>
+                        }
+                    </ul>
+                }
+                else
+                {
+                    <ul>
+                        <li>NBXplorer headers height: @line.Status.ChainHeight</li>
+                        @if (line.Status.BitcoinStatus == null)
+                        {
+                            if (line.State == BTCPayServer.HostedServices.NBXplorerState.Synching)
+                            {
+                                <li>The node is starting...</li>
+                            }
+                            else
+                            {
+                                <li>The node is offline</li>
+                                @if (line.Error != null)
+                                {
+                                    <li>Last error: @line.Error</li>
+                                }
+                            }
+                        }
+                        else if (line.Status.BitcoinStatus.IsSynched)
+                        {
+                            <li>The node is synched (Height: @line.Status.BitcoinStatus.Headers)</li>
+                            @if (line.Status.BitcoinStatus.IsSynched &&
+                                line.Status.SyncHeight.HasValue &&
+                                line.Status.SyncHeight.Value < line.Status.BitcoinStatus.Headers)
+                            {
+                                <li>NBXplorer is synching... (Height: @line.Status.SyncHeight.Value)</li>
+                            }
+                        }
+                        else
+                        {
+                            <li>Node headers height: @line.Status.BitcoinStatus.Headers</li>
+                            <li>Validated blocks: @line.Status.BitcoinStatus.Blocks</li>
+                        }
+                    </ul>
+                    @if (!line.Status.IsFullySynched && line.Status.BitcoinStatus != null)
+                    {
+                        <div class="progress">
+                            <div class="progress-bar" role="progressbar" aria-valuenow="@((int)(line.Status.BitcoinStatus.VerificationProgress * 100))"
+                                 aria-valuemin="0" aria-valuemax="100" style="width:@((int)(line.Status.BitcoinStatus.VerificationProgress * 100))%">
+                                @((int)(line.Status.BitcoinStatus.VerificationProgress * 100))%
+                            </div>
+                        </div>
+                    }
+                }
+            }
+        </div>
+    </div>
+
+</div>
+
+<link href="~/vendor/animatecss/animate.css" rel="stylesheet" />
+<script type="text/javascript">
+    function dismissSyncModal() {
+        $("#modalDialog").addClass('animated bounceOutRight')
+    }
+</script>
+
+<style type="text/css">
+    #modalDialog {
+        position: fixed;
+        bottom: 20px;
+        right: 20px;
+        margin: 0px;
+    }
+</style>

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -38,7 +38,7 @@
 <body id="page-top">
 
     @{
-        if(ViewBag.AlwaysShrinkNavBar == null)
+        if (ViewBag.AlwaysShrinkNavBar == null)
         {
             ViewBag.AlwaysShrinkNavBar = true;
         }
@@ -48,30 +48,36 @@
     <!-- Navigation -->
     <nav class='navbar navbar-expand-lg navbar-light fixed-top @additionalStyle' id="mainNav">
         <div class="container">
-            <a class="navbar-brand js-scroll-trigger" href="~/"><img src="~/img/logo.png" height="45"></a>
+            <a class="navbar-brand js-scroll-trigger" href="~/">
+                <img src="~/img/logo.png" height="45">
+                @if(env.ChainType != NBXplorer.ChainType.Main)
+                {
+                <span class="badge badge-warning" style="font-size:10px;">@env.ChainType.ToString()</span>
+                }
+            </a>
             <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
             <div class="collapse navbar-collapse" id="navbarResponsive">
                 <ul class="navbar-nav ml-auto">
                     @if(SignInManager.IsSignedIn(User))
-                    {
-                        @if(User.IsInRole(Roles.ServerAdmin))
-                        {
-                            <li class="nav-item"><a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger">Server settings</a></li>
-                        }
-                        <li class="nav-item"><a asp-area="" asp-controller="Stores" asp-action="ListStores" class="nav-link js-scroll-trigger">Stores</a></li>
-                        <li class="nav-item"><a asp-area="" asp-controller="Invoice" asp-action="ListInvoices" class="nav-link js-scroll-trigger">Invoices</a></li>
-                        <li class="nav-item">
-                            <a asp-area="" asp-controller="Manage" asp-action="Index" title="Manage" class="nav-link js-scroll-trigger">My settings</a>
-                        </li>
-                        <li class="nav-item">
-                            <a asp-area="" asp-controller="Account" asp- asp-action="Logout" title="Manage" class="nav-link js-scroll-trigger">Log out</a>
-                        </li>}
-                    else
-                    {
-                        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Register" class="nav-link js-scroll-trigger">Register</a></li>
-                        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Login" class="nav-link js-scroll-trigger">Log in</a></li>}
+            {
+                @if(User.IsInRole(Roles.ServerAdmin))
+        {
+            <li class="nav-item"><a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger">Server settings</a></li>
+}
+                <li class="nav-item"><a asp-area="" asp-controller="Stores" asp-action="ListStores" class="nav-link js-scroll-trigger">Stores</a></li>
+                <li class="nav-item"><a asp-area="" asp-controller="Invoice" asp-action="ListInvoices" class="nav-link js-scroll-trigger">Invoices</a></li>
+                <li class="nav-item">
+                    <a asp-area="" asp-controller="Manage" asp-action="Index" title="Manage" class="nav-link js-scroll-trigger">My settings</a>
+                </li>
+                <li class="nav-item">
+                    <a asp-area="" asp-controller="Account" asp- asp-action="Logout" title="Manage" class="nav-link js-scroll-trigger">Log out</a>
+                </li>}
+    else
+    {
+        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Register" class="nav-link js-scroll-trigger">Register</a></li>
+        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Login" class="nav-link js-scroll-trigger">Log in</a></li>}
 
                 </ul>
             </div>
@@ -80,77 +86,6 @@
 
     @RenderBody()
 
-
-    @if(!dashboard.IsFullySynched())
-    {
-        <!-- Modal -->
-        <div id="synching-modal" class="modal fade" role="dialog">
-            <div class="modal-dialog">
-
-                <!-- Modal content-->
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h4 class="modal-title">Your nodes are synching...</h4>
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    </div>
-                    <div class="modal-body">
-                        <p>
-                            Some of your nodes are still synching...<br />
-                            BTCPay Server will not work correctly until it is over.
-                        </p>
-                        @foreach(var line in dashboard.GetAll())
-                        {
-                            <h4>@line.Network.CryptoCode</h4>
-                            @if(line.Status == null)
-                            {
-                                <p>NBXplorer is offline</p>
-                            }
-                            else
-                            {
-                                <ul>
-                                    <li>NBXplorer headers height: @line.Status.ChainHeight</li>
-                                    @if(line.Status.BitcoinStatus == null)
-                                    {
-                                        if(line.State == BTCPayServer.HostedServices.NBXplorerState.Synching)
-                                        {
-                                            <li>The node is starting...</li>
-                                        }
-                                        else
-                                        {
-                                            <li>The node is offline</li>
-                                        }
-                                    }
-                                    else if(line.Status.BitcoinStatus.IsSynched)
-                                    {
-                                        <li>The node is synched</li>
-                                    }
-                                    else
-                                    {
-                                        <li>Node headers height: @line.Status.BitcoinStatus.Headers</li>
-                                        <li>Validated blocks: @line.Status.BitcoinStatus.Blocks</li>
-                                    }
-                                </ul>
-                                @if(!line.Status.IsFullySynched && line.Status.BitcoinStatus != null)
-                                {
-                                    <div class="progress">
-                                        <div class="progress-bar" role="progressbar" aria-valuenow="@((int)(line.Status.BitcoinStatus.VerificationProgress * 100))"
-                                             aria-valuemin="0" aria-valuemax="100" style="width:@((int)(line.Status.BitcoinStatus.VerificationProgress * 100))%">
-                                            @((int)(line.Status.BitcoinStatus.VerificationProgress * 100))%
-                                        </div>
-                                    </div>
-                                }
-                            }
-                        }
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    }
-
     <footer class="bg-dark">
         <div class="container text-right"><span style="font-size:8px;">@env.ToString()</span></div>
     </footer>
@@ -168,13 +103,10 @@
     <!-- Custom scripts for this template -->
     <script src="~/js/creative.js"></script>
 
-    @if(!dashboard.IsFullySynched())
+
+    @if (!dashboard.IsFullySynched())
     {
-        <script type="text/javascript">
-            $(function () {
-                $("#synching-modal").modal();
-            });
-        </script>
+        @Html.Partial("SyncModal")
     }
 
     @RenderSection("Scripts", required: false)

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -25,11 +25,6 @@
                 <input asp-for="StoreName" class="form-control" />
                 <span asp-validation-for="StoreName" class="text-danger"></span>
             </div>
-            <div class="form-group">
-                <label asp-for="StoreName"></label>
-                <input asp-for="StoreName" class="form-control" />
-                <span asp-validation-for="StoreName" class="text-danger"></span>
-            </div>
             <div class="form-group">
                 <label asp-for="StoreWebsite"></label>
                 <input asp-for="StoreWebsite" class="form-control" />
@@ -43,6 +38,16 @@
                 <label asp-for="NetworkFee"></label>
                 <input asp-for="NetworkFee" type="checkbox" class="form-check" />
             </div>
+            <div class="form-group">
+                <label asp-for="RateMultiplier"></label>
+                <input asp-for="RateMultiplier" class="form-control" />
+                <span asp-validation-for="RateMultiplier" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="InvoiceExpiration"></label>
+                <input asp-for="InvoiceExpiration" class="form-control" />
+                <span asp-validation-for="InvoiceExpiration" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="MonitoringExpiration"></label>
                 <input asp-for="MonitoringExpiration" class="form-control" />

Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore-build AS builder
+FROM microsoft/aspnetcore-build:2.0.5-2.1.4-stretch AS builder
 WORKDIR /source
 COPY BTCPayServer/BTCPayServer.csproj BTCPayServer.csproj
 # Cache some dependencies
@@ -6,7 +6,7 @@ RUN dotnet restore
 COPY BTCPayServer/. .
 RUN dotnet publish --output /app/ --configuration Release
 
-FROM microsoft/aspnetcore:2.0.3
+FROM microsoft/aspnetcore:2.0.5-stretch
 WORKDIR /app
 
 RUN mkdir /datadir

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 btcpayserver
+Copyright (c) 2017-2018 btcpayserver
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,17 +8,17 @@
 
 ## Introduction 
 
-BTCPay Server is an Open Source payment processor conforms to the invoice API of Bitpay.
+BTCPay Server is an Open Source payment processor, written in C#, that conforms to the invoice API of [Bitpay](https://bitpay.com/).
 This allows easy migration of your code base to your own, self-hosted payment processor.
 
 This solution is for you if:
 
-* You currently use Bitpay as a payment processor but are worry about their commitment to Bitcoin in the future
+* You are currently using Bitpay as a payment processor but are worried about their commitment to Bitcoin in the future
 * You want to be in control of your own funds
 * Bitpay compliance team decided to reject your application
-* You want lower fee (we support Segwit)
-* You want to become a payment processor yourself and offer BTCPay hosted solution to merchants
-* You want to a way support other currency than those offered by Bitpay
+* You want lower fees (we support Segwit)
+* You want to become a payment processor yourself and offer a BTCPay hosted solution to merchants
+* You want a way to support currencies other than those offered by Bitpay
 
 ## Documentation
 

global.json

@@ -1 +0,0 @@
-{ "sdk": { "version": "2.0.0" } }