bump

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -107,12 +107,6 @@ namespace BTCPayServer.Tests
                     .Build();
             _Host.Start();
             InvoiceRepository = (InvoiceRepository)_Host.Services.GetService(typeof(InvoiceRepository));
-
-            var waiter = ((NBXplorerWaiterAccessor)_Host.Services.GetService(typeof(NBXplorerWaiterAccessor))).Instance;
-            while(waiter.State != NBXplorerState.Ready)
-            {
-                Thread.Sleep(10);
-            }
         }
         
         public string HostName

BTCPayServer.Tests/ServerTester.cs

@@ -47,7 +47,6 @@ namespace BTCPayServer.Tests
                 Directory.CreateDirectory(_Directory);
 
 
-            FakeCallback = bool.Parse(GetEnvironment("TESTS_FAKECALLBACK", "true"));
             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/")));
             PayTester = new BTCPayServerTester(Path.Combine(_Directory, "pay"))
@@ -103,12 +102,6 @@ namespace BTCPayServer.Tests
         {
             return new TestAccount(this);
         }
-
-        public bool FakeCallback
-        {
-            get;
-            set;
-        }
         public RPCClient ExplorerNode
         {
             get; set;
@@ -213,43 +206,6 @@ namespace BTCPayServer.Tests
             }
         }
 
-        /// <summary>
-        /// Simulating callback from NBXplorer. NBXplorer can't reach the host during tests as it is not running on localhost.
-        /// </summary>
-        /// <param name="address"></param>
-        public void SimulateCallback(BitcoinAddress address = null)
-        {
-            if (!FakeCallback) //The callback of NBXplorer should work
-                return;
-
-            var req = new MockHttpRequest(PayTester.ServerUri);
-            var controller = PayTester.GetController<CallbackController>();
-            if (address != null)
-            {
-
-                var match = new TransactionMatch();
-                match.Outputs.Add(new KeyPathInformation() { ScriptPubKey = address.ScriptPubKey });
-                var content = new StringContent(new NBXplorer.Serializer(Network).ToString(match), new UTF8Encoding(false), "application/json");
-                var uri = controller.GetCallbackUriAsync().GetAwaiter().GetResult();
-
-                HttpRequestMessage message = new HttpRequestMessage();
-                message.Method = HttpMethod.Post;
-                message.RequestUri = uri;
-                message.Content = content;
-
-                _Http.SendAsync(message).GetAwaiter().GetResult();
-            }
-            else
-            {
-
-                var uri = controller.GetCallbackBlockUriAsync().GetAwaiter().GetResult();
-                HttpRequestMessage message = new HttpRequestMessage();
-                message.Method = HttpMethod.Post;
-                message.RequestUri = uri;
-                _Http.SendAsync(message).GetAwaiter().GetResult();
-            }
-        }
-
 
         public BTCPayServerTester PayTester
         {

BTCPayServer.Tests/TestAccount.cs

@@ -59,8 +59,14 @@ namespace BTCPayServer.Tests
             DerivationScheme = new DerivationStrategyFactory(parent.Network).Parse(ExtKey.Neuter().ToString() + "-[legacy]");
             await store.UpdateStore(StoreId, new StoreViewModel()
             {
-                DerivationScheme = DerivationScheme.ToString(),
                 SpeedPolicy = SpeedPolicy.MediumSpeed
+            });
+
+            await store.AddDerivationScheme(StoreId, new DerivationSchemeViewModel()
+            {
+                CryptoCurrency = "BTC",
+                DerivationSchemeFormat = "BTCPay",
+                DerivationScheme = DerivationScheme.ToString(),
             }, "Save");
             return store;
         }

BTCPayServer.Tests/UnitTest1.cs

@@ -23,6 +23,7 @@ using Microsoft.EntityFrameworkCore;
 using BTCPayServer.Services.Rates;
 using Microsoft.Extensions.Caching.Memory;
 using BTCPayServer.Eclair;
+using System.Collections.Generic;
 
 namespace BTCPayServer.Tests
 {
@@ -75,6 +76,88 @@ namespace BTCPayServer.Tests
             accounting = cryptoData.Calculate();
             Assert.Equal(Money.Zero, accounting.Due);
             Assert.Equal(Money.Coins(1.3m), accounting.TotalDue);
+
+            entity = new InvoiceEntity();
+            entity.ProductInformation = new ProductInformation() { Price = 5000 };
+            entity.SetCryptoData(new System.Collections.Generic.Dictionary<string, CryptoData>(new KeyValuePair<string, CryptoData>[] {
+                new KeyValuePair<string,CryptoData>("BTC", new CryptoData()
+                                                           {
+                                                                Rate = 1000,
+                                                                TxFee = Money.Coins(0.1m)
+                                                           }),
+                new KeyValuePair<string,CryptoData>("LTC", new CryptoData()
+                                                           {
+                                                                Rate = 500,
+                                                                TxFee = Money.Coins(0.01m)
+                                                           })
+            }));
+            entity.Payments = new List<PaymentEntity>();
+            cryptoData = entity.GetCryptoData("BTC");
+            accounting = cryptoData.Calculate();
+            Assert.Equal(Money.Coins(5.1m), accounting.Due);
+
+            cryptoData = entity.GetCryptoData("LTC");
+            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");
+            accounting = cryptoData.Calculate();
+            Assert.Equal(Money.Coins(4.2m), accounting.Due);
+            Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
+            Assert.Equal(Money.Coins(1.0m), accounting.Paid);
+            Assert.Equal(Money.Coins(5.2m), accounting.TotalDue);
+            Assert.Equal(2, accounting.TxCount);
+
+            cryptoData = entity.GetCryptoData("LTC");
+            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);
+            Assert.Equal(Money.Coins(2.0m), accounting.Paid);
+            Assert.Equal(Money.Coins(10.01m + 0.1m * 2), accounting.TotalDue);
+
+            entity.Payments.Add(new PaymentEntity() { CryptoCode = "LTC", Output = new TxOut(Money.Coins(1.0m), new Key()), Accounted = true });
+
+
+            cryptoData = entity.GetCryptoData("BTC");
+            accounting = cryptoData.Calculate();
+            Assert.Equal(Money.Coins(4.2m - 0.5m + 0.01m / 2), accounting.Due);
+            Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
+            Assert.Equal(Money.Coins(1.5m), accounting.Paid);
+            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");
+            accounting = cryptoData.Calculate();
+            Assert.Equal(Money.Coins(8.21m - 1.0m + 0.01m), accounting.Due);
+            Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
+            Assert.Equal(Money.Coins(3.0m), accounting.Paid);
+            Assert.Equal(Money.Coins(10.01m + 0.1m * 2 + 0.01m), accounting.TotalDue);
+            Assert.Equal(2, accounting.TxCount);
+
+            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");
+            accounting = cryptoData.Calculate();
+            Assert.Equal(Money.Zero, accounting.Due);
+            Assert.Equal(Money.Coins(1.0m) + remaining, accounting.CryptoPaid);
+            Assert.Equal(Money.Coins(1.5m) + remaining, accounting.Paid);
+            Assert.Equal(Money.Coins(5.2m + 0.01m / 2), accounting.TotalDue);
+            Assert.Equal(accounting.Paid, accounting.TotalDue);
+            Assert.Equal(2, accounting.TxCount);
+
+            cryptoData = entity.GetCryptoData("LTC");
+            accounting = cryptoData.Calculate();
+            Assert.Equal(Money.Zero, accounting.Due);
+            Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
+            Assert.Equal(Money.Coins(3.0m) + remaining * 2, accounting.Paid);
+            // Paying 2 BTC fee, LTC fee removed because fully paid
+            Assert.Equal(Money.Coins(10.01m + 0.1m * 2 + 0.1m * 2 /* + 0.01m no need to pay this fee anymore */), accounting.TotalDue);
+            Assert.Equal(1, accounting.TxCount);
+            Assert.Equal(accounting.Paid, accounting.TotalDue);
+
 #pragma warning restore CS0618
         }
 
@@ -119,7 +202,6 @@ namespace BTCPayServer.Tests
 
                 Eventually(() =>
                 {
-                    tester.SimulateCallback(url.Address);
                     var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
                     Assert.Equal("paid", localInvoice.Status);
                     Assert.True(localInvoice.Refundable);
@@ -193,7 +275,6 @@ namespace BTCPayServer.Tests
                     BitcoinUrlBuilder url = new BitcoinUrlBuilder(invoice.PaymentUrls.BIP21);
                     tester.ExplorerNode.SendToAddress(url.Address, url.Amount);
                     Thread.Sleep(5000);
-                    tester.SimulateCallback(url.Address);
                     callbackServer.ProcessNextRequest((ctx) =>
                     {
                         var ipn = new StreamReader(ctx.Request.Body).ReadToEnd();
@@ -253,7 +334,6 @@ namespace BTCPayServer.Tests
 
                 Eventually(() =>
                 {
-                    tester.SimulateCallback(invoiceAddress);
                     invoice = user.BitPay.GetInvoice(invoice.Id);
                     Assert.Equal(payment1, invoice.BtcPaid);
                     invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, tester.Network);
@@ -274,7 +354,6 @@ namespace BTCPayServer.Tests
                 var test = tester.ExplorerClient.Sync(user.DerivationScheme, null);
                 Eventually(() =>
                 {
-                    tester.SimulateCallback(invoiceAddress);
                     invoice = user.BitPay.GetInvoice(invoice.Id);
                     Assert.Equal(payment2, invoice.BtcPaid);
                 });
@@ -293,7 +372,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        public void InvoiceFlowThroughDifferentStatesCorrectly()
+        public void TestAccessBitpayAPI()
         {
             using (var tester = ServerTester.Create())
             {
@@ -302,6 +381,17 @@ namespace BTCPayServer.Tests
                 Assert.False(user.BitPay.TestAccess(Facade.Merchant));
                 user.GrantAccess();
                 Assert.True(user.BitPay.TestAccess(Facade.Merchant));
+            }
+        }
+
+        [Fact]
+        public void InvoiceFlowThroughDifferentStatesCorrectly()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
                 var invoice = user.BitPay.CreateInvoice(new Invoice()
                 {
                     Price = 5000.0,
@@ -366,7 +456,6 @@ namespace BTCPayServer.Tests
 
                 Eventually(() =>
                 {
-                    tester.SimulateCallback(invoiceAddress);
                     var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
                     Assert.Equal("new", localInvoice.Status);
                     Assert.Equal(firstPayment, localInvoice.BtcPaid);
@@ -377,9 +466,9 @@ namespace BTCPayServer.Tests
                     Assert.True(IsMapped(localInvoice, ctx));
 
                     invoiceEntity = repo.GetInvoice(null, invoice.Id, true).GetAwaiter().GetResult();
-                    var historical1 = invoiceEntity.HistoricalAddresses.FirstOrDefault(h => h.Address == invoice.BitcoinAddress.ToString());
+                    var historical1 = invoiceEntity.HistoricalAddresses.FirstOrDefault(h => h.GetAddress() == invoice.BitcoinAddress.ToString());
                     Assert.NotNull(historical1.UnAssigned);
-                    var historical2 = invoiceEntity.HistoricalAddresses.FirstOrDefault(h => h.Address == localInvoice.BitcoinAddress.ToString());
+                    var historical2 = invoiceEntity.HistoricalAddresses.FirstOrDefault(h => h.GetAddress() == localInvoice.BitcoinAddress.ToString());
                     Assert.Null(historical2.UnAssigned);
                     invoiceAddress = BitcoinAddress.Create(localInvoice.BitcoinAddress, cashCow.Network);
                     secondPayment = localInvoice.BtcDue;
@@ -389,7 +478,6 @@ namespace BTCPayServer.Tests
 
                 Eventually(() =>
                 {
-                    tester.SimulateCallback(invoiceAddress);
                     var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
                     Assert.Equal("paid", localInvoice.Status);
                     Assert.Equal(firstPayment + secondPayment, localInvoice.BtcPaid);
@@ -403,7 +491,6 @@ namespace BTCPayServer.Tests
 
                 Eventually(() =>
                 {
-                    tester.SimulateCallback();
                     var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
                     Assert.Equal("confirmed", localInvoice.Status);
                 });
@@ -412,7 +499,6 @@ namespace BTCPayServer.Tests
 
                 Eventually(() =>
                 {
-                    tester.SimulateCallback();
                     var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
                     Assert.Equal("complete", localInvoice.Status);
                     Assert.NotEqual(0.0, localInvoice.Rate);
@@ -435,7 +521,6 @@ namespace BTCPayServer.Tests
 
                 Eventually(() =>
                 {
-                    tester.SimulateCallback(invoiceAddress);
                     var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
                     Assert.Equal("paid", localInvoice.Status);
                     Assert.Equal(Money.Zero, localInvoice.BtcDue);
@@ -446,7 +531,6 @@ namespace BTCPayServer.Tests
 
                 Eventually(() =>
                 {
-                    tester.SimulateCallback();
                     var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
                     Assert.Equal("confirmed", localInvoice.Status);
                     Assert.Equal(Money.Zero, localInvoice.BtcDue);
@@ -458,11 +542,11 @@ namespace BTCPayServer.Tests
         [Fact]
         public void CheckRatesProvider()
         {
-            var coinAverage = new CoinAverageRateProvider();
+            var coinAverage = new CoinAverageRateProvider("BTC");
             var jpy = coinAverage.GetRateAsync("JPY").GetAwaiter().GetResult();
             var jpy2 = new BitpayRateProvider(new Bitpay(new Key(), new Uri("https://bitpay.com/"))).GetRateAsync("JPY").GetAwaiter().GetResult();
 
-            var cached = new CachedRateProvider(coinAverage, new MemoryCache(new MemoryCacheOptions() { ExpirationScanFrequency = TimeSpan.FromSeconds(1.0) }));
+            var cached = new CachedRateProvider("BTC", coinAverage, new MemoryCache(new MemoryCacheOptions() { ExpirationScanFrequency = TimeSpan.FromSeconds(1.0) }));
             cached.CacheSpan = TimeSpan.FromSeconds(10);
             var a = cached.GetRateAsync("JPY").GetAwaiter().GetResult();
             var b = cached.GetRateAsync("JPY").GetAwaiter().GetResult();
@@ -472,8 +556,8 @@ namespace BTCPayServer.Tests
 
         private static bool IsMapped(Invoice invoice, ApplicationDbContext ctx)
         {
-            var h = BitcoinAddress.Create(invoice.BitcoinAddress).ScriptPubKey.Hash.ToString();
-            return ctx.AddressInvoices.FirstOrDefault(i => i.InvoiceDataId == invoice.Id && i.Address == h) != null;
+            var h = BitcoinAddress.Create(invoice.BitcoinAddress).ScriptPubKey.Hash;
+            return ctx.AddressInvoices.FirstOrDefault(i => i.InvoiceDataId == invoice.Id && i.GetHash() == h) != null;
         }
 
         private void Eventually(Action act)

BTCPayServer.Tests/docker-compose.yml

@@ -11,20 +11,17 @@ services:
       dockerfile: BTCPayServer.Tests/Dockerfile
     environment:
       TESTS_RPCCONNECTION: server=http://bitcoind:43782;ceiwHEbqWI83:DwubwWsoo3
-      TESTS_NBXPLORERURL: http://nbxplorer:32838/
+      TESTS_BTCNBXPLORERURL: http://bitcoin-nbxplorer:32838/
+      TESTS_LTCNBXPLORERURL: http://litecoin-nbxplorer:32839/
       TESTS_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver
-      TESTS_FAKECALLBACK: 'false'
       TESTS_PORT: 80
       TESTS_HOSTNAME: tests
-      # TEST_ECLAIR1: http://eclair1:8080/
-      # TEST_ECLAIR2: http://eclair2:8080/
     expose:
       - "80"
     links:
-      - bitcoind
-      - nbxplorer
-      # - eclair1
-      # - eclair2
+      - bitcoin-nbxplorer
+      - litecoin-nbxplorer
+      - postgres
     extra_hosts: 
       - "tests:127.0.0.1"
 
@@ -36,13 +33,12 @@ services:
         regtest=1
         connect=bitcoind:39388
     links:
-      - bitcoind
-      - nbxplorer
-      # - eclair1
-      # - eclair2
+      - bitcoin-nbxplorer
+      - litecoin-nbxplorer
+      - postgres
 
-  nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.0.34
+  bitcoin-nbxplorer:
+    image: nicolasdorier/nbxplorer:1.0.0.40
     ports:
       - "32838:32838"
     expose: 
@@ -58,49 +54,24 @@ services:
       NBXPLORER_NOAUTH: 1
     links:
       - bitcoind
-      - postgres
 
-  eclair1:
-    image: acinq/eclair:latest
-    environment:
-      JAVA_OPTS: >
-        -Xmx512m 
-        -Declair.printToConsole 
-        -Declair.bitcoind.host=bitcoind 
-        -Declair.bitcoind.rpcport=43782 
-        -Declair.bitcoind.rpcuser=ceiwHEbqWI83 
-        -Declair.bitcoind.rpcpassword=DwubwWsoo3 
-        -Declair.bitcoind.zmq=tcp://bitcoind:29000
-        -Declair.chain=regtest
-        -Declair.api.binding-ip=0.0.0.0
-    links:
-      - bitcoind
+  litecoin-nbxplorer:
+    image: nicolasdorier/nbxplorer:1.0.0.40
     ports:
-      - "30992:8080" # api port
-    expose:
-      - "9735" # server port
-      - "8080" # api port
-
-  eclair2:
-    image: acinq/eclair:latest
+      - "32839:32839"
+    expose: 
+      - "32839"
     environment:
-      JAVA_OPTS: >
-        -Xmx512m 
-        -Declair.printToConsole 
-        -Declair.bitcoind.host=bitcoind 
-        -Declair.bitcoind.rpcport=43782 
-        -Declair.bitcoind.rpcuser=ceiwHEbqWI83 
-        -Declair.bitcoind.rpcpassword=DwubwWsoo3 
-        -Declair.bitcoind.zmq=tcp://bitcoind:29000
-        -Declair.chain=regtest
-        -Declair.api.binding-ip=0.0.0.0
+      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:
-      - bitcoind
-    ports:
-      - "30993:8080" # api port
-    expose:
-      - "9735" # server port
-      - "8080" # api port
+        - litecoind
 
   bitcoind:
     container_name: btcpayserver_dev_bitcoind
@@ -117,8 +88,30 @@ services:
         zmqpubrawblock=tcp://0.0.0.0:29000
         zmqpubrawtx=tcp://0.0.0.0:29000
         txindex=1
-    ports:
-      - "43782:43782" # RPC
+    ports: 
+      - "43782:43782"
+    expose:
+      - "43782" # RPC
+      - "39388" # P2P
+      - "29000" # zmq
+
+  litecoind:
+    container_name: btcpayserver_dev_litecoind
+    image: nicolasdorier/docker-litecoin:0.14.2
+    environment:
+      BITCOIN_EXTRA_ARGS: |
+        rpcuser=ceiwHEbqWI83
+        rpcpassword=DwubwWsoo3
+        regtest=1
+        server=1
+        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

BTCPayServer.Tests/docker-litecoin-cli.ps1

@@ -0,0 +1 @@
+docker exec -ti btcpayserver_dev_litecoind litecoin-cli -regtest -conf="/data/litecoin.conf" -datadir="/data" $args

BTCPayServer/BTCPayNetwork.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 using NBitcoin;
 
 namespace BTCPayServer
@@ -12,5 +13,17 @@ namespace BTCPayServer
         public string CryptoCode { get; internal set; }
         public string BlockExplorerLink { get; internal set; }
         public string UriScheme { get; internal set; }
+        public IRateProvider DefaultRateProvider { get; set; }
+
+        [Obsolete("Should not be needed")]
+        public bool IsBTC
+        {
+            get
+            {
+                return CryptoCode == "BTC";
+            }
+        }
+
+        public string CryptoImagePath { get; set; }
     }
 }

BTCPayServer/BTCPayNetworkProvider.cs

@@ -2,23 +2,46 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using Microsoft.Extensions.Caching.Memory;
 using NBitcoin;
+using NBitpayClient;
 
 namespace BTCPayServer
 {
     public class BTCPayNetworkProvider
     {
+        static BTCPayNetworkProvider()
+        {
+            NBXplorer.Altcoins.Litecoin.Networks.EnsureRegistered();
+        }
         Dictionary<string, BTCPayNetwork> _Networks = new Dictionary<string, BTCPayNetwork>();
         public BTCPayNetworkProvider(Network network)
         {
-            if(network == Network.Main)
+            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)
             {
                 Add(new BTCPayNetwork()
                 {
                     CryptoCode = "BTC",
                     BlockExplorerLink = "https://www.smartbit.com.au/tx/{0}",
                     NBitcoinNetwork = Network.Main,
-                    UriScheme = "bitcoin"
+                    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"
                 });
             }
 
@@ -29,7 +52,18 @@ namespace BTCPayServer
                     CryptoCode = "BTC",
                     BlockExplorerLink = "https://testnet.smartbit.com.au/tx/{0}",
                     NBitcoinNetwork = Network.TestNet,
-                    UriScheme = "bitcoin"
+                    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"
                 });
             }
 
@@ -40,8 +74,28 @@ namespace BTCPayServer
                     CryptoCode = "BTC",
                     BlockExplorerLink = "https://testnet.smartbit.com.au/tx/{0}",
                     NBitcoinNetwork = Network.RegTest,
-                    UriScheme = "bitcoin"
+                    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"
+                });
+            }
+        }
+
+        [Obsolete("To use only for legacy stuff")]
+        public BTCPayNetwork BTC
+        {
+            get
+            {
+                return GetNetwork("BTC");
             }
         }
 
@@ -50,6 +104,11 @@ namespace BTCPayServer
             _Networks.Add(network.CryptoCode, network);
         }
 
+        public IEnumerable<BTCPayNetwork> GetAll()
+        {
+            return _Networks.Values.ToArray();
+        }
+
         public BTCPayNetwork GetNetwork(string cryptoCode)
         {
             _Networks.TryGetValue(cryptoCode.ToUpperInvariant(), out BTCPayNetwork network);

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.0.52</Version>
+		<Version>1.0.0.60</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
@@ -21,10 +21,10 @@
     <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.50" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.13" />	  
+    <PackageReference Include="NBitcoin" Version="4.0.0.51" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.14" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.0.22" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.0.26" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.13" />

BTCPayServer/CompositeDisposable.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer
-{
-    public class CompositeDisposable : IDisposable
-    {
-        List<IDisposable> _Disposables = new List<IDisposable>();
-        public void Add(IDisposable disposable) { _Disposables.Add(disposable); }
-        public void Dispose()
-        {
-            foreach (var d in _Disposables)
-                d.Dispose();
-            _Disposables.Clear();
-        }
-    }
-}

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -9,6 +9,7 @@ using System.Net;
 using System.Text;
 using StandardConfiguration;
 using Microsoft.Extensions.Configuration;
+using NBXplorer;
 
 namespace BTCPayServer.Configuration
 {
@@ -18,15 +19,6 @@ namespace BTCPayServer.Configuration
         {
             get; set;
         }
-        public Uri Explorer
-        {
-            get; set;
-        }
-
-        public string CookieFile
-        {
-            get; set;
-        }
         public string ConfigurationFile
         {
             get;
@@ -53,12 +45,42 @@ namespace BTCPayServer.Configuration
             DataDir = conf.GetOrDefault<string>("datadir", networkInfo.DefaultDataDirectory);
             Logs.Configuration.LogInformation("Network: " + Network);
 
-            Explorer = conf.GetOrDefault<Uri>("explorer.url", networkInfo.DefaultExplorerUrl);
-            CookieFile = conf.GetOrDefault<string>("explorer.cookiefile", networkInfo.DefaultExplorerCookieFile);
+
+            
+            foreach (var net in new BTCPayNetworkProvider(Network).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)
+                {
+                    ExplorerFactories.Add(net.CryptoCode, (n) => CreateExplorerClient(n, explorer, cookieFile));
+                }
+            }
+
+            // 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));
+            }
+            //////
+
             PostgresConnectionString = conf.GetOrDefault<string>("postgres", null);
             ExternalUrl = conf.GetOrDefault<Uri>("externalurl", null);
-            InternalUrl = conf.GetOrDefault<Uri>("internalurl", 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;
@@ -69,6 +91,5 @@ namespace BTCPayServer.Configuration
             get;
             set;
         }
-        public Uri InternalUrl { get; private set; }
     }
 }

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -27,10 +27,12 @@ namespace BTCPayServer.Configuration
             app.Option("--testnet | -testnet", $"Use testnet", CommandOptionType.BoolValue);
             app.Option("--regtest | -regtest", $"Use regtest", CommandOptionType.BoolValue);
             app.Option("--postgres", $"Connection string to postgres database (default: sqlite is used)", CommandOptionType.SingleValue);
-            app.Option("--explorerurl", $"Url of the NBxplorer (default: : Default setting of NBXplorer for the network)", CommandOptionType.SingleValue);
-            app.Option("--explorercookiefile", $"Path to the cookie file (default: Default setting of NBXplorer for the network)", CommandOptionType.SingleValue);
+            foreach (var network in new BTCPayNetworkProvider(Network.Main).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);
+            }
             app.Option("--externalurl", $"The expected external url of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
-            app.Option("--internalurl", $"The expected internal url of this service, this set NBXplorer callback addresses (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
             return app;
         }
 
@@ -84,8 +86,12 @@ namespace BTCPayServer.Configuration
             builder.AppendLine("#postgres=User ID=root;Password=myPassword;Host=localhost;Port=5432;Database=myDataBase;");
             builder.AppendLine();
             builder.AppendLine("### NBXplorer settings ###");
-            builder.AppendLine("#explorer.url=" + network.DefaultExplorerUrl.AbsoluteUri);
-            builder.AppendLine("#explorer.cookiefile=" + network.DefaultExplorerCookieFile);
+            foreach (var n in new BTCPayNetworkProvider(network.Network).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()}");
+            }
             return builder.ToString();
         }
 

BTCPayServer/Configuration/NetworkInformation.cs

@@ -13,25 +13,20 @@ namespace BTCPayServer.Configuration
         static NetworkInformation()
         {
             _Networks = new Dictionary<string, NetworkInformation>();
-            foreach (var network in Network.GetNetworks())
+            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.DefaultExplorerCookieFile = Path.Combine(StandardConfiguration.DefaultDataDirectory.GetDirectory("NBXplorer", network.Name, false), ".cookie");
                 info.Network = network;
-                info.DefaultExplorerUrl = new Uri("http://127.0.0.1:24446", UriKind.Absolute);
                 info.DefaultPort = 23002;
                 _Networks.Add(network.Name, info);
                 if (network == Network.Main)
                 {
-                    info.DefaultExplorerUrl = new Uri("http://127.0.0.1:24444", UriKind.Absolute);
-                    Main = info;
                     info.DefaultPort = 23000;
                 }
                 if (network == Network.TestNet)
                 {
-                    info.DefaultExplorerUrl = new Uri("http://127.0.0.1:24445", UriKind.Absolute);
                     info.DefaultPort = 23001;
                 }
             }
@@ -54,12 +49,7 @@ namespace BTCPayServer.Configuration
             }
             return null;
         }
-
-        public static NetworkInformation Main
-        {
-            get;
-            set;
-        }
+        
         public Network Network
         {
             get; set;
@@ -74,21 +64,11 @@ namespace BTCPayServer.Configuration
             get;
             set;
         }
-        public Uri DefaultExplorerUrl
-        {
-            get;
-            internal set;
-        }
         public int DefaultPort
         {
             get;
             private set;
         }
-        public string DefaultExplorerCookieFile
-        {
-            get;
-            internal set;
-        }
 
         public override string ToString()
         {

BTCPayServer/Controllers/AccountController.cs

@@ -273,7 +273,6 @@ namespace BTCPayServer.Controllers
                     var callbackUrl = Url.EmailConfirmationLink(user.Id, code, Request.Scheme);
                     RegisteredUserId = user.Id;
                     await _emailSender.SendEmailConfirmationAsync(model.Email, callbackUrl);
-                    _logger.LogInformation("User created a new account with password.");
                     if (!policies.RequiresConfirmedEmail)
                     {
                         await _signInManager.SignInAsync(user, isPersistent: false);

BTCPayServer/Controllers/CallbackController.cs

@@ -1,143 +0,0 @@
-using BTCPayServer.Logging;
-using BTCPayServer.Services.Invoices;
-using BTCPayServer.Services;
-using BTCPayServer.Services.Wallets;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using NBitcoin;
-using NBXplorer;
-using Microsoft.Extensions.Logging;
-using NBXplorer.DerivationStrategy;
-using NBXplorer.Models;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using BTCPayServer.Configuration;
-using BTCPayServer.Events;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Hosting.Server.Features;
-using Microsoft.AspNetCore.Hosting.Server;
-
-namespace BTCPayServer.Controllers
-{
-    public class CallbackController : Controller
-    {
-        public class CallbackSettings
-        {
-            public string Token
-            {
-                get; set;
-            }
-        }
-        SettingsRepository _Settings;
-        Network _Network;
-        ExplorerClient _Explorer;
-        BTCPayServerOptions _Options;
-        EventAggregator _EventAggregator;
-        IServer _Server;
-        public CallbackController(SettingsRepository repo,
-                                  ExplorerClient explorer,
-                                  EventAggregator eventAggregator,
-                                  BTCPayServerOptions options,
-                                  IServer server,
-                                  BTCPayNetworkProvider networkProvider)
-        {
-            _Settings = repo;
-            _Network = networkProvider.GetNetwork("BTC").NBitcoinNetwork;
-            _Explorer = explorer;
-            _Options = options;
-            _EventAggregator = eventAggregator;
-            _Server = server;
-        }
-
-        [Route("callbacks/transactions")]
-        [HttpPost]
-        public async Task NewTransaction(string token)
-        {
-            await AssertToken(token);
-            //We don't want to register all the json converter at MVC level, so we parse here
-            var serializer = new NBXplorer.Serializer(_Network);
-            var content = await new StreamReader(Request.Body, new UTF8Encoding(false), false, 1024, true).ReadToEndAsync();
-            var match = serializer.ToObject<TransactionMatch>(content);
-
-            foreach (var output in match.Outputs)
-            {
-                var evt = new TxOutReceivedEvent();
-                evt.ScriptPubKey = output.ScriptPubKey;
-                evt.Address = output.ScriptPubKey.GetDestinationAddress(_Network);
-                _EventAggregator.Publish(evt);
-            }
-        }
-
-        [Route("callbacks/blocks")]
-        [HttpPost]
-        public async Task NewBlock(string token)
-        {
-            await AssertToken(token);
-            _EventAggregator.Publish(new Events.NewBlockEvent());
-        }
-
-        private async Task AssertToken(string token)
-        {
-            var callback = await _Settings.GetSettingAsync<CallbackSettings>();
-            if (await GetToken() != token)
-                throw new BTCPayServer.BitpayHttpException(400, "invalid-callback-token");
-        }
-
-        public async Task<Uri> GetCallbackUriAsync()
-        {
-            string token = await GetToken();
-            return BuildCallbackUri("callbacks/transactions?token=" + token);
-        }
-
-        public async Task RegisterCallbackUriAsync(DerivationStrategyBase derivationScheme)
-        {
-            var uri = await GetCallbackUriAsync();
-            await _Explorer.SubscribeToWalletAsync(uri, derivationScheme);
-        }
-
-        private async Task<string> GetToken()
-        {
-            var callback = await _Settings.GetSettingAsync<CallbackSettings>();
-            if (callback == null)
-            {
-                callback = new CallbackSettings() { Token = Guid.NewGuid().ToString() };
-                await _Settings.UpdateSetting(callback);
-            }
-            var token = callback.Token;
-            return token;
-        }
-
-        public async Task<Uri> GetCallbackBlockUriAsync()
-        {
-            string token = await GetToken();
-            return BuildCallbackUri("callbacks/blocks?token=" + token);
-        }
-
-        private Uri BuildCallbackUri(string callbackPath)
-        {
-            var address = _Server.Features.Get<IServerAddressesFeature>().Addresses
-                                 .Select(c => new Uri(TransformToRoutable(c)))
-                                 .First();
-            var baseUrl = _Options.InternalUrl == null ? address.AbsoluteUri : _Options.InternalUrl.AbsoluteUri;
-            baseUrl = baseUrl.WithTrailingSlash();
-            return new Uri(baseUrl + callbackPath);
-        }
-
-        private string TransformToRoutable(string host)
-        {
-            if (host.StartsWith("http://0.0.0.0"))
-                host = host.Replace("http://0.0.0.0", "http://127.0.0.1");
-            return host;
-        }
-
-        public async Task<Uri> RegisterCallbackBlockUriAsync(Uri uri)
-        {
-            await _Explorer.SubscribeToBlocksAsync(uri);
-            return uri;
-        }
-    }
-}

BTCPayServer/Controllers/InvoiceController.PaymentProtocol.cs

@@ -61,14 +61,18 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("i/{invoiceId}", Order = 99)]
+        [Route("i/{invoiceId}/{cryptoCode}", Order = 99)]
         [MediaTypeConstraint("application/bitcoin-payment")]
-        public async Task<IActionResult> PostPayment(string invoiceId)
+        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);
             var payment = PaymentMessage.Load(Request.Body);
-            var unused = _Wallet.BroadcastTransactionsAsync(payment.Transactions);
+            var unused = _Wallet.BroadcastTransactionsAsync(network, payment.Transactions);
             await _InvoiceRepository.AddRefundsAsync(invoiceId, payment.RefundTo.Select(p => new TxOut(p.Amount, p.Script)).ToArray());
             return new PaymentAckActionResult(payment.CreateACK(invoiceId + " is currently processing, thanks for your purchase..."));
         }

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -19,51 +19,28 @@ using BTCPayServer.Services.Rates;
 using System.Net.WebSockets;
 using System.Threading;
 using BTCPayServer.Events;
+using NBXplorer;
 
 namespace BTCPayServer.Controllers
 {
     public partial class InvoiceController
     {
-        [HttpPost]
-        [Route("invoices/{invoiceId}")]
-        public IActionResult Invoice(string invoiceId, string command, string cryptoCode = null)
-        {
-            if (command == "refresh")
-            {
-                _Watcher.Watch(invoiceId);
-            }
-            StatusMessage = "Invoice is state is being refreshed, please refresh the page soon...";
-            return RedirectToAction(nameof(Invoice), new
-            {
-                invoiceId = invoiceId
-            });
-        }
-
         [HttpGet]
         [Route("invoices/{invoiceId}")]
-        public async Task<IActionResult> Invoice(string invoiceId, string cryptoCode = null)
+        public async Task<IActionResult> Invoice(string invoiceId)
         {
-            if (cryptoCode == null)
-                cryptoCode = "BTC";
             var invoice = (await _InvoiceRepository.GetInvoices(new InvoiceQuery()
             {
                 UserId = GetUserId(),
-                InvoiceId = invoiceId
+                InvoiceId = invoiceId,
+                IncludeAddresses = true
             })).FirstOrDefault();
             if (invoice == null)
                 return NotFound();
 
-            var network = _NetworkProvider.GetNetwork(cryptoCode);
-            if (network == null || !invoice.Support(network))
-                return NotFound();
-
-            var cryptoData = invoice.GetCryptoData(network);
-
             var dto = invoice.EntityToDTO(_NetworkProvider);
-            var cryptoInfo = dto.CryptoInfo.First(o => o.CryptoCode.Equals(cryptoCode, StringComparison.OrdinalIgnoreCase));
             var store = await _StoreRepository.FindStore(invoice.StoreId);
 
-            var accounting = cryptoData.Calculate();
             InvoiceDetailsModel model = new InvoiceDetailsModel()
             {
                 StoreName = store.StoreName,
@@ -73,34 +50,46 @@ namespace BTCPayServer.Controllers
                 RefundEmail = invoice.RefundMail,
                 CreatedDate = invoice.InvoiceTime,
                 ExpirationDate = invoice.ExpirationTime,
+                MonitoringDate = invoice.MonitoringExpiration,
                 OrderId = invoice.OrderId,
                 BuyerInformation = invoice.BuyerInformation,
-                Rate = cryptoData.Rate,
-                Fiat = dto.Price + " " + dto.Currency,
-                BTC = accounting.TotalDue.ToString() + $" {network.CryptoCode}",
-                BTCDue = accounting.Due.ToString() + $" {network.CryptoCode}",
-                BTCPaid = accounting.Paid.ToString() + $" {network.CryptoCode}",
-                NetworkFee = accounting.NetworkFee.ToString() + $" {network.CryptoCode}",
+                Fiat = FormatCurrency((decimal)dto.Price, dto.Currency),
                 NotificationUrl = invoice.NotificationURL,
                 ProductInformation = invoice.ProductInformation,
-                BitcoinAddress = BitcoinAddress.Create(cryptoInfo.Address, network.NBitcoinNetwork),
-                PaymentUrl = cryptoInfo.PaymentUrls.BIP72
             };
 
+            foreach (var data in invoice.GetCryptoData())
+            {
+                var cryptoInfo = dto.CryptoInfo.First(o => o.CryptoCode.Equals(data.Key, StringComparison.OrdinalIgnoreCase));
+                var accounting = data.Value.Calculate();
+                var paymentNetwork = _NetworkProvider.GetNetwork(data.Key);
+                var cryptoPayment = new InvoiceDetailsModel.CryptoPayment();
+                cryptoPayment.CryptoCode = paymentNetwork.CryptoCode;
+                cryptoPayment.Due = accounting.Due.ToString() + $" {paymentNetwork.CryptoCode}";
+                cryptoPayment.Paid = accounting.CryptoPaid.ToString() + $" {paymentNetwork.CryptoCode}";
+                cryptoPayment.Address = data.Value.DepositAddress.ToString();
+                cryptoPayment.Rate = FormatCurrency(data.Value);
+                cryptoPayment.PaymentUrl = cryptoInfo.PaymentUrls.BIP21;
+                model.CryptoPayments.Add(cryptoPayment);
+            }
+
             var payments = invoice
                 .Payments
                 .Select(async payment =>
                 {
                     var m = new InvoiceDetailsModel.Payment();
-                    m.DepositAddress = payment.GetScriptPubKey().GetDestinationAddress(network.NBitcoinNetwork);
-                    m.Confirmations = (await _Explorer.GetTransactionAsync(payment.Outpoint.Hash))?.Confirmations ?? 0;
+                    var paymentNetwork = _NetworkProvider.GetNetwork(payment.GetCryptoCode());
+                    m.CryptoCode = payment.GetCryptoCode();
+                    m.DepositAddress = payment.GetScriptPubKey().GetDestinationAddress(paymentNetwork.NBitcoinNetwork);
+                    m.Confirmations = (await _ExplorerClients.GetExplorerClient(payment.GetCryptoCode())?.GetTransactionAsync(payment.Outpoint.Hash))?.Confirmations ?? 0;
                     m.TransactionId = payment.Outpoint.Hash.ToString();
                     m.ReceivedTime = payment.ReceivedTime;
-                    m.TransactionLink = string.Format(network.BlockExplorerLink, m.TransactionId);
+                    m.TransactionLink = string.Format(paymentNetwork.BlockExplorerLink, m.TransactionId);
                     return m;
                 })
                 .ToArray();
             await Task.WhenAll(payments);
+            model.Addresses = invoice.HistoricalAddresses;
             model.Payments = payments.Select(p => p.GetAwaiter().GetResult()).ToList();
             model.StatusMessage = StatusMessage;
             return View(model);
@@ -108,13 +97,12 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [Route("i/{invoiceId}")]
+        [Route("i/{invoiceId}/{cryptoCode}")]
         [Route("invoice")]
         [AcceptMediaTypeConstraint("application/bitcoin-paymentrequest", false)]
         [XFrameOptionsAttribute(null)]
         public async Task<IActionResult> Checkout(string invoiceId, string id = null, string cryptoCode = null)
         {
-            if (cryptoCode == null)
-                cryptoCode = "BTC";
             //Keep compatibility with Bitpay
             invoiceId = invoiceId ?? id;
             id = invoiceId;
@@ -129,47 +117,70 @@ namespace BTCPayServer.Controllers
 
         private async Task<PaymentModel> GetInvoiceModel(string invoiceId, string cryptoCode)
         {
-            if (cryptoCode == null)
-                throw new ArgumentNullException(nameof(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))
                 return null;
-
             var cryptoData = invoice.GetCryptoData(network);
-            var store = await _StoreRepository.FindStore(invoice.StoreId);
+
             var dto = invoice.EntityToDTO(_NetworkProvider);
             var cryptoInfo = dto.CryptoInfo.First(o => o.CryptoCode == network.CryptoCode);
+
             var currency = invoice.ProductInformation.Currency;
             var accounting = cryptoData.Calculate();
             var model = new PaymentModel()
             {
+                CryptoCode = network.CryptoCode,
                 ServerUrl = HttpContext.Request.GetAbsoluteRoot(),
                 OrderId = invoice.OrderId,
                 InvoiceId = invoice.Id,
                 BtcAddress = cryptoData.DepositAddress,
-                BtcAmount = (accounting.TotalDue - cryptoData.TxFee).ToString(),
-                BtcTotalDue = accounting.TotalDue.ToString(),
+                OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
                 BtcDue = accounting.Due.ToString(),
                 CustomerEmail = invoice.RefundMail,
                 ExpirationSeconds = Math.Max(0, (int)(invoice.ExpirationTime - DateTimeOffset.UtcNow).TotalSeconds),
                 MaxTimeSeconds = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalSeconds,
                 ItemDesc = invoice.ProductInformation.ItemDesc,
-                Rate = cryptoData.Rate.ToString("C", _CurrencyNameTable.GetCurrencyProvider(currency)) + $" ({currency})",
+                Rate = FormatCurrency(cryptoData),
                 MerchantRefLink = invoice.RedirectURL ?? "/",
                 StoreName = store.StoreName,
-                TxFees = cryptoData.TxFee.ToString(),
-                InvoiceBitcoinUrl = cryptoInfo.PaymentUrls.BIP72,
+                InvoiceBitcoinUrl = cryptoInfo.PaymentUrls.BIP21,
                 TxCount = accounting.TxCount,
                 BtcPaid = accounting.Paid.ToString(),
-                Status = invoice.Status
+                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()
             };
 
+            var isMultiCurrency = invoice.Payments.Select(p=>p.GetCryptoCode()).Concat(new[] { network.CryptoCode }).Distinct().Count() > 1;
+            if (isMultiCurrency)
+                model.NetworkFeeDescription = $"{accounting.NetworkFee} {network.CryptoCode}";
+
             var expiration = TimeSpan.FromSeconds(model.ExpirationSeconds);
             model.TimeLeft = PrettyPrint(expiration);
             return model;
         }
 
+        private string FormatCurrency(CryptoData cryptoData)
+        {
+            string currency = cryptoData.ParentEntity.ProductInformation.Currency;
+            return FormatCurrency(cryptoData.Rate, currency);
+        }
+        public string FormatCurrency(decimal price, string currency)
+        {
+            return price.ToString("C", _CurrencyNameTable.GetCurrencyProvider(currency)) + $" ({currency})";
+        }
+
         private string PrettyPrint(TimeSpan expiration)
         {
             StringBuilder builder = new StringBuilder();
@@ -183,10 +194,9 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [Route("i/{invoiceId}/status")]
+        [Route("i/{invoiceId}/{cryptoCode}/status")]
         public async Task<IActionResult> GetStatus(string invoiceId, string cryptoCode)
         {
-            if (cryptoCode == null)
-                cryptoCode = "BTC";
             var model = await GetInvoiceModel(invoiceId, cryptoCode);
             if (model == null)
                 return NotFound();
@@ -206,9 +216,9 @@ namespace BTCPayServer.Controllers
             CompositeDisposable leases = new CompositeDisposable();
             try
             {
-                _EventAggregator.Subscribe<Events.InvoiceDataChangedEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId));
-                _EventAggregator.Subscribe<Events.InvoicePaymentEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId));
-                _EventAggregator.Subscribe<Events.InvoiceStatusChangedEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId));
+                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)));
                 while (true)
                 {
                     var message = await webSocket.ReceiveAsync(DummyBuffer, default(CancellationToken));
@@ -223,7 +233,7 @@ namespace BTCPayServer.Controllers
             }
             return new EmptyResult();
         }
-        
+
         ArraySegment<Byte> DummyBuffer = new ArraySegment<Byte>(new Byte[1]);
         private async Task NotifySocket(WebSocket webSocket, string invoiceId, string expectedId)
         {
@@ -325,7 +335,7 @@ namespace BTCPayServer.Controllers
                 return View(model);
             }
             var store = await _StoreRepository.FindStore(model.StoreId, GetUserId());
-            if (string.IsNullOrEmpty(store.DerivationStrategy))
+            if (store.GetDerivationStrategies(_NetworkProvider).Count() == 0)
             {
                 StatusMessage = "Error: You need to configure the derivation scheme in order to create an invoice";
                 return RedirectToAction(nameof(StoresController.UpdateStore), "Stores", new

BTCPayServer/Controllers/InvoiceController.cs

@@ -38,6 +38,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.AspNetCore.Mvc.Routing;
 using NBXplorer.DerivationStrategy;
 using NBXplorer;
+using BTCPayServer.HostedServices;
 
 namespace BTCPayServer.Controllers
 {
@@ -45,34 +46,31 @@ namespace BTCPayServer.Controllers
     {
         InvoiceRepository _InvoiceRepository;
         BTCPayWallet _Wallet;
-        IRateProvider _RateProvider;
-        private InvoiceWatcher _Watcher;
+        IRateProviderFactory _RateProviders;
         StoreRepository _StoreRepository;
         UserManager<ApplicationUser> _UserManager;
         IFeeProviderFactory _FeeProviderFactory;
         private CurrencyNameTable _CurrencyNameTable;
-        ExplorerClient _Explorer;
         EventAggregator _EventAggregator;
         BTCPayNetworkProvider _NetworkProvider;
+        ExplorerClientProvider _ExplorerClients;
         public InvoiceController(InvoiceRepository invoiceRepository,
             CurrencyNameTable currencyNameTable,
             UserManager<ApplicationUser> userManager,
             BTCPayWallet wallet,
-            IRateProvider rateProvider,
+            IRateProviderFactory rateProviders,
             StoreRepository storeRepository,
             EventAggregator eventAggregator,
-            InvoiceWatcherAccessor watcher,
-            ExplorerClient explorerClient,
             BTCPayNetworkProvider networkProvider,
+            ExplorerClientProvider explorerClientProviders,
             IFeeProviderFactory feeProviderFactory)
         {
+            _ExplorerClients = explorerClientProviders;
             _CurrencyNameTable = currencyNameTable ?? throw new ArgumentNullException(nameof(currencyNameTable));
-            _Explorer = explorerClient ?? throw new ArgumentNullException(nameof(explorerClient));
             _StoreRepository = storeRepository ?? throw new ArgumentNullException(nameof(storeRepository));
             _InvoiceRepository = invoiceRepository ?? throw new ArgumentNullException(nameof(invoiceRepository));
             _Wallet = wallet ?? throw new ArgumentNullException(nameof(wallet));
-            _RateProvider = rateProvider ?? throw new ArgumentNullException(nameof(rateProvider));
-            _Watcher = (watcher ?? throw new ArgumentNullException(nameof(watcher))).Instance;
+            _RateProviders = rateProviders ?? throw new ArgumentNullException(nameof(rateProviders));
             _UserManager = userManager;
             _FeeProviderFactory = feeProviderFactory ?? throw new ArgumentNullException(nameof(feeProviderFactory));
             _EventAggregator = eventAggregator;
@@ -82,12 +80,15 @@ namespace BTCPayServer.Controllers
 
         internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl, double expiryMinutes = 15)
         {
-            var derivationStrategy = store.DerivationStrategy;
+            var derivationStrategies = store.GetDerivationStrategies(_NetworkProvider).ToList();
+            if (derivationStrategies.Count == 0)
+                throw new BitpayHttpException(400, "This store has not configured the derivation strategy");
             var entity = new InvoiceEntity
             {
-                InvoiceTime = DateTimeOffset.UtcNow,
-                DerivationStrategy = derivationStrategy ?? throw new BitpayHttpException(400, "This store has not configured the derivation strategy")
+                InvoiceTime = DateTimeOffset.UtcNow
             };
+            entity.SetDerivationStrategies(derivationStrategies);
+
             var storeBlob = store.GetStoreBlob();
             Uri notificationUri = Uri.IsWellFormedUriString(invoice.NotificationURL, UriKind.Absolute) ? new Uri(invoice.NotificationURL, UriKind.Absolute) : null;
             if (notificationUri == null || (notificationUri.Scheme != "http" && notificationUri.Scheme != "https")) //TODO: Filer non routable addresses ?
@@ -97,7 +98,8 @@ namespace BTCPayServer.Controllers
             entity.MonitoringExpiration = entity.ExpirationTime + TimeSpan.FromMinutes(storeBlob.MonitoringExpiration);
             entity.OrderId = invoice.OrderId;
             entity.ServerUrl = serverUrl;
-            entity.FullNotifications = invoice.FullNotifications;
+            entity.FullNotifications = invoice.FullNotifications || invoice.ExtendedNotifications;
+            entity.ExtendedNotifications = invoice.ExtendedNotifications;
             entity.NotificationURL = notificationUri?.AbsoluteUri;
             entity.BuyerInformation = Map<Invoice, BuyerInformation>(invoice);
             //Another way of passing buyer info to support
@@ -113,17 +115,15 @@ namespace BTCPayServer.Controllers
             entity.Status = "new";
             entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);
 
-            var queries = storeBlob.GetSupportedCryptoCurrencies()
-                    .Select(n => _NetworkProvider.GetNetwork(n))
-                    .Where(n => n != null)
-                    .Select(network =>
+            var queries = derivationStrategies
+                    .Select(derivationStrategy =>
                     {
                         return new
                         {
-                            network = network,
-                            getFeeRate = _FeeProviderFactory.CreateFeeProvider(network).GetFeeRateAsync(),
-                            getRate = _RateProvider.GetRateAsync(invoice.Currency),
-                            getAddress = _Wallet.ReserveAddressAsync(ParseDerivationStrategy(derivationStrategy, network))
+                            network = derivationStrategy.Network,
+                            getFeeRate = _FeeProviderFactory.CreateFeeProvider(derivationStrategy.Network).GetFeeRateAsync(),
+                            getRate = _RateProviders.GetRateProvider(derivationStrategy.Network).GetRateAsync(invoice.Currency),
+                            getAddress = _Wallet.ReserveAddressAsync(derivationStrategy)
                         };
                     });
 
@@ -138,7 +138,7 @@ namespace BTCPayServer.Controllers
                 cryptoData.DepositAddress = (await q.getAddress).ToString();
 
 #pragma warning disable CS0618
-                if (q.network.CryptoCode == "BTC")
+                if (q.network.IsBTC)
                 {
                     entity.TxFee = cryptoData.TxFee;
                     entity.Rate = cryptoData.Rate;
@@ -150,7 +150,7 @@ namespace BTCPayServer.Controllers
             entity.SetCryptoData(cryptoDatas);
             entity.PosData = invoice.PosData;
             entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, _NetworkProvider);
-            _Watcher.Watch(entity.Id);
+            _EventAggregator.Publish(new Events.InvoiceCreatedEvent(entity.Id));
             var resp = entity.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }

BTCPayServer/Controllers/StoresController.cs

@@ -30,11 +30,11 @@ namespace BTCPayServer.Controllers
         public StoresController(
             StoreRepository repo,
             TokenRepository tokenRepo,
-            CallbackController callbackController,
             UserManager<ApplicationUser> userManager,
             AccessTokenController tokenController,
             BTCPayWallet wallet,
             BTCPayNetworkProvider networkProvider,
+            ExplorerClientProvider explorerProvider,
             IHostingEnvironment env)
         {
             _Repo = repo;
@@ -43,11 +43,11 @@ namespace BTCPayServer.Controllers
             _TokenController = tokenController;
             _Wallet = wallet;
             _Env = env;
-            _Network = networkProvider.GetNetwork("BTC").NBitcoinNetwork;
-            _CallbackController = callbackController;
+            _NetworkProvider = networkProvider;
+            _ExplorerProvider = explorerProvider;
         }
-        Network _Network;
-        CallbackController _CallbackController;
+        BTCPayNetworkProvider _NetworkProvider;
+        private ExplorerClientProvider _ExplorerProvider;
         BTCPayWallet _Wallet;
         AccessTokenController _TokenController;
         StoreRepository _Repo;
@@ -93,8 +93,12 @@ namespace BTCPayServer.Controllers
             StoresViewModel result = new StoresViewModel();
             result.StatusMessage = StatusMessage;
             var stores = await _Repo.GetStoresByUserId(GetUserId());
-            var balances = stores.Select(async s => string.IsNullOrEmpty(s.DerivationStrategy) ? Money.Zero : await _Wallet.GetBalance(ParseDerivationStrategy(s.DerivationStrategy, null))).ToArray();
+            var balances = stores
+                                .Select(s => s.GetDerivationStrategies(_NetworkProvider)
+                                              .Select(async ss => (await _Wallet.GetBalance(ss)).ToString() + " " + ss.Network.CryptoCode))
+                                .ToArray();
 
+            await Task.WhenAll(balances.SelectMany(_ => _));
             for (int i = 0; i < stores.Length; i++)
             {
                 var store = stores[i];
@@ -103,7 +107,7 @@ namespace BTCPayServer.Controllers
                     Id = store.Id,
                     Name = store.StoreName,
                     WebSite = store.StoreWebsite,
-                    Balance = await balances[i]
+                    Balances = balances[i].Select(t => t.Result).ToArray()
                 });
             }
             return View(result);
@@ -149,18 +153,113 @@ namespace BTCPayServer.Controllers
             var vm = new StoreViewModel();
             vm.Id = store.Id;
             vm.StoreName = store.StoreName;
+            vm.SetCryptoCurrencies(_ExplorerProvider, store.GetDefaultCrypto());
             vm.StoreWebsite = store.StoreWebsite;
             vm.NetworkFee = !storeBlob.NetworkFeeDisabled;
             vm.SpeedPolicy = store.SpeedPolicy;
-            vm.DerivationScheme = store.DerivationStrategy;
+            AddDerivationSchemes(store, vm);
             vm.StatusMessage = StatusMessage;
             vm.MonitoringExpiration = storeBlob.MonitoringExpiration;
             return View(vm);
         }
 
+        private void AddDerivationSchemes(StoreData store, StoreViewModel vm)
+        {
+            var strategies = store
+                            .GetDerivationStrategies(_NetworkProvider)
+                            .ToDictionary(s => s.Network.CryptoCode);
+            foreach (var explorerProvider in _ExplorerProvider.GetAll())
+            {
+                if (strategies.TryGetValue(explorerProvider.Item1.CryptoCode, out DerivationStrategy strat))
+                {
+                    vm.DerivationSchemes.Add(new StoreViewModel.DerivationScheme()
+                    {
+                        Crypto = explorerProvider.Item1.CryptoCode,
+                        Value = strat.DerivationStrategyBase.ToString()
+                    });
+                }
+            }
+        }
+
+        [HttpGet]
+        [Route("{storeId}/derivations")]
+        public async Task<IActionResult> AddDerivationScheme(string storeId, string selectedScheme = null)
+        {
+            selectedScheme = selectedScheme ?? "BTC";
+            var store = await _Repo.FindStore(storeId, GetUserId());
+            if (store == null)
+                return NotFound();
+            DerivationSchemeViewModel vm = new DerivationSchemeViewModel();
+            vm.SetCryptoCurrencies(_ExplorerProvider, selectedScheme);
+            return View(vm);
+        }
+
+        [HttpPost]
+        [Route("{storeId}/derivations")]
+        public async Task<IActionResult> AddDerivationScheme(string storeId, DerivationSchemeViewModel vm, string command, string selectedScheme = null)
+        {
+            selectedScheme = selectedScheme ?? "BTC";
+            var store = await _Repo.FindStore(storeId, GetUserId());
+            if (store == null)
+                return NotFound();
+
+            var network = vm.CryptoCurrency == null ? null : _ExplorerProvider.GetNetwork(vm.CryptoCurrency);
+            vm.SetCryptoCurrencies(_ExplorerProvider, selectedScheme);
+            if (network == null)
+            {
+                ModelState.AddModelError(nameof(vm.CryptoCurrency), "Invalid network");
+                return View(vm);
+            }
+
+            if (command == "Save")
+            {
+                try
+                {
+                    if (!string.IsNullOrEmpty(vm.DerivationScheme))
+                    {
+                        var strategy = ParseDerivationStrategy(vm.DerivationScheme, vm.DerivationSchemeFormat, network);
+                        await _Wallet.TrackAsync(strategy);
+                        vm.DerivationScheme = strategy.ToString();
+                    }
+                    store.SetDerivationStrategy(network, vm.DerivationScheme);
+                }
+                catch
+                {
+                    ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid Derivation Scheme");
+                    return View(vm);
+                }
+
+                await _Repo.UpdateStore(store);
+                StatusMessage = $"Derivation scheme for {vm.CryptoCurrency} has been modified.";
+                return RedirectToAction(nameof(UpdateStore), new { storeId = storeId });
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(vm.DerivationScheme))
+                {
+                    try
+                    {
+                        var scheme = ParseDerivationStrategy(vm.DerivationScheme, vm.DerivationSchemeFormat, network);
+                        var line = scheme.DerivationStrategyBase.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()));
+                        }
+                    }
+                    catch
+                    {
+                        ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid Derivation Scheme");
+                    }
+                }
+                return View(vm);
+            }
+        }
+
         [HttpPost]
         [Route("{storeId}")]
-        public async Task<IActionResult> UpdateStore(string storeId, StoreViewModel model, string command)
+        public async Task<IActionResult> UpdateStore(string storeId, StoreViewModel model)
         {
             if (!ModelState.IsValid)
             {
@@ -169,92 +268,54 @@ namespace BTCPayServer.Controllers
             var store = await _Repo.FindStore(storeId, GetUserId());
             if (store == null)
                 return NotFound();
+            AddDerivationSchemes(store, model);
 
-            if (command == "Save")
+            bool needUpdate = false;
+            if (store.SpeedPolicy != model.SpeedPolicy)
             {
-                bool needUpdate = false;
-                if (store.SpeedPolicy != model.SpeedPolicy)
-                {
-                    needUpdate = true;
-                    store.SpeedPolicy = model.SpeedPolicy;
-                }
-                if (store.StoreName != model.StoreName)
-                {
-                    needUpdate = true;
-                    store.StoreName = model.StoreName;
-                }
-                if (store.StoreWebsite != model.StoreWebsite)
-                {
-                    needUpdate = true;
-                    store.StoreWebsite = model.StoreWebsite;
-                }
-
-                if (store.DerivationStrategy != model.DerivationScheme)
-                {
-                    needUpdate = true;
-                    try
-                    {
-                        if (!string.IsNullOrEmpty(model.DerivationScheme))
-                        {
-                            var strategy = ParseDerivationStrategy(model.DerivationScheme, model.DerivationSchemeFormat);
-                            await _Wallet.TrackAsync(strategy);
-                            await _CallbackController.RegisterCallbackUriAsync(strategy);
-                            model.DerivationScheme = strategy.ToString();
-                        }
-                        store.DerivationStrategy = model.DerivationScheme;
-                    }
-                    catch
-                    {
-                        ModelState.AddModelError(nameof(model.DerivationScheme), "Invalid Derivation Scheme");
-                        return View(model);
-                    }
-                }
-
-                var blob = store.GetStoreBlob();
-                blob.NetworkFeeDisabled = !model.NetworkFee;
-                blob.MonitoringExpiration = model.MonitoringExpiration;
-
-                if (store.SetStoreBlob(blob))
-                {
-                    needUpdate = true;
-                }
-
-                if (needUpdate)
-                {
-                    await _Repo.UpdateStore(store);
-                    StatusMessage = "Store successfully updated";
-                }
-
-                return RedirectToAction(nameof(UpdateStore), new
-                {
-                    storeId = storeId
-                });
+                needUpdate = true;
+                store.SpeedPolicy = model.SpeedPolicy;
             }
-            else
+            if (store.StoreName != model.StoreName)
             {
-                if (!string.IsNullOrEmpty(model.DerivationScheme))
-                {
-                    try
-                    {
-                        var scheme = ParseDerivationStrategy(model.DerivationScheme, model.DerivationSchemeFormat);
-                        var line = scheme.GetLineFor(DerivationFeature.Deposit);
-
-                        for (int i = 0; i < 10; i++)
-                        {
-                            var address = line.Derive((uint)i);
-                            model.AddressSamples.Add((line.Path.Derive((uint)i).ToString(), address.ScriptPubKey.GetDestinationAddress(_Network).ToString()));
-                        }
-                    }
-                    catch
-                    {
-                        ModelState.AddModelError(nameof(model.DerivationScheme), "Invalid Derivation Scheme");
-                    }
-                }
-                return View(model);
+                needUpdate = true;
+                store.StoreName = model.StoreName;
             }
+            if (store.StoreWebsite != model.StoreWebsite)
+            {
+                needUpdate = true;
+                store.StoreWebsite = model.StoreWebsite;
+            }
+
+            if (store.GetDefaultCrypto() != model.DefaultCryptoCurrency)
+            {
+                needUpdate = true;
+                store.SetDefaultCrypto(model.DefaultCryptoCurrency);
+            }
+            model.SetCryptoCurrencies(_ExplorerProvider, model.DefaultCryptoCurrency);
+
+            var blob = store.GetStoreBlob();
+            blob.NetworkFeeDisabled = !model.NetworkFee;
+            blob.MonitoringExpiration = model.MonitoringExpiration;
+
+            if (store.SetStoreBlob(blob))
+            {
+                needUpdate = true;
+            }
+
+            if (needUpdate)
+            {
+                await _Repo.UpdateStore(store);
+                StatusMessage = "Store successfully updated";
+            }
+
+            return RedirectToAction(nameof(UpdateStore), new
+            {
+                storeId = storeId
+            });
         }
 
-        private DerivationStrategyBase ParseDerivationStrategy(string derivationScheme, string format)
+        private DerivationStrategy ParseDerivationStrategy(string derivationScheme, string format, BTCPayNetwork network)
         {
             if (format == "Electrum")
             {
@@ -276,19 +337,19 @@ 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 == Network.Main ? 0x0488b21eU : 0x043587cf, false);
+                var standardPrefix = Utils.ToBytes(network.NBitcoinNetwork == Network.Main ? 0x0488b21eU : 0x043587cf, false);
 
                 for (int i = 0; i < 4; i++)
                     data[i] = standardPrefix[i];
 
-                derivationScheme = new BitcoinExtPubKey(Encoders.Base58Check.EncodeData(data), _Network).ToString();
+                derivationScheme = new BitcoinExtPubKey(Encoders.Base58Check.EncodeData(data), network.NBitcoinNetwork).ToString();
                 foreach (var label in labels)
                 {
                     derivationScheme = derivationScheme + $"-[{label}]";
                 }
             }
 
-            return new DerivationStrategyFactory(_Network).Parse(derivationScheme);
+            return DerivationStrategy.Parse(new DerivationStrategyFactory(network.NBitcoinNetwork).Parse(derivationScheme).ToString(), network);
         }
 
         [HttpGet]

BTCPayServer/Data/AddressInvoiceData.cs

@@ -2,16 +2,49 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using NBitcoin;
 
 namespace BTCPayServer.Data
 {
     public class AddressInvoiceData
     {
+        /// <summary>
+        /// Some crypto currencies share same address prefix
+        /// For not having exceptions thrown by two address on different network, we suffix by "#CRYPTOCODE" 
+        /// </summary>
+        [Obsolete("Use GetHash instead")]
         public string Address
         {
             get; set;
         }
 
+
+#pragma warning disable CS0618
+        public ScriptId GetHash()
+        {
+            if (Address == null)
+                return null;
+            var index = Address.IndexOf("#");
+            if (index == -1)
+                return new ScriptId(Address);
+            return new ScriptId(Address.Substring(0, index));
+        }
+        public AddressInvoiceData SetHash(ScriptId scriptId, string cryptoCode)
+        {
+            Address = scriptId + "#" + cryptoCode;
+            return this;
+        }
+        public string GetCryptoCode()
+        {
+            if (Address == null)
+                return null;
+            var index = Address.IndexOf("#");
+            if (index == -1)
+                return "BTC";
+            return Address.Substring(index + 1);
+        }
+#pragma warning restore CS0618
+
         public InvoiceData InvoiceData
         {
             get; set;
@@ -26,5 +59,6 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
+
     }
 }

BTCPayServer/Data/ApplicationDbContext.cs

@@ -113,7 +113,9 @@ namespace BTCPayServer.Data
                 .HasForeignKey(pt => pt.StoreDataId);
 
             builder.Entity<AddressInvoiceData>()
+#pragma warning disable CS0618
                 .HasKey(o => o.Address);
+#pragma warning restore CS0618
 
             builder.Entity<PairingCodeData>()
                 .HasKey(o => o.Id);
@@ -128,7 +130,9 @@ namespace BTCPayServer.Data
                 .HasKey(o => new
                 {
                     o.InvoiceDataId,
+#pragma warning disable CS0618
                     o.Address
+#pragma warning restore CS0618
                 });
         }
     }

BTCPayServer/Data/HistoricalAddressInvoiceData.cs

@@ -12,6 +12,11 @@ namespace BTCPayServer.Data
             get; set;
         }
 
+        /// <summary>
+        /// Some crypto currencies share same address prefix
+        /// For not having exceptions thrown by two address on different network, we suffix by "#CRYPTOCODE" 
+        /// </summary>
+        [Obsolete("Use GetCryptoCode instead")]
         public string Address
         {
             get; set;
@@ -26,6 +31,21 @@ namespace BTCPayServer.Data
         {
             return string.IsNullOrEmpty(CryptoCode) ? "BTC" : CryptoCode;
         }
+        public string GetAddress()
+        {
+            if (Address == null)
+                return null;
+            var index = Address.IndexOf("#");
+            if (index == -1)
+                return Address;
+            return Address.Substring(0, index);
+        }
+        public HistoricalAddressInvoiceData SetAddress(string depositAddress, string cryptoCode)
+        {
+            Address = depositAddress + "#" + cryptoCode;
+            CryptoCode = cryptoCode;
+            return this;
+        }
 #pragma warning restore CS0618
 
         public DateTimeOffset Assigned

BTCPayServer/Data/StoreData.cs

@@ -10,6 +10,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.ComponentModel;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Data
 {
@@ -26,11 +27,90 @@ namespace BTCPayServer.Data
             get; set;
         }
 
+        [Obsolete("Use GetDerivationStrategies instead")]
         public string DerivationStrategy
         {
             get; set;
         }
 
+        [Obsolete("Use GetDerivationStrategies instead")]
+        public string DerivationStrategies
+        {
+            get;
+            set;
+        }
+
+        public IEnumerable<DerivationStrategy> GetDerivationStrategies(BTCPayNetworkProvider networks)
+        {
+#pragma warning disable CS0618
+            bool btcReturned = false;
+            if (!string.IsNullOrEmpty(DerivationStrategy))
+            {
+                if (networks.BTC != null)
+                {
+                    btcReturned = true;
+                    yield return BTCPayServer.DerivationStrategy.Parse(DerivationStrategy, networks.BTC);
+                }
+            }
+
+
+            if (!string.IsNullOrEmpty(DerivationStrategies))
+            {
+                JObject strategies = JObject.Parse(DerivationStrategies);
+                foreach (var strat in strategies.Properties())
+                {
+                    var network = networks.GetNetwork(strat.Name);
+                    if (network != null)
+                    {
+                        if (network == networks.BTC && btcReturned)
+                            continue;
+                        if (strat.Value.Type == JTokenType.Null)
+                            continue;
+                        yield return BTCPayServer.DerivationStrategy.Parse(strat.Value.Value<string>(), network);
+                    }
+                }
+            }
+#pragma warning restore CS0618
+        }
+
+        public void SetDerivationStrategy(BTCPayNetwork network, string derivationScheme)
+        {
+#pragma warning disable CS0618
+            JObject strategies = string.IsNullOrEmpty(DerivationStrategies) ? new JObject() : JObject.Parse(DerivationStrategies);
+            bool existing = false;
+            foreach (var strat in strategies.Properties().ToList())
+            {
+                if (strat.Name == network.CryptoCode)
+                {
+                    if (network.IsBTC)
+                        DerivationStrategy = null;
+                    if (string.IsNullOrEmpty(derivationScheme))
+                    {
+                        strat.Remove();
+                    }
+                    else
+                    {
+                        strat.Value = new JValue(derivationScheme);
+                    }
+                    existing = true;
+                    break;
+                }
+            }
+
+            if (!existing && string.IsNullOrEmpty(derivationScheme))
+            {
+                if(network.IsBTC)
+                    DerivationStrategy = null;
+            }
+            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)
+            //    DerivationStrategy = derivationScheme;
+            DerivationStrategies = strategies.ToString();
+#pragma warning restore CS0618
+        }
+
         public string StoreName
         {
             get; set;
@@ -61,6 +141,19 @@ namespace BTCPayServer.Data
             get;
             set;
         }
+        [Obsolete("Use GetDefaultCrypto instead")]
+        public string DefaultCrypto { get; set; }
+
+#pragma warning disable CS0618
+        public string GetDefaultCrypto()
+        {
+            return DefaultCrypto ?? "BTC";
+        }
+        public void SetDefaultCrypto(string defaultCryptoCurrency)
+        {
+            DefaultCrypto = defaultCryptoCurrency;
+        }
+#pragma warning restore CS0618
 
         static Network Dummy = Network.Main;
 
@@ -97,19 +190,5 @@ namespace BTCPayServer.Data
             get;
             set;
         }
-
-        [Obsolete("Use GetSupportedCryptoCurrencies() instead")]
-        public string[] SupportedCryptoCurrencies { get; set; }
-
-        public string[] GetSupportedCryptoCurrencies()
-        {
-#pragma warning disable CS0618
-            if(SupportedCryptoCurrencies == null)
-            {
-                return new string[] { "BTC" };
-            }
-            return SupportedCryptoCurrencies;
-#pragma warning restore CS0618
-        }
     }
 }

BTCPayServer/DerivationStrategy.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NBitcoin;
+using NBXplorer.DerivationStrategy;
+
+namespace BTCPayServer
+{
+    public class DerivationStrategy
+    {
+        private DerivationStrategyBase _DerivationStrategy;
+        private BTCPayNetwork _Network;
+
+        DerivationStrategy(DerivationStrategyBase result, BTCPayNetwork network)
+        {
+            this._DerivationStrategy = result;
+            this._Network = network;
+        }
+        
+        public static DerivationStrategy Parse(string derivationStrategy, BTCPayNetwork network)
+        {
+            if (network == null)
+                throw new ArgumentNullException(nameof(network));
+            if (derivationStrategy == null)
+                throw new ArgumentNullException(nameof(derivationStrategy));
+            var result = new NBXplorer.DerivationStrategy.DerivationStrategyFactory(network.NBitcoinNetwork).Parse(derivationStrategy);
+            return new DerivationStrategy(result, network);
+        }
+
+        public BTCPayNetwork Network { get { return this._Network; } }
+
+        public DerivationStrategyBase DerivationStrategyBase { get { return this._DerivationStrategy; } }
+
+        public override string ToString()
+        {
+            return _DerivationStrategy.ToString();
+        }
+    }
+}

BTCPayServer/EventAggregator.cs

@@ -71,13 +71,18 @@ namespace BTCPayServer
         }
 
         public void Publish<T>(T evt) where T : class
+        {
+            Publish(evt, typeof(T));
+        }
+
+        public void Publish(object evt, Type evtType)
         {
             if (evt == null)
                 throw new ArgumentNullException(nameof(evt));
             List<Action<object>> actionList = new List<Action<object>>();
             lock (_Subscriptions)
             {
-                if (_Subscriptions.TryGetValue(typeof(T), out Dictionary<Subscription, Action<object>> actions))
+                if (_Subscriptions.TryGetValue(evtType, out Dictionary<Subscription, Action<object>> actions))
                 {
                     actionList = actions.Values.ToList();
                 }

BTCPayServer/Events/InvoiceCreatedEvent.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Events
+{
+    public class InvoiceCreatedEvent
+    {
+        public InvoiceCreatedEvent(string id)
+        {
+            InvoiceId = id;
+        }
+
+        public string InvoiceId { get; set; }
+
+        public override string ToString()
+        {
+            return $"Invoice {InvoiceId} created";
+        }
+    }
+}

BTCPayServer/Events/NBXplorerStateChangedEvent.cs

@@ -2,23 +2,26 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.HostedServices;
 
 namespace BTCPayServer.Events
 {
     public class NBXplorerStateChangedEvent
     {
-        public NBXplorerStateChangedEvent(NBXplorerState old, NBXplorerState newState)
+        public NBXplorerStateChangedEvent(BTCPayNetwork network, NBXplorerState old, NBXplorerState newState)
         {
+            Network = network;
             NewState = newState;
             OldState = old;
         }
 
+        public BTCPayNetwork Network { get; set; }
         public NBXplorerState NewState { get; set; }
         public NBXplorerState OldState { get; set; }
 
         public override string ToString()
         {
-            return $"NBXplorer: {OldState} => {NewState}";
+            return $"NBXplorer {Network.CryptoCode}: {OldState} => {NewState}";
         }
     }
 }

BTCPayServer/Events/TxOutReceivedEvent.cs

@@ -8,12 +8,12 @@ namespace BTCPayServer.Events
 {
     public class TxOutReceivedEvent
     {
+        public BTCPayNetwork Network { get; set; }
         public Script ScriptPubKey { get; set; }
-        public BitcoinAddress Address { get; set; }
 
         public override string ToString()
         {
-            String address = Address?.ToString() ?? ScriptPubKey.ToHex();
+            String address = ScriptPubKey.GetDestinationAddress(Network.NBitcoinNetwork)?.ToString() ?? ScriptPubKey.ToString();
             return $"{address} received a transaction";
         }
     }

BTCPayServer/ExplorerClientProvider.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Configuration;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public class ExplorerClientProvider
+    {
+        BTCPayNetworkProvider _NetworkProviders;
+        BTCPayServerOptions _Options;
+
+        public BTCPayNetworkProvider NetworkProviders => _NetworkProviders;
+
+        public ExplorerClientProvider(BTCPayNetworkProvider networkProviders, BTCPayServerOptions options)
+        {
+            _NetworkProviders = networkProviders;
+            _Options = options;
+        }
+
+        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;
+        }
+
+        public ExplorerClient GetExplorerClient(BTCPayNetwork network)
+        {
+            return GetExplorerClient(network.CryptoCode);
+        }
+
+        public BTCPayNetwork GetNetwork(string cryptoCode)
+        {
+            var network = _NetworkProviders.GetNetwork(cryptoCode);
+            if (network == null)
+                return null;
+            if (_Options.ExplorerFactories.ContainsKey(network.CryptoCode))
+                return network;
+            return null;
+        }
+
+        public IEnumerable<(BTCPayNetwork, ExplorerClient)> GetAll()
+        {
+            foreach(var net in _NetworkProviders.GetAll())
+            {
+                if(_Options.ExplorerFactories.TryGetValue(net.CryptoCode, out Func<BTCPayNetwork, ExplorerClient> factory))
+                {
+                    yield return (net, factory(net));
+                }
+            }
+        }
+    }
+}

BTCPayServer/Extensions.cs

@@ -17,16 +17,31 @@ using NBXplorer;
 using NBXplorer.Models;
 using System.Linq;
 using System.Threading;
+using BTCPayServer.Services.Wallets;
+using System.IO;
 
 namespace BTCPayServer
 {
     public static class Extensions
     {
-        public static async Task<Dictionary<uint256, TransactionResult>> GetTransactions(this ExplorerClient client, uint256[] hashes, CancellationToken cts = default(CancellationToken))
+        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))
         {
             hashes = hashes.Distinct().ToArray();
             var transactions = hashes
-                                        .Select(async o => await client.GetTransactionAsync(o, cts))
+                                        .Select(async o => await client.GetTransactionAsync(network, 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

@@ -17,8 +17,10 @@ using Newtonsoft.Json;
 using System.Collections.Concurrent;
 using Microsoft.Extensions.Hosting;
 using BTCPayServer.Events;
+using NBXplorer;
+using BTCPayServer.Services.Invoices;
 
-namespace BTCPayServer.Services.Invoices
+namespace BTCPayServer.HostedServices
 {
     public class InvoiceNotificationManager : IHostedService
     {
@@ -113,6 +115,7 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
+        Encoding UTF8 = new UTF8Encoding(false);
         private async Task<HttpResponseMessage> SendNotification(InvoiceEntity invoice, CancellationToken cancellation)
         {
             var request = new HttpRequestMessage();
@@ -147,7 +150,7 @@ namespace BTCPayServer.Services.Invoices
 #pragma warning restore CS0618
             }
             request.RequestUri = new Uri(invoice.NotificationURL, UriKind.Absolute);
-            request.Content = new StringContent(JsonConvert.SerializeObject(notification), Encoding.UTF8, "application/json");
+            request.Content = new StringContent(JsonConvert.SerializeObject(notification), UTF8, "application/json");
             var response = await _Client.SendAsync(request, cancellation);
             return response;
         }

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -15,49 +15,57 @@ using Hangfire;
 using BTCPayServer.Services.Wallets;
 using BTCPayServer.Controllers;
 using BTCPayServer.Events;
+using Microsoft.AspNetCore.Hosting;
+using BTCPayServer.Services.Invoices;
 
-namespace BTCPayServer.Services.Invoices
+namespace BTCPayServer.HostedServices
 {
-    public class InvoiceWatcherAccessor
-    {
-        public InvoiceWatcher Instance { get; set; }
-    }
     public class InvoiceWatcher : IHostedService
     {
+        class UpdateInvoiceContext
+        {
+            public UpdateInvoiceContext()
+            {
+
+            }
+
+            public Dictionary<BTCPayNetwork, KnownState> KnownStates { get; set; }
+            public Dictionary<BTCPayNetwork, KnownState> ModifiedKnownStates { get; set; } = new Dictionary<BTCPayNetwork, KnownState>();
+            public InvoiceEntity Invoice { get; set; }
+            public List<object> Events { get; set; } = new List<object>();
+
+            bool _Dirty = false;
+            public void MarkDirty()
+            {
+                _Dirty = true;
+            }
+
+            public bool Dirty => _Dirty;
+        }
+
         InvoiceRepository _InvoiceRepository;
-        ExplorerClient _ExplorerClient;
-        DerivationStrategyFactory _DerivationFactory;
         EventAggregator _EventAggregator;
         BTCPayWallet _Wallet;
         BTCPayNetworkProvider _NetworkProvider;
 
-        public InvoiceWatcher(ExplorerClient explorerClient,
+        public InvoiceWatcher(
+            IHostingEnvironment env,
             BTCPayNetworkProvider networkProvider,
             InvoiceRepository invoiceRepository,
             EventAggregator eventAggregator,
-            BTCPayWallet wallet,
-            InvoiceWatcherAccessor accessor)
+            BTCPayWallet wallet)
         {
-            LongPollingMode = explorerClient.Network == Network.RegTest;
-            PollInterval = explorerClient.Network == Network.RegTest ? TimeSpan.FromSeconds(10.0) : TimeSpan.FromMinutes(1.0);
+            PollInterval = TimeSpan.FromMinutes(1.0);
             _Wallet = wallet ?? throw new ArgumentNullException(nameof(wallet));
-            _ExplorerClient = explorerClient ?? throw new ArgumentNullException(nameof(explorerClient));
-            _DerivationFactory = new DerivationStrategyFactory(_ExplorerClient.Network);
             _InvoiceRepository = invoiceRepository ?? throw new ArgumentNullException(nameof(invoiceRepository));
             _EventAggregator = eventAggregator ?? throw new ArgumentNullException(nameof(eventAggregator));
             _NetworkProvider = networkProvider;
-            accessor.Instance = this;
         }
         CompositeDisposable leases = new CompositeDisposable();
 
-        public bool LongPollingMode
+        async Task NotifyReceived(Script scriptPubKey, BTCPayNetwork network)
         {
-            get; set;
-        }
-
-        async Task NotifyReceived(Script scriptPubKey)
-        {
-            var invoice = await _InvoiceRepository.GetInvoiceIdFromScriptPubKey(scriptPubKey);
+            var invoice = await _InvoiceRepository.GetInvoiceIdFromScriptPubKey(scriptPubKey, network.CryptoCode);
             if (invoice != null)
                 _WatchRequests.Add(invoice);
         }
@@ -72,7 +80,7 @@ namespace BTCPayServer.Services.Invoices
 
         private async Task UpdateInvoice(string invoiceId)
         {
-            UTXOChanges changes = null;
+            Dictionary<BTCPayNetwork, KnownState> changes = new Dictionary<BTCPayNetwork, KnownState>();
             while (true)
             {
                 try
@@ -81,22 +89,30 @@ namespace BTCPayServer.Services.Invoices
                     if (invoice == null)
                         break;
                     var stateBefore = invoice.Status;
-                    var postSaveActions = new List<Action>();
-                    var result = await UpdateInvoice(changes, invoice, postSaveActions).ConfigureAwait(false);
-                    changes = result.Changes;
-                    if (result.NeedSave)
-                    { 
+                    var updateContext = new UpdateInvoiceContext()
+                    {
+                        Invoice = invoice,
+                        KnownStates = changes
+                    };
+                    await UpdateInvoice(updateContext).ConfigureAwait(false);
+                    if (updateContext.Dirty)
+                    {
                         await _InvoiceRepository.UpdateInvoiceStatus(invoice.Id, invoice.Status, invoice.ExceptionStatus).ConfigureAwait(false);
                         _EventAggregator.Publish(new InvoiceDataChangedEvent() { InvoiceId = invoice.Id });
                     }
 
                     var changed = stateBefore != invoice.Status;
 
-                    foreach(var saveAction in postSaveActions)
+                    foreach (var evt in updateContext.Events)
                     {
-                        saveAction();
+                        _EventAggregator.Publish(evt, evt.GetType());
                     }
-                    
+
+                    foreach (var modifiedKnownState in updateContext.ModifiedKnownStates)
+                    {
+                        changes.AddOrReplace(modifiedKnownState.Key, modifiedKnownState.Value);
+                    }
+
                     if (invoice.Status == "complete" ||
                        ((invoice.Status == "invalid" || invoice.Status == "expired") && invoice.MonitoringExpiration < DateTimeOffset.UtcNow))
                     {
@@ -121,60 +137,65 @@ namespace BTCPayServer.Services.Invoices
         }
 
 
-        private async Task<(bool NeedSave, UTXOChanges Changes)> UpdateInvoice(UTXOChanges changes, InvoiceEntity invoice, List<Action> postSaveActions)
+        private async Task UpdateInvoice(UpdateInvoiceContext context)
         {
-            bool needSave = false;
+            var invoice = context.Invoice;
             //Fetch unknown payments
-            var strategy = _DerivationFactory.Parse(invoice.DerivationStrategy);
-            changes = await _ExplorerClient.SyncAsync(strategy, changes, !LongPollingMode, _Cts.Token).ConfigureAwait(false);
-
-
-            var utxos = changes.Confirmed.UTXOs.Concat(changes.Unconfirmed.UTXOs).ToArray();
-            List<Coin> receivedCoins = new List<Coin>();
-            foreach (var received in utxos)
-                if (invoice.AvailableAddressHashes.Contains(received.ScriptPubKey.Hash.ToString()))
-                    receivedCoins.Add(received.AsCoin());
-
-            var alreadyAccounted = new HashSet<OutPoint>(invoice.Payments.Select(p => p.Outpoint));
-            bool dirtyAddress = false;
-            foreach (var coin in receivedCoins.Where(c => !alreadyAccounted.Contains(c.Outpoint)))
+            var strategies = invoice.GetDerivationStrategies(_NetworkProvider).ToArray();
+            var getCoinsResponsesAsync = strategies
+                                .Select(d => _Wallet.GetCoins(d, context.KnownStates.TryGet(d.Network), _Cts.Token))
+                                .ToArray();
+            await Task.WhenAll(getCoinsResponsesAsync);
+            var getCoinsResponses = getCoinsResponsesAsync.Select(g => g.Result).ToArray();
+            foreach (var response in getCoinsResponses)
             {
-                var payment = await _InvoiceRepository.AddPayment(invoice.Id, coin).ConfigureAwait(false);
-                invoice.Payments.Add(payment);
-                postSaveActions.Add(() => _EventAggregator.Publish(new InvoicePaymentEvent(invoice.Id)));
-                dirtyAddress = true;
+                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)
+            {
+                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 = _NetworkProvider.GetNetwork("BTC");
+            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)
             {
-                needSave = true;
+                context.MarkDirty();
                 await _InvoiceRepository.UnaffectAddress(invoice.Id);
 
-                postSaveActions.Add(() => _EventAggregator.Publish(new InvoiceStatusChangedEvent(invoice, "expired")));
+                context.Events.Add(new InvoiceStatusChangedEvent(invoice, "expired"));
                 invoice.Status = "expired";
             }
 
             if (invoice.Status == "new" || invoice.Status == "expired")
             {
-                var totalPaid = (await GetPaymentsWithTransaction(invoice)).Select(p => p.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
+                var totalPaid = (await GetPaymentsWithTransaction(network, invoice)).Select(p => p.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
                 if (totalPaid >= accounting.TotalDue)
                 {
                     if (invoice.Status == "new")
                     {
-                        postSaveActions.Add(() => _EventAggregator.Publish(new InvoiceStatusChangedEvent(invoice, "paid")));
+                        context.Events.Add(new InvoiceStatusChangedEvent(invoice, "paid"));
                         invoice.Status = "paid";
                         invoice.ExceptionStatus = null;
                         await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                        needSave = true;
+                        context.MarkDirty();
                     }
                     else if (invoice.Status == "expired")
                     {
                         invoice.ExceptionStatus = "paidLate";
-                        needSave = true;
+                        context.MarkDirty();
                     }
                 }
 
@@ -182,17 +203,16 @@ namespace BTCPayServer.Services.Invoices
                 {
                     invoice.ExceptionStatus = "paidOver";
                     await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    needSave = true;
+                    context.MarkDirty();
                 }
 
                 if (totalPaid < accounting.TotalDue && invoice.Payments.Count != 0 && invoice.ExceptionStatus != "paidPartial")
                 {
-                    Logs.PayServer.LogInformation("Paid to " + cryptoData.DepositAddress);
                     invoice.ExceptionStatus = "paidPartial";
-                    needSave = true;
+                    context.MarkDirty();
                     if (dirtyAddress)
                     {
-                        var address = await _Wallet.ReserveAddressAsync(_DerivationFactory.Parse(invoice.DerivationStrategy));
+                        var address = await _Wallet.ReserveAddressAsync(coins.Strategy);
                         Logs.PayServer.LogInformation("Generate new " + address);
                         await _InvoiceRepository.NewAddress(invoice.Id, address, network);
                     }
@@ -201,11 +221,10 @@ namespace BTCPayServer.Services.Invoices
 
             if (invoice.Status == "paid")
             {
-                var transactions = await GetPaymentsWithTransaction(invoice);
-                var chainConfirmedTransactions = transactions.Where(t => t.Confirmations >= 1);
+                var transactions = await GetPaymentsWithTransaction(network, invoice);
                 if (invoice.SpeedPolicy == SpeedPolicy.HighSpeed)
                 {
-                    transactions = transactions.Where(t => !t.Transaction.RBF);
+                    transactions = transactions.Where(t => t.Confirmations >= 1 || !t.Transaction.RBF);
                 }
                 else if (invoice.SpeedPolicy == SpeedPolicy.MediumSpeed)
                 {
@@ -216,50 +235,45 @@ namespace BTCPayServer.Services.Invoices
                     transactions = transactions.Where(t => t.Confirmations >= 6);
                 }
 
-                var chainTotalConfirmed = chainConfirmedTransactions.Select(t => t.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
+                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
-                   (chainTotalConfirmed < accounting.TotalDue))
+                   (totalConfirmed < accounting.TotalDue))
                 {
                     await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    postSaveActions.Add(() => _EventAggregator.Publish(new InvoiceStatusChangedEvent(invoice, "invalid")));
+                    context.Events.Add(new InvoiceStatusChangedEvent(invoice, "invalid"));
                     invoice.Status = "invalid";
-                    needSave = true;
+                    context.MarkDirty();
                 }
-                else
+                else if (totalConfirmed >= accounting.TotalDue)
                 {
-                    var totalConfirmed = transactions.Select(t => t.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
-                    if (totalConfirmed >= accounting.TotalDue)
-                    {
-                        await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                        postSaveActions.Add(() => _EventAggregator.Publish(new InvoiceStatusChangedEvent(invoice, "confirmed")));
-                        invoice.Status = "confirmed";
-                        needSave = true;
-                    }
+                    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(invoice);
+                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)
                 {
-                    postSaveActions.Add(() => _EventAggregator.Publish(new InvoiceStatusChangedEvent(invoice, "complete")));
+                    context.Events.Add(new InvoiceStatusChangedEvent(invoice, "complete"));
                     invoice.Status = "complete";
-                    needSave = true;
+                    context.MarkDirty();
                 }
             }
-            return (needSave, changes);
         }
 
-        private async Task<IEnumerable<AccountedPaymentEntity>> GetPaymentsWithTransaction(InvoiceEntity invoice)
+        private async Task<IEnumerable<AccountedPaymentEntity>> GetPaymentsWithTransaction(BTCPayNetwork network, InvoiceEntity invoice)
         {
-            var transactions = await _ExplorerClient.GetTransactions(invoice.Payments.Select(t => t.Outpoint.Hash).ToArray());
+            var transactions = await _Wallet.GetTransactions(network, invoice.Payments.Select(t => t.Outpoint.Hash).ToArray());
 
             var spentTxIn = new Dictionary<OutPoint, AccountedPaymentEntity>();
             var result = invoice.Payments.Select(p => p.Outpoint).ToHashSet();
@@ -329,7 +343,7 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
-        public void Watch(string invoiceId)
+        private void Watch(string invoiceId)
         {
             if (invoiceId == null)
                 throw new ArgumentNullException(nameof(invoiceId));
@@ -364,7 +378,8 @@ namespace BTCPayServer.Services.Invoices
             }, null, 0, (int)PollInterval.TotalMilliseconds);
 
             leases.Add(_EventAggregator.Subscribe<Events.NewBlockEvent>(async b => { await NotifyBlock(); }));
-            leases.Add(_EventAggregator.Subscribe<TxOutReceivedEvent>(async b => { await NotifyReceived(b.ScriptPubKey); }));
+            leases.Add(_EventAggregator.Subscribe<Events.TxOutReceivedEvent>(async b => { await NotifyReceived(b.ScriptPubKey, b.Network); }));
+            leases.Add(_EventAggregator.Subscribe<Events.InvoiceCreatedEvent>(b => { Watch(b.InvoiceId); }));
 
             return Task.CompletedTask;
         }

BTCPayServer/HostedServices/NBXplorerListener.cs

@@ -0,0 +1,204 @@
+using System;
+using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Logging;
+using BTCPayServer.Services.Invoices;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+using NBXplorer;
+using System.Collections.Concurrent;
+using NBXplorer.DerivationStrategy;
+using BTCPayServer.Events;
+
+namespace BTCPayServer.HostedServices
+{
+    public class NBXplorerListener : IHostedService
+    {
+        EventAggregator _Aggregator;
+        ExplorerClientProvider _ExplorerClients;
+        IApplicationLifetime _Lifetime;
+        InvoiceRepository _InvoiceRepository;
+        private TaskCompletionSource<bool> _RunningTask;
+        private CancellationTokenSource _Cts;
+        NBXplorerDashboard _Dashboards;
+
+        public NBXplorerListener(ExplorerClientProvider explorerClients,
+                                NBXplorerDashboard dashboard,
+                                InvoiceRepository invoiceRepository,
+                                EventAggregator aggregator, IApplicationLifetime lifetime)
+        {
+            PollInterval = TimeSpan.FromMinutes(1.0);
+            _Dashboards = dashboard;
+            _InvoiceRepository = invoiceRepository;
+            _ExplorerClients = explorerClients;
+            _Aggregator = aggregator;
+            _Lifetime = lifetime;
+        }
+
+        CompositeDisposable leases = new CompositeDisposable();
+        ConcurrentDictionary<string, NotificationSession> _Sessions = new ConcurrentDictionary<string, NotificationSession>();
+        private Timer _ListenPoller;
+
+        TimeSpan _PollInterval;
+        public TimeSpan PollInterval
+        {
+            get
+            {
+                return _PollInterval;
+            }
+            set
+            {
+                _PollInterval = value;
+                if (_ListenPoller != null)
+                {
+                    _ListenPoller.Change(0, (int)value.TotalMilliseconds);
+                }
+            }
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            _RunningTask = new TaskCompletionSource<bool>();
+            _Cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+            leases.Add(_Aggregator.Subscribe<Events.NBXplorerStateChangedEvent>(async nbxplorerEvent =>
+            {
+                if (nbxplorerEvent.NewState == NBXplorerState.Ready)
+                {
+                    await Listen(nbxplorerEvent.Network);
+                }
+            }));
+
+            _ListenPoller = new Timer(async s =>
+            {
+                foreach (var nbxplorerState in _Dashboards.GetAll())
+                {
+                    if (nbxplorerState.Status != null && nbxplorerState.Status.IsFullySynched)
+                    {
+                        await Listen(nbxplorerState.Network);
+                    }
+                }
+            }, null, 0, (int)PollInterval.TotalMilliseconds);
+            leases.Add(_ListenPoller);
+
+            leases.Add(_Aggregator.Subscribe<Events.InvoiceCreatedEvent>(async inv =>
+            {
+                var invoice = await _InvoiceRepository.GetInvoice(null, inv.InvoiceId);
+                List<Task> listeningDerivations = new List<Task>();
+                foreach (var notificationSessions in _Sessions)
+                {
+                    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);
+            }));
+            return Task.CompletedTask;
+        }
+
+        private async Task Listen(BTCPayNetwork network)
+        {
+            bool cleanup = false;
+            try
+            {
+                if (_Sessions.ContainsKey(network.CryptoCode))
+                    return;
+                var client = _ExplorerClients.GetExplorerClient(network);
+                if (client == null)
+                    return;
+                if (_Cts.IsCancellationRequested)
+                    return;
+                var session = await client.CreateNotificationSessionAsync(_Cts.Token).ConfigureAwait(false);
+                if (!_Sessions.TryAdd(network.CryptoCode, session))
+                {
+                    await session.DisposeAsync();
+                    return;
+                }
+                cleanup = true;
+                using (session)
+                {
+                    await session.ListenNewBlockAsync(_Cts.Token).ConfigureAwait(false);
+                    await session.ListenDerivationSchemesAsync((await GetStrategies(network)).ToArray(), _Cts.Token).ConfigureAwait(false);
+                    Logs.PayServer.LogInformation($"Connected to WebSocket of NBXplorer ({network.CryptoCode})");
+                    while (!_Cts.IsCancellationRequested)
+                    {
+                        var newEvent = await session.NextEventAsync(_Cts.Token).ConfigureAwait(false);
+                        switch (newEvent)
+                        {
+                            case NBXplorer.Models.NewBlockEvent evt:
+                                _Aggregator.Publish(new Events.NewBlockEvent());
+                                break;
+                            case NBXplorer.Models.NewTransactionEvent evt:
+                                foreach (var txout in evt.Match.Outputs)
+                                {
+                                    _Aggregator.Publish(new Events.TxOutReceivedEvent()
+                                    {
+                                        Network = network,
+                                        ScriptPubKey = txout.ScriptPubKey
+                                    });
+                                }
+                                break;
+                            default:
+                                Logs.PayServer.LogWarning("Received unknown message from NBXplorer");
+                                break;
+                        }
+                    }
+                }
+            }
+            catch when (_Cts.IsCancellationRequested) { }
+            catch (Exception ex)
+            {
+                Logs.PayServer.LogError(ex, $"Error while connecting to WebSocket of NBXplorer ({network.CryptoCode})");
+            }
+            finally
+            {
+                if (cleanup)
+                {
+                    Logs.PayServer.LogInformation($"Disconnected from WebSocket of NBXplorer ({network.CryptoCode})");
+                    _Sessions.TryRemove(network.CryptoCode, out NotificationSession unused);
+                    if (_Sessions.Count == 0 && _Cts.IsCancellationRequested)
+                    {
+                        _RunningTask.TrySetResult(true);
+                    }
+                }
+            }
+        }
+
+        private async Task<List<DerivationStrategyBase>> GetStrategies(BTCPayNetwork network)
+        {
+            List<DerivationStrategyBase> strategies = new List<DerivationStrategyBase>();
+            foreach (var invoiceId in await _InvoiceRepository.GetPendingInvoices())
+            {
+                var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId);
+                var strategy = GetStrategy(network.CryptoCode, invoice);
+                if (strategy != null)
+                    strategies.Add(strategy);
+            }
+
+            return strategies;
+        }
+
+        private DerivationStrategyBase GetStrategy(string cryptoCode, InvoiceEntity invoice)
+        {
+            foreach (var derivationStrategy in invoice.GetDerivationStrategies(_ExplorerClients.NetworkProviders))
+            {
+                if (derivationStrategy.Network.CryptoCode == cryptoCode)
+                {
+                    return derivationStrategy.DerivationStrategyBase;
+                }
+            }
+            return null;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            leases.Dispose();
+            _Cts.Cancel();
+            return Task.WhenAny(_RunningTask.Task, Task.Delay(-1, cancellationToken));
+        }
+    }
+}

BTCPayServer/HostedServices/NBXplorerWaiter.cs

@@ -11,12 +11,8 @@ using NBXplorer.Models;
 using System.Collections.Concurrent;
 using BTCPayServer.Events;
 
-namespace BTCPayServer
+namespace BTCPayServer.HostedServices
 {
-    public class NBXplorerWaiterAccessor
-    {
-        public NBXplorerWaiter Instance { get; set; }
-    }
     public enum NBXplorerState
     {
         NotConnected,
@@ -24,15 +20,66 @@ namespace BTCPayServer
         Ready
     }
 
-    public class NBXplorerWaiter : IHostedService
+    public class NBXplorerDashboard
     {
-        public NBXplorerWaiter(ExplorerClient client, EventAggregator aggregator, NBXplorerWaiterAccessor accessor)
+        public class NBXplorerSummary
         {
-            _Client = client;
-            _Aggregator = aggregator;
-            accessor.Instance = this;
+            public BTCPayNetwork Network { get; set; }
+            public NBXplorerState State { get; set; }
+            public StatusResult Status { get; set; }
+        }
+        ConcurrentDictionary<string, NBXplorerSummary> _Summaries = new ConcurrentDictionary<string, NBXplorerSummary>();
+        public void Publish(BTCPayNetwork network, NBXplorerState state, StatusResult status)
+        {
+            var summary = new NBXplorerSummary() { Network = network, State = state, Status = status };
+            _Summaries.AddOrUpdate(network.CryptoCode, summary, (k, v) => summary);
         }
 
+        public bool IsFullySynched()
+        {
+            return _Summaries.All(s => s.Value.Status != null && s.Value.Status.IsFullySynched);
+        }
+
+        public IEnumerable<NBXplorerSummary> GetAll()
+        {
+            return _Summaries.Values;
+        }
+    }
+
+    public class NBXplorerWaiters : IHostedService
+    {
+        List<NBXplorerWaiter> _Waiters = new List<NBXplorerWaiter>();
+        public NBXplorerWaiters(NBXplorerDashboard dashboard, ExplorerClientProvider explorerClientProvider, EventAggregator eventAggregator)
+        {
+            foreach (var explorer in explorerClientProvider.GetAll())
+            {
+                _Waiters.Add(new NBXplorerWaiter(dashboard, explorer.Item1, explorer.Item2, eventAggregator));
+            }
+        }
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            return Task.WhenAll(_Waiters.Select(w => w.StartAsync(cancellationToken)).ToArray());
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            return Task.WhenAll(_Waiters.Select(w => w.StopAsync(cancellationToken)).ToArray());
+        }
+    }
+
+    public class NBXplorerWaiter : IHostedService
+    {
+
+        public NBXplorerWaiter(NBXplorerDashboard dashboard, BTCPayNetwork network, ExplorerClient client, EventAggregator aggregator)
+        {
+            _Network = network;
+            _Client = client;
+            _Aggregator = aggregator;
+            _Dashboard = dashboard;
+        }
+
+        NBXplorerDashboard _Dashboard;
+        BTCPayNetwork _Network;
         EventAggregator _Aggregator;
         ExplorerClient _Client;
         Timer _Timer;
@@ -115,7 +162,6 @@ namespace BTCPayServer
                     break;
             }
 
-            LastStatus = status;
             if (oldState != State)
             {
                 if (State == NBXplorerState.Synching)
@@ -126,8 +172,9 @@ namespace BTCPayServer
                 {
                     SetInterval(TimeSpan.FromMinutes(1));
                 }
-                _Aggregator.Publish(new NBXplorerStateChangedEvent(oldState, State));
+                _Aggregator.Publish(new NBXplorerStateChangedEvent(_Network, oldState, State));
             }
+            _Dashboard.Publish(_Network, State, status);
             return oldState != State;
         }
 
@@ -162,8 +209,6 @@ namespace BTCPayServer
 
         public NBXplorerState State { get; private set; }
 
-        public StatusResult LastStatus { get; private set; }
-
         public Task StopAsync(CancellationToken cancellationToken)
         {
             _Timer.Dispose();

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -36,6 +36,7 @@ using BTCPayServer.Services.Wallets;
 using BTCPayServer.Authentication;
 using Microsoft.Extensions.Caching.Memory;
 using BTCPayServer.Logging;
+using BTCPayServer.HostedServices;
 
 namespace BTCPayServer.Hosting
 {
@@ -131,25 +132,22 @@ namespace BTCPayServer.Hosting
                 return new BTCPayNetworkProvider(opts.Network);
             });
 
+            services.TryAddSingleton<NBXplorerDashboard>();
             services.TryAddSingleton<StoreRepository>();
             services.TryAddSingleton<BTCPayWallet>();
             services.TryAddSingleton<CurrencyNameTable>();
-            services.TryAddSingleton<IFeeProviderFactory>(o => new NBXplorerFeeProviderFactory(o.GetRequiredService<ExplorerClient>())
+            services.TryAddSingleton<IFeeProviderFactory>(o => new NBXplorerFeeProviderFactory(o.GetRequiredService<ExplorerClientProvider>())
             {
                 Fallback = new FeeRate(100, 1),
                 BlockTarget = 20
             });
 
-            services.TryAddSingleton<NBXplorerWaiterAccessor>();
-            services.AddSingleton<IHostedService, NBXplorerWaiter>();
-            services.TryAddSingleton<ExplorerClient>(o =>
-            {
-                var opts = o.GetRequiredService<BTCPayServerOptions>();
-                var explorer = new ExplorerClient(opts.Network, opts.Explorer);
-                if (!explorer.SetCookieAuth(opts.CookieFile))
-                    explorer.SetNoAuth();
-                return explorer;
-            });
+            services.AddSingleton<IHostedService, NBXplorerWaiters>();
+            services.AddSingleton<IHostedService, NBXplorerListener>();
+            services.AddSingleton<IHostedService, InvoiceNotificationManager>();
+            services.AddSingleton<IHostedService, InvoiceWatcher>();
+
+            services.TryAddSingleton<ExplorerClientProvider>();
             services.TryAddSingleton<Bitpay>(o =>
             {
                 if (o.GetRequiredService<BTCPayServerOptions>().Network == Network.Main)
@@ -157,22 +155,11 @@ namespace BTCPayServer.Hosting
                 else
                     return new Bitpay(new Key(), new Uri("https://test.bitpay.com/"));
             });
-            services.TryAddSingleton<IRateProvider>(o =>
-            {
-                var coinaverage = new CoinAverageRateProvider();
-                var bitpay = new BitpayRateProvider(new Bitpay(new Key(), new Uri("https://bitpay.com/")));
-                return new CachedRateProvider(new FallbackRateProvider(new IRateProvider[] { coinaverage, bitpay }), o.GetRequiredService<IMemoryCache>()) { CacheSpan = TimeSpan.FromMinutes(1.0) };
-            });
-            
-            services.AddSingleton<IHostedService, InvoiceNotificationManager>();
+            services.TryAddSingleton<IRateProviderFactory, CachedDefaultRateProviderFactory>();
 
-            services.TryAddSingleton<InvoiceWatcherAccessor>();
-            services.AddSingleton<IHostedService, InvoiceWatcher>();
-            services.TryAddSingleton<Initializer>();
             services.TryAddScoped<IHttpContextAccessor, HttpContextAccessor>();
             services.TryAddSingleton<IAuthorizationHandler, OwnStoreHandler>();
             services.AddTransient<AccessTokenController>();
-            services.AddTransient<CallbackController>();
             services.AddTransient<InvoiceController>();
             // Add application services.
             services.AddTransient<IEmailSender, EmailSender>();
@@ -204,10 +191,6 @@ namespace BTCPayServer.Hosting
                 });
             }
 
-
-
-            var initialize = app.ApplicationServices.GetService<Initializer>();
-            initialize.Init();
             app.UseMiddleware<BTCPayMiddleware>();
             return app;
         }

BTCPayServer/Hosting/BTCpayMiddleware.cs

@@ -99,39 +99,73 @@ namespace BTCPayServer.Hosting
 
         private void RewriteHostIfNeeded(HttpContext httpContext)
         {
+            string reverseProxyScheme = null;
+            if (httpContext.Request.Headers.TryGetValue("X-Forwarded-Proto", out StringValues proto))
+            {
+                var scheme = proto.SingleOrDefault();
+                if (scheme != null)
+                {
+                    reverseProxyScheme = scheme;
+                }
+            }
+
+            ushort? reverseProxyPort = null;
+            if (httpContext.Request.Headers.TryGetValue("X-Forwarded-Port", out StringValues port))
+            {
+                var portString = port.SingleOrDefault();
+                if (portString != null && ushort.TryParse(portString, out ushort pp))
+                {
+                    reverseProxyPort = pp;
+                }
+            }
+
             // Make sure that code executing after this point think that the external url has been hit.
             if (_Options.ExternalUrl != null)
             {
-                httpContext.Request.Scheme = _Options.ExternalUrl.Scheme;
+                if (reverseProxyScheme != null && _Options.ExternalUrl.Scheme != reverseProxyScheme)
+                {
+                    if (reverseProxyScheme == "http" && _Options.ExternalUrl.Scheme == "https")
+                        Logs.PayServer.LogWarning($"BTCPay ExternalUrl setting expected to use scheme '{_Options.ExternalUrl.Scheme}' externally, but the reverse proxy uses scheme '{reverseProxyScheme}'");
+                    httpContext.Request.Scheme = reverseProxyScheme;
+                }
+                else
+                { 
+                    httpContext.Request.Scheme = _Options.ExternalUrl.Scheme;
+                }
                 if (_Options.ExternalUrl.IsDefaultPort)
                     httpContext.Request.Host = new HostString(_Options.ExternalUrl.Host);
                 else
-                    httpContext.Request.Host = new HostString(_Options.ExternalUrl.Host, _Options.ExternalUrl.Port);
+                {
+                    if (reverseProxyPort != null && _Options.ExternalUrl.Port != reverseProxyPort.Value)
+                    {
+                        Logs.PayServer.LogWarning($"BTCPay ExternalUrl setting expected to use port '{_Options.ExternalUrl.Port}' externally, but the reverse proxy uses port '{reverseProxyPort.Value}'");
+                        httpContext.Request.Host = new HostString(_Options.ExternalUrl.Host, reverseProxyPort.Value);
+                    }
+                    else
+                    {
+                        httpContext.Request.Host = new HostString(_Options.ExternalUrl.Host, _Options.ExternalUrl.Port);
+                    }
+                }
             }
             // NGINX pass X-Forwarded-Proto and X-Forwarded-Port, so let's use that to have better guess of the real domain
             else
             {
                 ushort? p = null;
-                if (httpContext.Request.Headers.TryGetValue("X-Forwarded-Proto", out StringValues proto))
+                if (reverseProxyScheme != null)
                 {
-                    var scheme = proto.SingleOrDefault();
-                    if (scheme != null)
-                    {
-                        httpContext.Request.Scheme = scheme;
-                        if (scheme == "http")
-                            p = 80;
-                        if (scheme == "https")
-                            p = 443;
-                    }
+                    httpContext.Request.Scheme = reverseProxyScheme;
+                    if (reverseProxyScheme == "http")
+                        p = 80;
+                    if (reverseProxyScheme == "https")
+                        p = 443;
                 }
-                if (httpContext.Request.Headers.TryGetValue("X-Forwarded-Port", out StringValues port))
+
+
+                if (reverseProxyPort != null)
                 {
-                    var portString = port.SingleOrDefault();
-                    if (portString != null && ushort.TryParse(portString, out ushort pp))
-                    {
-                        p = pp;
-                    }
+                    p = reverseProxyPort.Value;
                 }
+
                 if (p.HasValue)
                 {
                     bool isDefault = httpContext.Request.Scheme == "http" && p.Value == 80;

BTCPayServer/Initializer.cs

@@ -1,45 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Controllers;
-using BTCPayServer.Logging;
-using BTCPayServer.Events;
-
-namespace BTCPayServer
-{
-    public class Initializer
-    {
-        EventAggregator _Aggregator;
-        CallbackController _CallbackController;
-        public Initializer(EventAggregator aggregator, 
-            CallbackController callbackController
-            )
-        {
-            _Aggregator = aggregator;
-            _CallbackController = callbackController;
-        }
-        public void Init()
-        {
-            _Aggregator.Subscribe<NBXplorerStateChangedEvent>(async (s, evt) =>
-            {
-                if (evt.NewState == NBXplorerState.Ready)
-                {
-                    s.Unsubscribe();
-                    try
-                    {
-                        var callback = await _CallbackController.GetCallbackBlockUriAsync();
-                        await _CallbackController.RegisterCallbackBlockUriAsync(callback);
-                        Logs.PayServer.LogInformation($"Registering block callback to " + callback);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logs.PayServer.LogError(ex, "Could not register block callback");
-                        s.Resubscribe();
-                    }
-                }
-            });
-        }
-    }
-}

BTCPayServer/Migrations/20171012020112_PendingInvoices.cs

@@ -8,7 +8,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            if (SupportDropColumn(migrationBuilder.ActiveProvider))
+            if (this.SupportDropColumn(migrationBuilder.ActiveProvider))
             {
                 migrationBuilder.DropColumn(
                     name: "Name",
@@ -30,11 +30,6 @@ namespace BTCPayServer.Migrations
                 });
         }
 
-        private bool SupportDropColumn(string activeProvider)
-        {
-            return activeProvider != "Microsoft.EntityFrameworkCore.Sqlite";
-        }
-
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(

BTCPayServer/Migrations/20180106095215_DerivationStrategies.Designer.cs

@@ -0,0 +1,483 @@
+// <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("20180106095215_DerivationStrategies")]
+    partial class DerivationStrategies
+    {
+        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.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>("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.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/20180106095215_DerivationStrategies.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+
+namespace BTCPayServer.Migrations
+{
+    public partial class DerivationStrategies : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "DerivationStrategies",
+                table: "Stores",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DerivationStrategies",
+                table: "Stores");
+        }
+    }
+}

BTCPayServer/Migrations/20180109021122_defaultcrypto.Designer.cs

@@ -0,0 +1,485 @@
+// <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("20180109021122_defaultcrypto")]
+    partial class defaultcrypto
+    {
+        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.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.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/20180109021122_defaultcrypto.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+
+namespace BTCPayServer.Migrations
+{
+    public partial class defaultcrypto : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "DefaultCrypto",
+                table: "Stores",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DefaultCrypto",
+                table: "Stores");
+        }
+    }
+}

BTCPayServer/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -190,6 +190,10 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("Id")
                         .ValueGeneratedOnAdd();
 
+                    b.Property<string>("DefaultCrypto");
+
+                    b.Property<string>("DerivationStrategies");
+
                     b.Property<string>("DerivationStrategy");
 
                     b.Property<int>("SpeedPolicy");

BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Data;
 using BTCPayServer.Services.Invoices;
 using NBitcoin;
 
@@ -9,8 +10,18 @@ namespace BTCPayServer.Models.InvoicingModels
 {
     public class InvoiceDetailsModel
     {
+        public class CryptoPayment
+        {
+            public string CryptoCode { get; set; }
+            public string Due { get; set; }
+            public string Paid { get; set; }
+            public string Address { get; internal set; }
+            public string Rate { get; internal set; }
+            public string PaymentUrl { get; internal set; }
+        }
         public class Payment
         {
+            public string CryptoCode { get; set; }
             public int Confirmations
             {
                 get; set;
@@ -48,10 +59,12 @@ namespace BTCPayServer.Models.InvoicingModels
             get; set;
         }
 
-        public List<Payment> Payments
+        public List<CryptoPayment> CryptoPayments
         {
             get; set;
-        } = new List<Payment>();
+        } = new List<CryptoPayment>();
+
+        public List<Payment> Payments { get; set; } = new List<Payment>();
 
         public string Status
         {
@@ -92,11 +105,6 @@ namespace BTCPayServer.Models.InvoicingModels
             get;
             set;
         }
-        public decimal Rate
-        {
-            get;
-            internal set;
-        }
         public string NotificationUrl
         {
             get;
@@ -107,40 +115,12 @@ namespace BTCPayServer.Models.InvoicingModels
             get;
             set;
         }
-        public string BTC
-        {
-            get;
-            set;
-        }
-        public string BTCDue
-        {
-            get;
-            set;
-        }
-        public string BTCPaid
-        {
-            get;
-            internal set;
-        }
-        public String NetworkFee
-        {
-            get;
-            internal set;
-        }
         public ProductInformation ProductInformation
         {
             get;
             internal set;
         }
-        public BitcoinAddress BitcoinAddress
-        {
-            get;
-            internal set;
-        }
-        public string PaymentUrl
-        {
-            get;
-            set;
-        }
+        public HistoricalAddressInvoiceData[] Addresses { get; set; }
+        public DateTimeOffset MonitoringDate { get; internal set; }
     }
 }

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -7,6 +7,14 @@ namespace BTCPayServer.Models.InvoicingModels
 {
     public class PaymentModel
     {
+        public class AvailableCrypto
+        {
+            public string CryptoCode { get; set; }
+            public string CryptoImage { get; set; }
+            public string Link { get; set; }
+        }
+        public List<AvailableCrypto> AvailableCryptos { get; set; } = new List<AvailableCrypto>();
+        public string CryptoCode { get; set; }
         public string ServerUrl { get; set; }
         public string InvoiceId { get; set; }
         public string BtcAddress { get; set; }
@@ -22,14 +30,14 @@ namespace BTCPayServer.Models.InvoicingModels
         public string ItemDesc { get; set; }
         public string TimeLeft { get; set; }
         public string Rate { get; set; }
-        public string BtcAmount { get; set; }
-        public string TxFees { get; set; }
+        public string OrderAmount { get; set; }
         public string InvoiceBitcoinUrl { get; set; }
-        public string BtcTotalDue { get; set; }
         public int TxCount { get; set; }
         public string BtcPaid { get; set; }
         public string StoreEmail { get; set; }
 
         public string OrderId { get; set; }
+        public string CryptoImage { get; set; }
+        public string NetworkFeeDescription { get; internal set; }
     }
 }

BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace BTCPayServer.Models.StoreViewModels
+{
+    public class DerivationSchemeViewModel
+    {
+        class Format
+        {
+            public string Name { get; set; }
+            public string Value { get; set; }
+        }
+        public DerivationSchemeViewModel()
+        {
+            var btcPay = new Format { Name = "BTCPay", Value = "BTCPay" };
+            DerivationSchemeFormat = btcPay.Value;
+            DerivationSchemeFormats = new SelectList(new Format[]
+            {
+                btcPay,
+                new Format { Name = "Electrum", Value = "Electrum" },
+            }, nameof(btcPay.Value), nameof(btcPay.Name), btcPay);
+        }
+        public string DerivationScheme
+        {
+            get; set;
+        }
+
+        public List<(string KeyPath, string Address)> AddressSamples
+        {
+            get; set;
+        } = new List<(string KeyPath, string Address)>();
+
+        [Display(Name = "Derivation Scheme format")]
+        public string DerivationSchemeFormat
+        {
+            get;
+            set;
+        }
+
+        [Display(Name = "Crypto currency")]
+        public string CryptoCurrency
+        {
+            get;
+            set;
+        }
+
+        public SelectList CryptoCurrencies { get; set; }
+        public SelectList DerivationSchemeFormats { get; set; }
+
+        
+        public void SetCryptoCurrencies(ExplorerClientProvider explorerProvider, string selectedScheme)
+        {
+            var choices = explorerProvider.GetAll().Select(o => new Format() { Name = o.Item1.CryptoCode, Value = o.Item1.CryptoCode }).ToArray();
+            var chosen = choices.FirstOrDefault(f => f.Name == selectedScheme) ?? choices.FirstOrDefault();
+            CryptoCurrencies = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);
+            CryptoCurrency = chosen.Name;
+        }
+    }
+}

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -11,6 +11,11 @@ namespace BTCPayServer.Models.StoreViewModels
 {
     public class StoreViewModel
     {
+        public class DerivationScheme
+        {
+            public string Crypto { get; set; }
+            public string Value { get; set; }
+        }
         class Format
         {
             public string Name { get; set; }
@@ -18,14 +23,9 @@ namespace BTCPayServer.Models.StoreViewModels
         }
         public StoreViewModel()
         {
-            var btcPay = new Format { Name = "BTCPay", Value = "BTCPay" };
-            DerivationSchemeFormat = btcPay.Value;
-            DerivationSchemeFormats = new SelectList(new Format[]
-            {
-                btcPay,
-                new Format { Name = "Electrum", Value = "Electrum" },
-            }, nameof(btcPay.Value), nameof(btcPay.Name), btcPay);
+
         }
+
         public string Id { get; set; }
         [Display(Name = "Store Name")]
         [Required]
@@ -45,19 +45,7 @@ namespace BTCPayServer.Models.StoreViewModels
             set;
         }
 
-        public string DerivationScheme
-        {
-            get; set;
-        }
-
-        [Display(Name = "Derivation Scheme format")]
-        public string DerivationSchemeFormat
-        {
-            get;
-            set;
-        }
-
-        public SelectList DerivationSchemeFormats { get; set; }
+        public List<StoreViewModel.DerivationScheme> DerivationSchemes { get; set; } = new List<StoreViewModel.DerivationScheme>();
 
         [Display(Name = "Payment invalid if transactions fails to confirm after ... minutes")]
         [Range(10, 60 * 24 * 31)]
@@ -79,14 +67,21 @@ namespace BTCPayServer.Models.StoreViewModels
             get; set;
         }
 
-        public List<(string KeyPath, string Address)> AddressSamples
-        {
-            get; set;
-        } = new List<(string KeyPath, string Address)>();
-
         public string StatusMessage
         {
             get; set;
         }
+        public SelectList CryptoCurrencies { get; set; }
+
+        [Display(Name = "Default crypto currency on checkout")]
+        public string DefaultCryptoCurrency { get; set; }
+
+        public void SetCryptoCurrencies(ExplorerClientProvider explorerProvider, string defaultCrypto)
+        {
+            var choices = explorerProvider.GetAll().Select(o => new Format() { Name = o.Item1.CryptoCode, Value = o.Item1.CryptoCode }).ToArray();
+            var chosen = choices.FirstOrDefault(f => f.Name == defaultCrypto) ?? choices.FirstOrDefault();
+            CryptoCurrencies = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);
+            DefaultCryptoCurrency = chosen.Name;
+        }
     }
 }

BTCPayServer/Models/StoreViewModels/StoresViewModel.cs

@@ -32,7 +32,7 @@ namespace BTCPayServer.Models.StoreViewModels
             {
                 get; set;
             }
-            public Money Balance
+            public string[] Balances
             {
                 get; set;
             }

BTCPayServer/Properties/launchSettings.json

@@ -15,7 +15,8 @@
             "commandName": "Project",
             "launchBrowser": true,
             "environmentVariables": {
-                "BTCPAY_EXPLORERURL": "http://127.0.0.1:32838/",
+                "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"
@@ -23,4 +24,4 @@
             "applicationUrl": "http://localhost:14142/"
         }
     }
-}
+}

BTCPayServer/Services/Fees/NBxplorerFeeProvider.cs

@@ -10,43 +10,38 @@ namespace BTCPayServer.Services.Fees
 {
     public class NBXplorerFeeProviderFactory : IFeeProviderFactory
     {
-        public NBXplorerFeeProviderFactory(ExplorerClient explorerClient)
+        public NBXplorerFeeProviderFactory(ExplorerClientProvider explorerClients)
         {
-            if (explorerClient == null)
-                throw new ArgumentNullException(nameof(explorerClient));
-            _ExplorerClient = explorerClient;
+            if (explorerClients == null)
+                throw new ArgumentNullException(nameof(explorerClients));
+            _ExplorerClients = explorerClients;
         }
 
-        private readonly ExplorerClient _ExplorerClient;
-        public ExplorerClient ExplorerClient
-        {
-            get
-            {
-                return _ExplorerClient;
-            }
-        }
+        private readonly ExplorerClientProvider _ExplorerClients;
 
         public FeeRate Fallback { get; set; }
         public int BlockTarget { get; set; }
         public IFeeProvider CreateFeeProvider(BTCPayNetwork network)
         {
-            return new NBXplorerFeeProvider(this);
+            return new NBXplorerFeeProvider(this, _ExplorerClients.GetExplorerClient(network));
         }
     }
     public class NBXplorerFeeProvider : IFeeProvider
     {
-        public NBXplorerFeeProvider(NBXplorerFeeProviderFactory factory)
+        public NBXplorerFeeProvider(NBXplorerFeeProviderFactory parent, ExplorerClient explorerClient)
         {
-            if (factory == null)
-                throw new ArgumentNullException(nameof(factory));
-            _Factory = factory;
+            if (explorerClient == null)
+                throw new ArgumentNullException(nameof(explorerClient));
+            _Factory = parent;
+            _ExplorerClient = explorerClient;
         }
-        private readonly NBXplorerFeeProviderFactory _Factory;
+        NBXplorerFeeProviderFactory _Factory;
+        ExplorerClient _ExplorerClient;
         public async Task<FeeRate> GetFeeRateAsync()
         {
             try
             {
-                return (await _Factory.ExplorerClient.GetFeeRateAsync(_Factory.BlockTarget).ConfigureAwait(false)).FeeRate;
+                return (await _ExplorerClient.GetFeeRateAsync(_Factory.BlockTarget).ConfigureAwait(false)).FeeRate;
             }
             catch (NBXplorerException ex) when (ex.Error.HttpCode == 400 && ex.Error.Code == "fee-estimation-unavailable")
             {

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -153,11 +153,64 @@ namespace BTCPayServer.Services.Invoices
             get;
             set;
         }
+
+        [Obsolete("Use GetDerivationStrategies instead")]
         public string DerivationStrategy
         {
             get;
             set;
         }
+
+        [Obsolete("Use GetDerivationStrategies instead")]
+        public string DerivationStrategies
+        {
+            get;
+            set;
+        }
+
+        public IEnumerable<DerivationStrategy> GetDerivationStrategies(BTCPayNetworkProvider networks)
+        {
+#pragma warning disable CS0618
+            bool btcReturned = false;
+            if (!string.IsNullOrEmpty(DerivationStrategies))
+            {
+                JObject strategies = JObject.Parse(DerivationStrategies);
+                foreach (var strat in strategies.Properties())
+                {
+                    var network = networks.GetNetwork(strat.Name);
+                    if (network != null)
+                    {
+                        if (network == networks.BTC && btcReturned)
+                            btcReturned = true;
+                        yield return BTCPayServer.DerivationStrategy.Parse(strat.Value.Value<string>(), network);
+                    }
+                }
+            }
+
+            if (!btcReturned && !string.IsNullOrEmpty(DerivationStrategy))
+            {
+                if (networks.BTC != null)
+                {
+                    yield return BTCPayServer.DerivationStrategy.Parse(DerivationStrategy, networks.BTC);
+                }
+            }
+#pragma warning restore CS0618
+        }
+
+        internal void SetDerivationStrategies(IEnumerable<DerivationStrategy> derivationStrategies)
+        {
+            JObject obj = new JObject();
+            foreach (var strat in derivationStrategies)
+            {
+                obj.Add(strat.Network.CryptoCode, new JValue(strat.DerivationStrategyBase.ToString()));
+#pragma warning disable CS0618
+                if (strat.Network.IsBTC)
+                    DerivationStrategy = strat.DerivationStrategyBase.ToString();
+            }
+            DerivationStrategies = JsonConvert.SerializeObject(obj);
+#pragma warning restore CS0618
+        }
+
         public string Status
         {
             get;
@@ -229,6 +282,7 @@ namespace BTCPayServer.Services.Invoices
             get;
             set;
         }
+        public bool ExtendedNotifications { get; set; }
 
         public bool IsExpired()
         {
@@ -424,47 +478,56 @@ namespace BTCPayServer.Services.Invoices
         public Money TxFee { get; set; }
         [JsonProperty(PropertyName = "depositAddress")]
         public string DepositAddress { get; set; }
-        
+
         public CryptoDataAccounting Calculate()
         {
             var cryptoData = ParentEntity.GetCryptoData();
-            var totalDue = Money.Coins(ParentEntity.ProductInformation.Price / Rate) + TxFee;
+            var totalDue = Money.Coins(ParentEntity.ProductInformation.Price / Rate);
             var paid = Money.Zero;
             var cryptoPaid = Money.Zero;
-            int txCount = 1;
+
+            var paidTxFee = Money.Zero;
+            bool paidEnough = totalDue <= paid;
+            int txCount = 0;
             var payments =
                 ParentEntity.Payments
                 .Where(p => p.Accounted)
                 .OrderByDescending(p => p.ReceivedTime)
                 .Select(_ =>
                 {
+                    var txFee = _.GetValue(cryptoData, CryptoCode, cryptoData[_.GetCryptoCode()].TxFee);
                     paid += _.GetValue(cryptoData, CryptoCode);
-                    if (CryptoCode == _.GetCryptoCode())
-                        cryptoPaid += _.GetValue();
-                    return _;
-                })
-                .TakeWhile(_ =>
-                {
-                    var paidEnough = totalDue <= paid;
-                    if (!paidEnough && _.GetCryptoCode() == CryptoCode)
+                    if (!paidEnough)
                     {
-                        txCount++;
-                        totalDue += TxFee;
+                        totalDue += txFee;
+                        paidTxFee += txFee;
                     }
-                    return !paidEnough;
+                    paidEnough |= totalDue <= paid;
+                    if (CryptoCode == _.GetCryptoCode())
+                    {
+                        cryptoPaid += _.GetValue();
+                        txCount++;
+                    }
+                    return _;
                 })
                 .ToArray();
 
+            if (!paidEnough)
+            {
+                txCount++;
+                totalDue += TxFee;
+                paidTxFee += TxFee;
+            }
             var accounting = new CryptoDataAccounting();
             accounting.TotalDue = totalDue;
             accounting.Paid = paid;
             accounting.TxCount = txCount;
             accounting.CryptoPaid = cryptoPaid;
             accounting.Due = Money.Max(accounting.TotalDue - accounting.Paid, Money.Zero);
-            accounting.NetworkFee = TxFee * txCount;
+            accounting.NetworkFee = paidTxFee;
             return accounting;
         }
-        
+
     }
 
     public class AccountedPaymentEntity
@@ -519,20 +582,21 @@ namespace BTCPayServer.Services.Invoices
             return Output.Value;
 #pragma warning restore CS0618
         }
-        public Money GetValue(Dictionary<string, CryptoData> cryptoData, string cryptoCode)
+        public Money GetValue(Dictionary<string, CryptoData> cryptoData, string cryptoCode, Money value = null)
         {
 #pragma warning disable CS0618
+            value = value ?? Output.Value;
+#pragma warning restore CS0618
             var to = cryptoCode;
             var from = GetCryptoCode();
             if (to == from)
-                return Output.Value;
+                return value;
             var fromRate = cryptoData[from].Rate;
             var toRate = cryptoData[to].Rate;
 
-            var fiatValue = fromRate * Output.Value.ToDecimal(MoneyUnit.BTC);
+            var fiatValue = fromRate * value.ToDecimal(MoneyUnit.BTC);
             var otherCurrencyValue = toRate == 0 ? 0.0m : fiatValue / toRate;
             return Money.Coins(otherCurrencyValue);
-#pragma warning restore CS0618
         }
 
         public string GetCryptoCode()

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -70,11 +70,11 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
-        public async Task<string> GetInvoiceIdFromScriptPubKey(Script scriptPubKey)
+        public async Task<string> GetInvoiceIdFromScriptPubKey(Script scriptPubKey, string cryptoCode)
         {
             using (var db = _ContextFactory.CreateContext())
             {
-                var result = await db.AddressInvoices.FindAsync(scriptPubKey.Hash.ToString());
+                var result = await db.AddressInvoices.FindAsync(scriptPubKey.Hash.ToString() + "#" + cryptoCode);
                 return result?.InvoiceDataId;
             }
         }
@@ -130,19 +130,14 @@ namespace BTCPayServer.Services.Invoices
                         throw new InvalidOperationException("CryptoCode unsupported");
                     context.AddressInvoices.Add(new AddressInvoiceData()
                     {
-                        Address = BitcoinAddress.Create(cryptoData.DepositAddress, network.NBitcoinNetwork).ScriptPubKey.Hash.ToString(),
                         InvoiceDataId = invoice.Id,
                         CreatedTime = DateTimeOffset.UtcNow,
-                    });
+                    }.SetHash(BitcoinAddress.Create(cryptoData.DepositAddress, network.NBitcoinNetwork).ScriptPubKey.Hash, network.CryptoCode));
                     context.HistoricalAddressInvoices.Add(new HistoricalAddressInvoiceData()
                     {
                         InvoiceDataId = invoice.Id,
-                        Address = cryptoData.DepositAddress,
-#pragma warning disable CS0618
-                        CryptoCode = cryptoData.CryptoCode,
-#pragma warning restore CS0618
                         Assigned = DateTimeOffset.UtcNow
-                    });
+                    }.SetAddress(cryptoData.DepositAddress, cryptoData.CryptoCode));
                     textSearch.Add(cryptoData.DepositAddress);
                     textSearch.Add(cryptoData.Calculate().TotalDue.ToString());
                 }
@@ -185,21 +180,22 @@ namespace BTCPayServer.Services.Invoices
                 currencyData.DepositAddress = bitcoinAddress.ToString();
 
 #pragma warning disable CS0618
-                if (network.CryptoCode == "BTC")
+                if (network.IsBTC)
                 {
                     invoiceEntity.DepositAddress = currencyData.DepositAddress;
                 }
-#pragma warning disable CS0618
+#pragma warning restore CS0618
                 invoiceEntity.SetCryptoData(cryptoData);
                 invoice.Blob = ToBytes(invoiceEntity);
 
-                context.AddressInvoices.Add(new AddressInvoiceData() { Address = bitcoinAddress.ScriptPubKey.Hash.ToString(), 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()
                 {
                     InvoiceDataId = invoiceId,
-                    Address = bitcoinAddress.ToString(),
                     Assigned = DateTimeOffset.UtcNow
-                });
+                }.SetAddress(bitcoinAddress.ToString(), network.CryptoCode));
 
                 await context.SaveChangesAsync();
                 AddToTextSearch(invoice.Id, bitcoinAddress.ToString());
@@ -215,7 +211,7 @@ namespace BTCPayServer.Services.Invoices
                     continue;
                 var historical = new HistoricalAddressInvoiceData();
                 historical.InvoiceDataId = invoiceId;
-                historical.Address = address.Value.DepositAddress;
+                historical.SetAddress(address.Value.DepositAddress, cryptoCode);
                 historical.UnAssigned = DateTimeOffset.UtcNow;
                 context.Attach(historical);
                 context.Entry(historical).Property(o => o.UnAssigned).IsModified = true;
@@ -329,13 +325,12 @@ namespace BTCPayServer.Services.Invoices
             }
             if (invoice.AddressInvoices != null)
             {
-                entity.AvailableAddressHashes = invoice.AddressInvoices.Select(a => a.Address).ToHashSet();
+                entity.AvailableAddressHashes = invoice.AddressInvoices.Select(a => a.GetHash() + a.GetCryptoCode()).ToHashSet();
             }
             return entity;
         }
 
 
-
         public async Task<InvoiceEntity[]> GetInvoices(InvoiceQuery queryObject)
         {
             using (var context = _ContextFactory.CreateContext())
@@ -344,7 +339,8 @@ namespace BTCPayServer.Services.Invoices
                     .Invoices
                     .Include(o => o.Payments)
                     .Include(o => o.RefundAddresses);
-
+                if(queryObject.IncludeAddresses)
+                    query = query.Include(o => o.HistoricalAddressInvoices).Include(o => o.AddressInvoices);
                 if (!string.IsNullOrEmpty(queryObject.InvoiceId))
                 {
                     query = query.Where(i => i.Id == queryObject.InvoiceId);
@@ -423,14 +419,17 @@ namespace BTCPayServer.Services.Invoices
             AddToTextSearch(invoiceId, addresses.Select(a => a.ToString()).ToArray());
         }
 
-        public async Task<PaymentEntity> AddPayment(string invoiceId, Coin receivedCoin)
+        public async Task<PaymentEntity> AddPayment(string invoiceId, Coin receivedCoin, string cryptoCode)
         {
             using (var context = _ContextFactory.CreateContext())
             {
                 PaymentEntity entity = new PaymentEntity
                 {
                     Outpoint = receivedCoin.Outpoint,
+#pragma warning disable CS0618
                     Output = receivedCoin.TxOut,
+                    CryptoCode = cryptoCode,
+#pragma warning restore CS0618
                     ReceivedTime = DateTime.UtcNow
                 };
 
@@ -549,5 +548,6 @@ namespace BTCPayServer.Services.Invoices
             get;
             set;
         }
+        public bool IncludeAddresses { get; set; }
     }
 }

BTCPayServer/Services/Rates/CachedDefaultRateProviderFactory.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class CachedDefaultRateProviderFactory : IRateProviderFactory
+    {
+        IMemoryCache _Cache;
+        ConcurrentDictionary<string, IRateProvider> _Providers = new ConcurrentDictionary<string, IRateProvider>();
+        public CachedDefaultRateProviderFactory(IMemoryCache cache)
+        {
+            if (cache == null)
+                throw new ArgumentNullException(nameof(cache));
+            _Cache = cache;
+        }
+
+        public TimeSpan CacheSpan { get; set; } = TimeSpan.FromMinutes(1.0);
+        public IRateProvider GetRateProvider(BTCPayNetwork network)
+        {
+            return _Providers.GetOrAdd(network.CryptoCode, new CachedRateProvider(network.CryptoCode, network.DefaultRateProvider, _Cache) { CacheSpan = CacheSpan });
+        }
+    }
+}

BTCPayServer/Services/Rates/CachedRateProvider.cs

@@ -10,8 +10,9 @@ namespace BTCPayServer.Services.Rates
     {
         private IRateProvider _Inner;
         private IMemoryCache _MemoryCache;
+        private string _CryptoCode;
 
-        public CachedRateProvider(IRateProvider inner, IMemoryCache memoryCache)
+        public CachedRateProvider(string cryptoCode, IRateProvider inner, IMemoryCache memoryCache)
         {
             if (inner == null)
                 throw new ArgumentNullException(nameof(inner));
@@ -19,6 +20,7 @@ namespace BTCPayServer.Services.Rates
                 throw new ArgumentNullException(nameof(memoryCache));
             this._Inner = inner;
             this._MemoryCache = memoryCache;
+            this._CryptoCode = cryptoCode;
         }
 
         public TimeSpan CacheSpan
@@ -29,7 +31,7 @@ namespace BTCPayServer.Services.Rates
 
         public Task<decimal> GetRateAsync(string currency)
         {
-            return _MemoryCache.GetOrCreateAsync("CURR_" + currency, (ICacheEntry entry) =>
+            return _MemoryCache.GetOrCreateAsync("CURR_" + currency + "_" + _CryptoCode, (ICacheEntry entry) =>
             {
                 entry.AbsoluteExpiration = DateTimeOffset.UtcNow + CacheSpan;
                 return _Inner.GetRateAsync(currency);

BTCPayServer/Services/Rates/CoinAverageRateProvider.cs

@@ -19,6 +19,13 @@ namespace BTCPayServer.Services.Rates
     {
         static HttpClient _Client = new HttpClient();
 
+        public CoinAverageRateProvider(string cryptoCode)
+        {
+            CryptoCode = cryptoCode ?? "BTC";
+        }
+
+        public string CryptoCode { get; set; }
+
         public string Market
         {
             get; set;
@@ -51,8 +58,8 @@ namespace BTCPayServer.Services.Rates
                 resp.EnsureSuccessStatusCode();
                 var rates = JObject.Parse(await resp.Content.ReadAsStringAsync());
                 return rates.Properties()
-                              .Where(p => p.Name.StartsWith("BTC", StringComparison.OrdinalIgnoreCase))
-                              .ToDictionary(p => p.Name.Substring(3, 3), p => ToDecimal(p.Value["last"]));
+                              .Where(p => p.Name.StartsWith(CryptoCode, StringComparison.OrdinalIgnoreCase))
+                              .ToDictionary(p => p.Name.Substring(CryptoCode.Length, p.Name.Length - CryptoCode.Length), p => ToDecimal(p.Value["last"]));
             }
         }
 

BTCPayServer/Services/Rates/IRateProviderFactory.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services.Rates
+{
+    public interface IRateProviderFactory
+    {
+        IRateProvider GetRateProvider(BTCPayNetwork network);
+    }
+}

BTCPayServer/Services/Wallets/BTCPayWallet.cs

@@ -7,16 +7,28 @@ using System.Text;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
+using System.Threading;
+using NBXplorer.Models;
 
 namespace BTCPayServer.Services.Wallets
 {
+    public class KnownState
+    {
+        public uint256 UnconfirmedHash { get; set; }
+        public uint256 ConfirmedHash { get; set; }
+    }
+    public class GetCoinsResult
+    {
+        public Coin[] Coins { get; set; }
+        public KnownState State { get; set; }
+        public DerivationStrategy Strategy { get; set; }
+    }
     public class BTCPayWallet
     {
-        private ExplorerClient _Client;
-        private Serializer _Serializer;
+        private ExplorerClientProvider _Client;
         ApplicationDbContextFactory _DBFactory;
 
-        public BTCPayWallet(ExplorerClient client, ApplicationDbContextFactory factory)
+        public BTCPayWallet(ExplorerClientProvider client, ApplicationDbContextFactory factory)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));
@@ -24,35 +36,52 @@ namespace BTCPayServer.Services.Wallets
                 throw new ArgumentNullException(nameof(factory));
             _Client = client;
             _DBFactory = factory;
-            _Serializer = new NBXplorer.Serializer(_Client.Network);
         }
 
 
-        public async Task<BitcoinAddress> ReserveAddressAsync(DerivationStrategyBase derivationStrategy)
+        public async Task<BitcoinAddress> ReserveAddressAsync(DerivationStrategy derivationStrategy)
         {
-            var pathInfo = await _Client.GetUnusedAsync(derivationStrategy, DerivationFeature.Deposit, 0, true).ConfigureAwait(false);
-            return pathInfo.ScriptPubKey.GetDestinationAddress(_Client.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(DerivationStrategyBase derivationStrategy)
+        public async Task TrackAsync(DerivationStrategy derivationStrategy)
         {
-            await _Client.TrackAsync(derivationStrategy);
+            var client = _Client.GetExplorerClient(derivationStrategy.Network);
+            await client.TrackAsync(derivationStrategy.DerivationStrategyBase);
         }
 
-        private byte[] ToBytes<T>(T obj)
+        public Task<TransactionResult> GetTransactionAsync(BTCPayNetwork network, uint256 txId, CancellationToken cancellation = default(CancellationToken))
         {
-            return ZipUtils.Zip(_Serializer.ToString(obj));
+            var client = _Client.GetExplorerClient(network);
+            return client.GetTransactionAsync(txId, cancellation);
         }
 
-        public Task BroadcastTransactionsAsync(List<Transaction> transactions)
+        public async Task<GetCoinsResult> GetCoins(DerivationStrategy strategy, KnownState state, CancellationToken cancellation = default(CancellationToken))
         {
-            var tasks = transactions.Select(t => _Client.BroadcastAsync(t)).ToArray();
+            var client = _Client.GetExplorerClient(strategy.Network);
+            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()
+            {
+                Coins = utxos,
+                State = new KnownState() { ConfirmedHash = changes.Confirmed.Hash, UnconfirmedHash = changes.Unconfirmed.Hash },
+                Strategy = strategy,
+            };
+        }
+
+        public Task BroadcastTransactionsAsync(BTCPayNetwork network, List<Transaction> transactions)
+        {
+            var client = _Client.GetExplorerClient(network);
+            var tasks = transactions.Select(t => client.BroadcastAsync(t)).ToArray();
             return Task.WhenAll(tasks);
         }
 
-        public async Task<Money> GetBalance(DerivationStrategyBase derivationStrategy)
+        public async Task<Money> GetBalance(DerivationStrategy derivationStrategy)
         {
-            var result = await _Client.SyncAsync(derivationStrategy, null, true);
+            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();

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -106,11 +106,11 @@
                                         <!---->
                                         <div class="single-item-order__right">
                                             <div class="single-item-order__right__btc-price" id="buyerTotalBtcAmount">
-                                                <span>{{ srvModel.btcDue }} BTC</span>
+                                                <span>{{ srvModel.btcDue }} {{ srvModel.cryptoCode }}</span>
                                             </div>
                                             <!---->
                                             <div class="single-item-order__right__ex-rate">
-                                                1 BTC = {{ srvModel.rate }}
+                                                1 {{ srvModel.cryptoCode }} = {{ srvModel.rate }}
                                             </div>
                                             <!---->
                                         </div>
@@ -123,24 +123,24 @@
                                         <div class="line-items">
                                             <!---->
                                             <div class="line-items__item">
-                                                <div class="line-items__item__label" i18n="">Payment Amount</div>
-                                                <div class="line-items__item__value">{{srvModel.btcAmount}} BTC</div>
+                                                <div class="line-items__item__label" i18n="">Order Amount</div>
+                                                <div class="line-items__item__value">{{srvModel.orderAmount}} {{ srvModel.cryptoCode }}</div>
                                             </div>
                                             <div class="line-items__item">
                                                 <div class="line-items__item__label">
                                                     <span i18n="">Network Cost</span>
                                                 </div>
-                                                <div class="line-items__item__value" i18n="">{{srvModel.txCount }} transaction x {{ srvModel.txFees}} BTC</div>
+                                                <div class="line-items__item__value" i18n="">{{srvModel.networkFeeDescription }}</div>
                                             </div>
                                             <div class="line-items__item">
                                                 <div class="line-items__item__label">
                                                     <span i18n="">Already Paid</span>
                                                 </div>
-                                                <div class="line-items__item__value" i18n="">-{{srvModel.btcPaid }} BTC</div>
+                                                <div class="line-items__item__value" i18n="">-{{srvModel.btcPaid }} {{ srvModel.cryptoCode }}</div>
                                             </div>
                                             <div class="line-items__item line-items__item--total">
                                                 <div class="line-items__item__label" i18n="">Due	</div>
-                                                <div class="line-items__item__value">{{srvModel.btcDue}} BTC</div>
+                                                <div class="line-items__item__value">{{srvModel.btcDue}} {{ srvModel.cryptoCode }}</div>
                                             </div>
                                             <!---->
                                         </div>
@@ -158,7 +158,8 @@
                                 <div adjust-height="" class="payment-box">
                                     <div class="bp-view payment scan" id="scan">
                                         <div class="payment__scan">
-                                            <qrcode :val="srvModel.btcAddress" :size="256" bg-color="#f5f5f7" fg-color="#000" />
+                                            <img :src="srvModel.cryptoImage" style="position: absolute; height:64px; width:64px; left:118px; top:96px;" />
+                                            <qrcode :val="srvModel.invoiceBitcoinUrl" :size="256" bg-color="#f5f5f7" fg-color="#000" />
                                         </div>
                                         <div class="payment__details__instruction__open-wallet">
                                             <a class="payment__details__instruction__open-wallet__btn action-button" v-bind:href="srvModel.invoiceBitcoinUrl">
@@ -311,7 +312,7 @@
                                                 <bp-refund-address name="refundAddress" ngmodel="" class="ng-untouched ng-pristine ng-invalid">
                                                     <div class="bp-refund-address">
                                                         <div class="bitcoin-logo">
-                                                            <div><img src="~/imlegacy/bitcoin-symbol.svg"></div>
+                                                            <div><img src="@Model.CryptoImage"></div>
                                                         </div>
                                                         <input class="bp-input {'not-empty': addressValue.length &gt; 0} ng-untouched ng-pristine ng-valid" id="refund-address-input" name="refundAddress" ngclass="{'not-empty': addressValue.length &gt; 0}">
                                                     </div>
@@ -336,14 +337,14 @@
                                     </div>
                                     <div class="bp-view payment manual-flow" id="copy">
                                         <div class="manual__step-two__instructions">
-                                            <span i18n="">To complete your payment, please send {{ srvModel.btcDue }} BTC to the address below.</span>
+                                            <span i18n="">To complete your payment, please send {{ srvModel.btcDue }} {{ srvModel.cryptoCode }} to the address below.</span>
                                         </div>
                                         <div class="manual-box flipped" style="margin-bottom: 30px;">
                                             <div class="manual-box__amount">
                                                 <div class="manual-box__amount__label label" i18n="">Amount</div>
                                                 <!---->
                                                 <div class="manual-box__amount__value copy-cursor" ngxclipboard="">
-                                                    <span>{{srvModel.btcDue}}</span> BTC
+                                                    <span>{{srvModel.btcDue}}</span> {{ srvModel.cryptoCode }}
                                                     <div class="copied-label">
                                                         <span i18n="">Copied</span>
                                                     </div>
@@ -360,7 +361,7 @@
                                                         <div class="manual-box__address__value copy-cursor" ngxclipboard="">
                                                             <div class="manual-box__address__wrapper">
                                                                 <div class="manual-box__address__wrapper__logo">
-                                                                    <img src="~/imlegacy/bitcoin-symbol.svg">
+                                                                    <img :src="srvModel.cryptoImage" />
                                                                 </div>
                                                                 <div class="manual-box__address__wrapper__value">{{srvModel.btcAddress}}</div>
                                                             </div>
@@ -605,8 +606,17 @@
                         </div>
                     </div>
                     <div class="footer">
-                        <div class="footer__item no-hover" style="opacity: 1; padding-left: 0; max-height: 21px; display: none;">
-                            <div></div>
+                        <div class="footer__item no-hover" style="opacity: 1; padding-left: 0; max-height: 21px;">
+                            @if(Model.AvailableCryptos.Count > 1)
+                            {
+                                <div style="text-align:center">Accepted here</div>
+                                <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>
+                                    }
+                                </div>
+                            }
                         </div>
                     </div>
                 </div>

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -49,6 +49,10 @@
                         <th>Expiration date</th>
                         <td>@Model.ExpirationDate</td>
                     </tr>
+                    <tr>
+                        <th>Monitoring date</th>
+                        <td>@Model.MonitoringDate</td>
+                    </tr>
                     <tr>
                         <th>Status</th>
                         <td>@Model.Status</td>
@@ -61,42 +65,14 @@
                         <th>Order Id</th>
                         <td>@Model.OrderId</td>
                     </tr>
-                    <tr>
-                        <th>Rate</th>
-                        <td>@Model.Rate</td>
-                    </tr>
                     <tr>
                         <th>Total fiat due</th>
                         <td>@Model.Fiat</td>
                     </tr>
-                    <tr>
-                        <th>Network Fee</th>
-                        <td>@Model.NetworkFee</td>
-                    </tr>
-                    <tr>
-                        <th>Total crypto due</th>
-                        <td>@Model.BTC</td>
-                    </tr>
-                    <tr>
-                        <th>Crypto due</th>
-                        <td>@Model.BTCDue</td>
-                    </tr>
-                    <tr>
-                        <th>Crypto paid</th>
-                        <td>@Model.BTCPaid</td>
-                    </tr>
                     <tr>
                         <th>Notification Url</th>
                         <td>@Model.NotificationUrl</td>
                     </tr>
-                    <tr>
-                        <th>Payment address</th>
-                        <td>@Model.BitcoinAddress</td>
-                    </tr>
-                    <tr>
-                        <th>Payment Url</th>
-                        <td class="overflowbox"><a href="@Model.PaymentUrl">@Model.PaymentUrl</a></td>
-                    </tr>
                 </table>
             </div>
 
@@ -161,17 +137,39 @@
         </div>
         <div class="row">
             <div class="col-md-12">
-                <h3>Payments</h3>
-                <div class="form-group">
-                    <form asp-action="Invoice" method="post">
-                        <button type="submit" name="command" class="btn btn-success" value="refresh" title="Refresh State">
-                            Refresh state
-                        </button>
-                    </form>
-                </div>
+                <h3>Paid summary</h3>
                 <table class="table">
                     <thead class="thead-inverse">
                         <tr>
+                            <th>Crypto</th>
+                            <th>Rate</th>
+                            <th>Paid</th>
+                            <th>Due</th>
+                            <th>Address</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach(var payment in Model.CryptoPayments)
+                    {
+                        <tr>
+                            <td>@payment.CryptoCode</td>
+                            <td>@payment.Rate</td>
+                            <td>@payment.Paid</td>
+                            <td>@payment.Due</td>
+                            <td>@payment.Address</td>
+                        </tr>
+                }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <h3>Payments</h3>
+                <table class="table">
+                    <thead class="thead-inverse">
+                        <tr>
+                            <th>Crypto</th>
                             <th>Date</th>
                             <th>Deposit address</th>
                             <th>Transaction Id</th>
@@ -180,14 +178,39 @@
                     </thead>
                     <tbody>
                         @foreach(var payment in Model.Payments)
-                        {
-                            <tr>
-                                <td>@payment.ReceivedTime</td>
-                                <td>@payment.DepositAddress</td>
-                                <td><a href="@payment.TransactionLink" target="_blank">@payment.TransactionId</a></td>
-                                <td>@payment.Confirmations</td>
-                            </tr>
-                        }
+                    {
+                        <tr>
+                            <td>@payment.CryptoCode</td>
+                            <td>@payment.ReceivedTime</td>
+                            <td>@payment.DepositAddress</td>
+                            <td><a href="@payment.TransactionLink" target="_blank">@payment.TransactionId</a></td>
+                            <td>@payment.Confirmations</td>
+                        </tr>
+                }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <h3>Addresses</h3>
+                <table class="table">
+                    <thead class="thead-inverse">
+                        <tr>
+                            <th>Crypto</th>
+                            <th>Address</th>
+                            <th>Current</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach(var address in Model.Addresses)
+                    {
+                        <tr>
+                            <td>@address.GetCryptoCode()</td>
+                            <td>@address.GetAddress()</td>
+                            <td>@(!address.UnAssigned.HasValue)</td>
+                        </tr>
+                }
                     </tbody>
                 </table>
             </div>

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -2,13 +2,7 @@
 @inject UserManager<ApplicationUser> UserManager
 @inject RoleManager<IdentityRole> RoleManager
 @inject BTCPayServer.Services.BTCPayServerEnvironment env
-@inject BTCPayServer.NBXplorerWaiterAccessor waiter
-
-@{
-    var waiterState = waiter.Instance.State;
-    var lastStatus = waiter.Instance.LastStatus;
-    var verificationProgress = waiter.Instance.LastStatus?.BitcoinStatus != null ? waiter.Instance.LastStatus.BitcoinStatus.VerificationProgress * 100 : 0.0;
-}
+@inject BTCPayServer.HostedServices.NBXplorerDashboard dashboard
 
 <!DOCTYPE html>
 <html lang="en">
@@ -87,31 +81,7 @@
     @RenderBody()
 
 
-    @if(waiterState == NBXplorerState.NotConnected)
-    {
-        <!-- Modal -->
-        <div id="no-nbxplorer" class="modal fade" role="dialog">
-            <div class="modal-dialog">
-
-                <!-- Modal content-->
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h4 class="modal-title">NBXplorer is not running</h4>
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    </div>
-                    <div class="modal-body">
-                        <p>NBXplorer is not running, BTCPay Server will not be functional.</p>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    }
-
-    @if(waiterState == NBXplorerState.Synching && lastStatus.BitcoinStatus != null)
+    @if(!dashboard.IsFullySynched())
     {
         <!-- Modal -->
         <div id="synching-modal" class="modal fade" role="dialog">
@@ -120,41 +90,57 @@
                 <!-- Modal content-->
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h4 class="modal-title">Bitcoin Core node is synching...</h4>
+                        <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>Bitcoin Core is synching (Chain height: @lastStatus.BitcoinStatus.Headers, Block height: @lastStatus.BitcoinStatus.Blocks)</p>
-                        <p>BTCPay Server will not work correctly until it is over.</p>
-                        <div class="progress">
-                            <div class="progress-bar" role="progressbar" aria-valuenow="@((int)verificationProgress)"
-                                 aria-valuemin="0" aria-valuemax="100" style="width:@((int)verificationProgress)%">
-                                @((int)verificationProgress)%
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    }
-    else if(waiterState == NBXplorerState.Synching && lastStatus.BitcoinStatus == null)
-    {
-        <!-- 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">Bitcoin Core node is starting...</h4>
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    </div>
-                    <div class="modal-body">
-                        <p>Satoshi is rolling the blocks forward... Time to drink a cup of tea?</p>
+                        <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>
@@ -182,15 +168,7 @@
     <!-- Custom scripts for this template -->
     <script src="~/js/creative.js"></script>
 
-    @if(waiterState == NBXplorerState.NotConnected)
-    {
-        <script type="text/javascript">
-            $(function () {
-                $("#no-nbxplorer").modal();
-            });
-        </script>
-    }
-    @if(waiterState == NBXplorerState.Synching)
+    @if(!dashboard.IsFullySynched())
     {
         <script type="text/javascript">
             $(function () {

BTCPayServer/Views/Stores/AddDerivationScheme.cshtml

@@ -0,0 +1,106 @@
+@model DerivationSchemeViewModel
+@{
+    Layout = "../Shared/_NavLayout.cshtml";
+    ViewData["Title"] = "Add derivation scheme";
+    ViewData.AddActivePage(BTCPayServer.Views.Stores.StoreNavPages.Index);
+}
+
+<h4>@ViewData["Title"]</h4>
+
+<div class="row">
+    <div class="col-md-6">
+        <div asp-validation-summary="All" class="text-danger"></div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        <form method="post">
+            <div class="form-group">
+                <h5>Derivation Scheme</h5>
+                @if(Model.AddressSamples.Count == 0)
+        {
+            <span>The DerivationScheme represents the destination of the funds received by your invoice. It is generated by your wallet software. Please, verify that you are generating the right addresses by clicking on 'Check ExtPubKey'</span>
+}
+            </div>
+            <div class="form-group">
+                <label asp-for="CryptoCurrency"></label>
+                <select asp-for="CryptoCurrency" asp-items="Model.CryptoCurrencies" class="form-control"></select>
+            </div>
+
+            <div class="form-group">
+                <input asp-for="DerivationScheme" class="form-control" />
+                <span asp-validation-for="DerivationScheme" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="DerivationSchemeFormat"></label>
+                <select asp-for="DerivationSchemeFormat" asp-items="Model.DerivationSchemeFormats" class="form-control"></select>
+            </div>
+            <div class="form-group">
+                @if(Model.AddressSamples.Count == 0)
+        {
+            <span>BTCPay format memo</span>
+            <table class="table">
+                <thead class="thead-inverse">
+                    <tr>
+                        <th>Address type</th>
+                        <th>Example</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>P2WPKH</td>
+                        <td>xpub</td>
+                    </tr>
+                    <tr>
+                        <td>P2SH-P2WPKH</td>
+                        <td>xpub-[p2sh]</td>
+                    </tr>
+                    <tr>
+                        <td>P2PKH</td>
+                        <td>xpub-[legacy]</td>
+                    </tr>
+                    <tr>
+                        <td>Multi-sig P2WSH</td>
+                        <td>2-of-xpub1-xpub2</td>
+                    </tr>
+                    <tr>
+                        <td>Multi-sig P2SH-P2WSH</td>
+                        <td>2-of-xpub1-xpub2-[p2sh]</td>
+                    </tr>
+                    <tr>
+                        <td>Multi-sig P2SH</td>
+                        <td>2-of-xpub1-xpub2-[legacy]</td>
+                    </tr>
+                </tbody>
+            </table>
+}
+else
+{
+        <table class="table">
+            <thead class="thead-inverse">
+                <tr>
+                    <th>Key path</th>
+                    <th>Address</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach(var sample in Model.AddressSamples)
+        {
+            <tr>
+                <td>@sample.KeyPath</td>
+                <td>@sample.Address</td>
+            </tr>
+}
+            </tbody>
+        </table>
+}
+            </div>
+            <button name="command" type="submit" class="btn btn-success" value="Save">Save</button>
+            <button name="command" type="submit" class="btn btn-default" value="Check">Check ExtPubKey</button>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @await Html.PartialAsync("_ValidationScriptsPartial")
+}

BTCPayServer/Views/Stores/ListStores.cshtml

@@ -27,7 +27,7 @@
                     <tr>
                         <th>Name</th>
                         <th>Website</th>
-                        <th>Balance</th>
+                        <th>Balances</th>
                         <th>Actions</th>
                     </tr>
                 </thead>
@@ -42,7 +42,16 @@
                                     <a href="@store.WebSite">@store.WebSite</a>
                                 }
                             </td>
-                            <td>@store.Balance</td>
+                            <td>
+                                @for(int i = 0; i < store.Balances.Length; i++)
+                                {
+                                    <span>@store.Balances[i]</span>
+                                    if(i != store.Balances.Length - 1)
+                                    {
+                                        <br />
+                                    }
+                                }
+                            </td>
                             <td><a asp-action="UpdateStore" asp-route-storeId="@store.Id">Settings</a> - <a asp-action="DeleteStore" asp-route-storeId="@store.Id">Remove</a></td>
                         </tr>
                     }

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -35,6 +35,10 @@
                 <input asp-for="StoreWebsite" class="form-control" />
                 <span asp-validation-for="StoreWebsite" class="text-danger"></span>
             </div>
+            <div class="form-group">
+                <label asp-for="DefaultCryptoCurrency"></label>
+                <select asp-for="DefaultCryptoCurrency" asp-items="Model.CryptoCurrencies" class="form-control"></select>
+            </div>
             <div class="form-group">
                 <label asp-for="NetworkFee"></label>
                 <input asp-for="NetworkFee" type="checkbox" class="form-check" />
@@ -55,81 +59,30 @@
             </div>
             <div class="form-group">
                 <h5>Derivation Scheme</h5>
-                @if(Model.AddressSamples.Count == 0)
-        {
-            <span>The DerivationScheme represents the destination of the funds received by your invoice. It is generated by your wallet software. Please, verify that you are generating the right addresses by clicking on 'Check ExtPubKey'</span>
-}
+                <span>The DerivationScheme represents the destination of the funds received by your invoice.</span>
             </div>
+
             <div class="form-group">
-                <input asp-for="DerivationScheme" class="form-control" />
-                <span asp-validation-for="DerivationScheme" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="DerivationSchemeFormat"></label>
-                <select asp-for="DerivationSchemeFormat" asp-items="Model.DerivationSchemeFormats" class="form-control"></select>
-            </div>
-            <div class="form-group">
-                @if(Model.AddressSamples.Count == 0)
-        {
-                    <span>BTCPay format memo</span>
-            <table class="table">
-                <thead class="thead-inverse">
+                <a asp-action="AddDerivationScheme" class="btn btn-success" role="button"><span class="glyphicon glyphicon-plus"></span>Add or modify a derivation scheme</a>
+                <table class="table">
+                    <thead class="thead-inverse">
+                        <tr>
+                            <th>Crypto</th>
+                            <th>Derivation Scheme</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach(var scheme in Model.DerivationSchemes)
+                {
                     <tr>
-                        <th>Address type</th>
-                        <th>Example</th>
+                        <td>@scheme.Crypto</td>
+                        <td>@scheme.Value</td>
                     </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>P2WPKH</td>
-                        <td>xpub</td>
-                    </tr>
-                    <tr>
-                        <td>P2SH-P2WPKH</td>
-                        <td>xpub-[p2sh]</td>
-                    </tr>
-                    <tr>
-                        <td>P2PKH</td>
-                        <td>xpub-[legacy]</td>
-                    </tr>
-                    <tr>
-                        <td>Multi-sig P2WSH</td>
-                        <td>2-of-xpub1-xpub2</td>
-                    </tr>
-                    <tr>
-                        <td>Multi-sig P2SH-P2WSH</td>
-                        <td>2-of-xpub1-xpub2-[p2sh]</td>
-                    </tr>
-                    <tr>
-                        <td>Multi-sig P2SH</td>
-                        <td>2-of-xpub1-xpub2-[legacy]</td>
-                    </tr>
-                </tbody>
-            </table>
-}
-else
-{
-        <table class="table">
-            <thead class="thead-inverse">
-                <tr>
-                    <th>Key path</th>
-                    <th>Address</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach(var sample in Model.AddressSamples)
-        {
-            <tr>
-                <td>@sample.KeyPath</td>
-                <td>@sample.Address</td>
-            </tr>
-}
-            </tbody>
-        </table>
-}
+        }
+                    </tbody>
+                </table>
             </div>
             <button name="command" type="submit" class="btn btn-success" value="Save">Save</button>
-            <button name="command" type="submit" class="btn btn-default" value="Check">Check ExtPubKey</button>
         </form>
     </div>
 </div>

BTCPayServer/wwwroot/imlegacy/litecoin-symbol.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0.847 0.876 329.254 329.256"><title>Litecoin</title><path d="M330.102 165.503c0 90.922-73.705 164.629-164.626 164.629C74.554 330.132.848 256.425.848 165.503.848 74.582 74.554.876 165.476.876c90.92 0 164.626 73.706 164.626 164.627" fill="#bebebe"/><path d="M295.15 165.505c0 71.613-58.057 129.675-129.674 129.675-71.616 0-129.677-58.062-129.677-129.675 0-71.619 58.061-129.677 129.677-129.677 71.618 0 129.674 58.057 129.674 129.677" fill="#bebebe"/><path d="M155.854 209.482l10.693-40.264 25.316-9.249 6.297-23.663-.215-.587-24.92 9.104 17.955-67.608h-50.921l-23.481 88.23-19.605 7.162-6.478 24.395 19.59-7.156-13.839 51.998h135.521l8.688-32.362h-84.601" fill="#fff"/></svg>

BTCPayServer/wwwroot/js/core.js

@@ -192,7 +192,7 @@ function onDataCallback(jsonData) {
 }
 
 function fetchStatus() {
-    var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/status";
+    var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/" + srvModel.cryptoCode + "/status";
     $.ajax({
         url: path,
         type: "GET"
@@ -215,7 +215,7 @@ if (supportsWebSockets) {
         };
     }
     catch (e) {
-        console.error("Error while connecting to websocket for invoice notifictions");
+        console.error("Error while connecting to websocket for invoice notifications");
     }
 }