Enable SSL was ignored

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -1,15 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
-    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -120,7 +120,7 @@ namespace BTCPayServer.Tests
                     .Build();
             _Host.Start();
             InvoiceRepository = (InvoiceRepository)_Host.Services.GetService(typeof(InvoiceRepository));
-            StoreRepository = (StoreRepository)_Host.Services.GetService(typeof(StoreRepository)); 
+
             var rateProvider = (BTCPayRateProviderFactory)_Host.Services.GetService(typeof(BTCPayRateProviderFactory));
             rateProvider.DirectProviders.Clear();
 
@@ -129,19 +129,19 @@ namespace BTCPayServer.Tests
             {
                 Exchange = "coinaverage",
                 CurrencyPair = CurrencyPair.Parse("BTC_USD"),
-                BidAsk = new BidAsk(5000m)
+                Value = 5000m
             });
             coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
             {
                 Exchange = "coinaverage",
                 CurrencyPair = CurrencyPair.Parse("BTC_CAD"),
-                BidAsk = new BidAsk(4500m)
+                Value = 4500m
             });
             coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
             {
                 Exchange = "coinaverage",
                 CurrencyPair = CurrencyPair.Parse("LTC_USD"),
-                BidAsk = new BidAsk(500m)
+                Value = 500m
             });
             rateProvider.DirectProviders.Add("coinaverage", coinAverageMock);
         }
@@ -152,7 +152,6 @@ namespace BTCPayServer.Tests
             internal set;
         }
         public InvoiceRepository InvoiceRepository { get; private set; }
-        public StoreRepository StoreRepository { get; private set; }
         public Uri IntegratedLightning { get; internal set; }
         public bool InContainer { get; internal set; }
 

BTCPayServer.Tests/ChargeTester.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Payments.Lightning.Charge;
 using BTCPayServer.Payments.Lightning.CLightning;
 using NBitcoin;
@@ -16,7 +15,7 @@ namespace BTCPayServer.Tests
         {
             this._Parent = serverTester;
             var url = serverTester.GetEnvironment(environmentName, defaultValue);
-            Client = (ChargeClient)LightningClientFactory.CreateClient(url, network);
+            Client = new ChargeClient(new Uri(url), network);
             P2PHost = _Parent.GetEnvironment(environmentName + "_HOST", defaultHost);
         }        
         public ChargeClient Client { get; set; }

BTCPayServer.Tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1.300-sdk-alpine3.7
+FROM microsoft/dotnet:2.1.300-rc1-sdk-alpine3.7
 WORKDIR /app
  # caches restore result by copying csproj file separately
 COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj

BTCPayServer.Tests/Lnd/LndMockTester.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using BTCPayServer.Payments.Lightning.Lnd;
-using NBitcoin;
-
-namespace BTCPayServer.Tests.Lnd
-{
-    public class LndMockTester
-    {
-        private ServerTester _Parent;
-
-        public LndMockTester(ServerTester serverTester, string environmentName, string defaultValue, string defaultHost, Network network)
-        {
-            this._Parent = serverTester;
-            var url = serverTester.GetEnvironment(environmentName, defaultValue);
-
-            Swagger = new LndSwaggerClient(new LndRestSettings(new Uri(url)) { AllowInsecure = true });
-            Client = new LndInvoiceClient(Swagger);
-            P2PHost = _Parent.GetEnvironment(environmentName + "_HOST", defaultHost);
-        }
-
-        public LndSwaggerClient Swagger { get; set; }
-        public LndInvoiceClient Client { get; set; }
-        public string P2PHost { get; }
-    }
-}

BTCPayServer.Tests/Lnd/UnitTests.cs

@@ -1,246 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using BTCPayServer.Payments.Lightning;
-using BTCPayServer.Payments.Lightning.Lnd;
-using NBitcoin;
-using NBitcoin.RPC;
-using Xunit;
-using Xunit.Abstractions;
-using System.Linq;
-using System.Threading;
-using NBitpayClient;
-using System.Globalization;
-using Xunit.Sdk;
-
-namespace BTCPayServer.Tests.Lnd
-{
-    // this depends for now on `docker-compose up devlnd`
-    public class UnitTests
-    {
-        private readonly ITestOutputHelper output;
-
-        public UnitTests(ITestOutputHelper output)
-        {
-            this.output = output;
-            initializeEnvironment();
-
-            MerchantLnd = new LndSwaggerClient(new LndRestSettings(new Uri("https://127.0.0.1:53280")) { AllowInsecure = true });
-            InvoiceClient = new LndInvoiceClient(MerchantLnd);
-
-            CustomerLnd = new LndSwaggerClient(new LndRestSettings(new Uri("https://127.0.0.1:53281")) { AllowInsecure = true });
-        }
-
-        private LndSwaggerClient MerchantLnd { get; set; }
-        private LndInvoiceClient InvoiceClient { get; set; }
-
-        private LndSwaggerClient CustomerLnd { get; set; }
-
-        [Fact]
-        public async Task GetInfo()
-        {
-            var res = await InvoiceClient.GetInfo();
-            output.WriteLine("Result: " + res.ToJson());
-        }
-
-        [Fact]
-        public async Task CreateInvoice()
-        {
-            var res = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
-            output.WriteLine("Result: " + res.ToJson());
-        }
-
-        [Fact]
-        public async Task GetInvoice()
-        {
-            var createInvoice = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
-            var getInvoice = await InvoiceClient.GetInvoice(createInvoice.Id);
-
-            Assert.Equal(createInvoice.BOLT11, getInvoice.BOLT11);
-        }
-
-        [Fact]
-        public void Play()
-        {
-            var seq = new System.Buffers.ReadOnlySequence<byte>(new ReadOnlyMemory<byte>(new byte[1000]));
-            var seq2 = seq.Slice(3);
-            var pos = seq2.GetPosition(0);
-        }
-
-        // integration tests
-        [Fact]
-        public async Task TestWaitListenInvoice()
-        {
-            var merchantInvoice = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
-            var merchantInvoice2 = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
-
-            var waitToken = default(CancellationToken);
-            var listener = await InvoiceClient.Listen(waitToken);
-            var waitTask = listener.WaitInvoice(waitToken);
-
-            await EnsureLightningChannelAsync();
-            var payResponse = await CustomerLnd.SendPaymentSyncAsync(new LnrpcSendRequest
-            {
-                Payment_request = merchantInvoice.BOLT11
-            });
-
-            var invoice = await waitTask;
-            Assert.True(invoice.PaidAt.HasValue);
-
-            var waitTask2 = listener.WaitInvoice(waitToken);
-
-            payResponse = await CustomerLnd.SendPaymentSyncAsync(new LnrpcSendRequest
-            {
-                Payment_request = merchantInvoice2.BOLT11
-            });
-
-            invoice = await waitTask2;
-            Assert.True(invoice.PaidAt.HasValue);
-
-            var waitTask3 = listener.WaitInvoice(waitToken);
-            await Task.Delay(100);
-            listener.Dispose();
-            Assert.Throws<TaskCanceledException>(() => waitTask3.GetAwaiter().GetResult());
-        }
-
-        [Fact]
-        public async Task CreateLndInvoiceAndPay()
-        {
-            var merchantInvoice = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
-
-            await EnsureLightningChannelAsync();
-
-            await EventuallyAsync(async () =>
-            {
-                var payResponse = await CustomerLnd.SendPaymentSyncAsync(new LnrpcSendRequest
-                {
-                    Payment_request = merchantInvoice.BOLT11
-                });
-                
-                var invoice = await InvoiceClient.GetInvoice(merchantInvoice.Id);
-                Assert.True(invoice.PaidAt.HasValue);
-            });
-        }
-
-        private async Task EventuallyAsync(Func<Task> act)
-        {
-            CancellationTokenSource cts = new CancellationTokenSource(20000);
-            while (true)
-            {
-                try
-                {
-                    await act();
-                    break;
-                }
-                catch (XunitException) when (!cts.Token.IsCancellationRequested)
-                {
-                    await Task.Delay(500);
-                }
-            }
-        }
-
-        public async Task<LnrpcChannel> EnsureLightningChannelAsync()
-        {
-            var merchantInfo = await WaitLNSynched();
-            var merchantNodeAddress = new LnrpcLightningAddress
-            {
-                Pubkey = merchantInfo.NodeId,
-                Host = "merchant_lnd:9735"
-            };
-
-            while (true)
-            {
-                // if channel is pending generate blocks until confirmed
-                var pendingResponse = await CustomerLnd.PendingChannelsAsync();
-                if (pendingResponse.Pending_open_channels?
-                    .Any(a => a.Channel?.Remote_node_pub == merchantNodeAddress.Pubkey) == true)
-                {
-                    ExplorerNode.Generate(1);
-                    await WaitLNSynched();
-                    continue;
-                }
-
-                // check if channel is established
-                var chanResponse = await CustomerLnd.ListChannelsAsync(null, null, null, null);
-                LnrpcChannel channelToMerchant = null;
-                if (chanResponse != null && chanResponse.Channels != null)
-                {
-                    channelToMerchant = chanResponse.Channels
-                    .Where(a => a.Remote_pubkey == merchantNodeAddress.Pubkey)
-                    .FirstOrDefault();
-                }
-
-                if (channelToMerchant == null)
-                {
-                    // create new channel
-                    var isConnected = await CustomerLnd.ListPeersAsync();
-                    if (isConnected.Peers == null ||
-                        !isConnected.Peers.Any(a => a.Pub_key == merchantInfo.NodeId))
-                    {
-                        var connectResp = await CustomerLnd.ConnectPeerAsync(new LnrpcConnectPeerRequest
-                        {
-                            Addr = merchantNodeAddress
-                        });
-                    }
-
-                    var addressResponse = await CustomerLnd.NewWitnessAddressAsync();
-                    var address = BitcoinAddress.Create(addressResponse.Address, Network.RegTest);
-                    await ExplorerNode.SendToAddressAsync(address, Money.Coins(0.2m));
-                    ExplorerNode.Generate(1);
-                    await WaitLNSynched();
-
-                    var channelReq = new LnrpcOpenChannelRequest
-                    {
-                        Local_funding_amount = 16777215.ToString(CultureInfo.InvariantCulture),
-                        Node_pubkey_string = merchantInfo.NodeId
-                    };
-                    var channelResp = await CustomerLnd.OpenChannelSyncAsync(channelReq);
-                }
-                else
-                {
-                    // channel exists, return it
-                    ExplorerNode.Generate(1);
-                    await WaitLNSynched();
-                    return channelToMerchant;
-                }
-            }
-        }
-
-        private async Task<LightningNodeInformation> WaitLNSynched()
-        {
-            while (true)
-            {
-                var merchantInfo = await InvoiceClient.GetInfo();
-                var blockCount = await ExplorerNode.GetBlockCountAsync();
-                if (merchantInfo.BlockHeight != blockCount)
-                {
-                    await Task.Delay(500);
-                }
-                else
-                {
-                    return merchantInfo;
-                }
-            }
-        }
-
-
-
-
-        //
-        private void initializeEnvironment()
-        {
-            NetworkProvider = new BTCPayNetworkProvider(NetworkType.Regtest);
-            ExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_BTCRPCCONNECTION", "server=http://127.0.0.1:43782;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork("BTC").NBitcoinNetwork);
-        }
-
-        public BTCPayNetworkProvider NetworkProvider { get; private set; }
-        public RPCClient ExplorerNode { get; set; }
-
-        internal string GetEnvironment(string variable, string defaultValue)
-        {
-            var var = Environment.GetEnvironmentVariable(variable);
-            return String.IsNullOrEmpty(var) ? defaultValue : var;
-        }
-    }
-}

BTCPayServer.Tests/RateRulesTest.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Text;
 using BTCPayServer.Rating;
 using Xunit;
-using System.Globalization;
 
 namespace BTCPayServer.Tests
 {
@@ -95,16 +94,16 @@ namespace BTCPayServer.Tests
                 Assert.Equal(test.ExpectedExchangeRates, string.Join(',', rule.ExchangeRates.OfType<object>().ToArray()));
             }
             var rule2 = rules.GetRuleFor(CurrencyPair.Parse("DOGE_CAD"));
-            rule2.ExchangeRates.SetRate("bittrex", CurrencyPair.Parse("DOGE_BTC"), new BidAsk(5000m));
+            rule2.ExchangeRates.SetRate("bittrex", CurrencyPair.Parse("DOGE_BTC"), 5000);
             rule2.Reevaluate();
             Assert.True(rule2.HasError);
             Assert.Equal("5000 * ERR_RATE_UNAVAILABLE(coinbase, BTC_CAD) * 1.1", rule2.ToString(true));
             Assert.Equal("bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", rule2.ToString(false));
-            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(2000.4m));
+            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), 2000.4m);
             rule2.Reevaluate();
             Assert.False(rule2.HasError);
             Assert.Equal("5000 * 2000.4 * 1.1", rule2.ToString(true));
-            Assert.Equal(rule2.BidAsk.Bid, 5000m * 2000.4m * 1.1m);
+            Assert.Equal(rule2.Value, 5000m * 2000.4m * 1.1m);
             ////////
 
             // Make sure parenthesis are correctly calculated
@@ -117,18 +116,18 @@ namespace BTCPayServer.Tests
 
             rule2 = rules.GetRuleFor(CurrencyPair.Parse("DOGE_USD"));
             Assert.Equal("(2000 * (-3 + coinbase(BTC_CAD) + 50 - 5)) * 1.1", rule2.ToString());
-            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(1000m));
+            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), 1000m);
             Assert.True(rule2.Reevaluate());
             Assert.Equal("(2000 * (-3 + 1000 + 50 - 5)) * 1.1", rule2.ToString(true));
-            Assert.Equal((2000m * (-3m + 1000m + 50m - 5m)) * 1.1m, rule2.BidAsk.Bid);
+            Assert.Equal((2000m * (-3m + 1000m + 50m - 5m)) * 1.1m, rule2.Value.Value);
 
             // Test inverse
             rule2 = rules.GetRuleFor(CurrencyPair.Parse("USD_DOGE"));
             Assert.Equal("(1 / (2000 * (-3 + coinbase(BTC_CAD) + 50 - 5))) * 1.1", rule2.ToString());
-            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(1000m));
+            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), 1000m);
             Assert.True(rule2.Reevaluate());
             Assert.Equal("(1 / (2000 * (-3 + 1000 + 50 - 5))) * 1.1", rule2.ToString(true));
-            Assert.Equal((1.0m / (2000m * (-3m + 1000m + 50m - 5m))) * 1.1m, rule2.BidAsk.Bid);
+            Assert.Equal(( 1.0m / (2000m * (-3m + 1000m + 50m - 5m))) * 1.1m, rule2.Value.Value);
             ////////
 
             // Make sure kraken is not converted to CurrencyPair
@@ -136,44 +135,8 @@ namespace BTCPayServer.Tests
             builder.AppendLine("BTC_USD = kraken(BTC_USD)");
             Assert.True(RateRules.TryParse(builder.ToString(), out rules));
             rule2 = rules.GetRuleFor(CurrencyPair.Parse("BTC_USD"));
-            rule2.ExchangeRates.SetRate("kraken", CurrencyPair.Parse("BTC_USD"), new BidAsk(1000m));
+            rule2.ExchangeRates.SetRate("kraken", CurrencyPair.Parse("BTC_USD"), 1000m);
             Assert.True(rule2.Reevaluate());
-
-            // Make sure can handle pairs
-            builder = new StringBuilder();
-            builder.AppendLine("BTC_USD = kraken(BTC_USD)");
-            Assert.True(RateRules.TryParse(builder.ToString(), out rules));
-            rule2 = rules.GetRuleFor(CurrencyPair.Parse("BTC_USD"));
-            rule2.ExchangeRates.SetRate("kraken", CurrencyPair.Parse("BTC_USD"), new BidAsk(6000m, 6100m));
-            Assert.True(rule2.Reevaluate());
-            Assert.Equal("(6000, 6100)", rule2.ToString(true));
-            Assert.Equal(6000m, rule2.BidAsk.Bid);
-            rule2 = rules.GetRuleFor(CurrencyPair.Parse("USD_BTC"));
-            rule2.ExchangeRates.SetRate("kraken", CurrencyPair.Parse("BTC_USD"), new BidAsk(6000m, 6100m));
-            Assert.True(rule2.Reevaluate());
-            Assert.Equal("1 / (6000, 6100)", rule2.ToString(true));
-            Assert.Equal(1m / 6100m, rule2.BidAsk.Bid);
-
-            // Make sure the inverse has more priority than X_X or CDNT_X
-            builder = new StringBuilder();
-            builder.AppendLine("EUR_CDNT = 10");
-            builder.AppendLine("CDNT_BTC = CDNT_EUR * EUR_BTC;");
-            builder.AppendLine("CDNT_X = CDNT_BTC * BTC_X;");
-            builder.AppendLine("X_X = coinaverage(X_X);");
-            Assert.True(RateRules.TryParse(builder.ToString(), out rules));
-            rule2 = rules.GetRuleFor(CurrencyPair.Parse("CDNT_EUR"));
-            rule2.ExchangeRates.SetRate("coinaverage", CurrencyPair.Parse("BTC_USD"), new BidAsk(6000m, 6100m));
-            Assert.True(rule2.Reevaluate());
-            Assert.Equal("1 / 10", rule2.ToString(false));
-
-            // Make sure an inverse can be solved on an exchange
-            builder = new StringBuilder();
-            builder.AppendLine("X_X = coinaverage(X_X);");
-            Assert.True(RateRules.TryParse(builder.ToString(), out rules));
-            rule2 = rules.GetRuleFor(CurrencyPair.Parse("USD_BTC"));
-            rule2.ExchangeRates.SetRate("coinaverage", CurrencyPair.Parse("BTC_USD"), new BidAsk(6000m, 6100m));
-            Assert.True(rule2.Reevaluate());
-            Assert.Equal($"({(1m / 6100m).ToString(CultureInfo.InvariantCulture)}, {(1m / 6000m).ToString(CultureInfo.InvariantCulture)})", rule2.ToString(true));
         }
     }
 }

BTCPayServer.Tests/ServerTester.cs

@@ -20,8 +20,6 @@ using System.Threading;
 using System.Globalization;
 using BTCPayServer.Payments.Lightning.CLightning;
 using BTCPayServer.Payments.Lightning.Charge;
-using BTCPayServer.Tests.Lnd;
-using BTCPayServer.Payments.Lightning;
 
 namespace BTCPayServer.Tests
 {
@@ -49,12 +47,10 @@ namespace BTCPayServer.Tests
             LTCExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork("LTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_LTCNBXPLORERURL", "http://127.0.0.1:32838/")));
 
             var btc = NetworkProvider.GetNetwork("BTC").NBitcoinNetwork;
-            CustomerLightningD = (CLightningRPCClient)LightningClientFactory.CreateClient(GetEnvironment("TEST_CUSTOMERLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30992/"), btc);
-            MerchantLightningD = (CLightningRPCClient)LightningClientFactory.CreateClient(GetEnvironment("TEST_MERCHANTLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30993/"), btc);
+            CustomerLightningD = new CLightningRPCClient(new Uri(GetEnvironment("TEST_CUSTOMERLIGHTNINGD", "tcp://127.0.0.1:30992/")), btc);
+            MerchantLightningD = new CLightningRPCClient(new Uri(GetEnvironment("TEST_MERCHANTLIGHTNINGD", "tcp://127.0.0.1:30993/")), btc);
 
-            MerchantCharge = new ChargeTester(this, "TEST_MERCHANTCHARGE", "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify", "merchant_lightningd", btc);
-
-            MerchantLnd = new LndMockTester(this, "TEST_MERCHANTLND", "https://lnd:lnd@127.0.0.1:53280/", "merchant_lnd", btc);
+            MerchantCharge = new ChargeTester(this, "TEST_MERCHANTCHARGE", "http://api-token:foiewnccewuify@127.0.0.1:54938/", "merchant_lightningd", btc);
 
             PayTester = new BTCPayServerTester(Path.Combine(_Directory, "pay"))
             {
@@ -82,54 +78,41 @@ namespace BTCPayServer.Tests
         /// <summary>
         /// Connect a customer LN node to the merchant LN node
         /// </summary>
-        public void PrepareLightning(LightningConnectionType lndBackend)
+        public void PrepareLightning()
         {
-            ILightningInvoiceClient client = MerchantCharge.Client;
-            if (lndBackend == LightningConnectionType.LndREST)
-                client = MerchantLnd.Client;
-
-            PrepareLightningAsync(client).GetAwaiter().GetResult();
+            PrepareLightningAsync().GetAwaiter().GetResult();
         }
 
 
-        private static readonly string[] SKIPPED_STATES =
-            { "ONCHAIN", "CHANNELD_SHUTTING_DOWN", "CLOSINGD_SIGEXCHANGE", "CLOSINGD_COMPLETE", "FUNDING_SPEND_SEEN" };
-
         /// <summary>
         /// Connect a customer LN node to the merchant LN node
         /// </summary>
         /// <returns></returns>
-        private async Task PrepareLightningAsync(ILightningInvoiceClient client)
+        public async Task PrepareLightningAsync()
         {
-            bool awaitingLocking = false;
             while (true)
             {
-                var merchantInfo = await WaitLNSynched(client, CustomerLightningD, MerchantLightningD);
-
-                var peers = await CustomerLightningD.ListPeersAsync();
-                var filteringToTargetedPeers = peers.Where(a => a.Id == merchantInfo.NodeId);
-                var channel = filteringToTargetedPeers
+                var skippedStates = new[] { "ONCHAIN", "CHANNELD_SHUTTING_DOWN", "CLOSINGD_SIGEXCHANGE", "CLOSINGD_COMPLETE", "FUNDING_SPEND_SEEN" };
+                var channel = (await CustomerLightningD.ListPeersAsync())
                             .SelectMany(p => p.Channels)
-                            .Where(c => !SKIPPED_STATES.Contains(c.State ?? ""))
+                            .Where(c => !skippedStates.Contains(c.State ?? ""))
                             .FirstOrDefault();
-
                 switch (channel?.State)
                 {
                     case null:
+                        var merchantInfo = await WaitLNSynched();
+                        var clightning = new NodeInfo(merchantInfo.Id, MerchantCharge.P2PHost, merchantInfo.Port);
+                        await CustomerLightningD.ConnectAsync(clightning);
                         var address = await CustomerLightningD.NewAddressAsync();
-                        await ExplorerNode.SendToAddressAsync(address, Money.Coins(0.5m));
+                        await ExplorerNode.SendToAddressAsync(address, Money.Coins(0.2m));
                         ExplorerNode.Generate(1);
-                        await WaitLNSynched(client, CustomerLightningD, MerchantLightningD);
+                        await WaitLNSynched();
                         await Task.Delay(1000);
-
-                        var merchantNodeInfo = new NodeInfo(merchantInfo.NodeId, merchantInfo.Address, merchantInfo.P2PPort);
-                        await CustomerLightningD.ConnectAsync(merchantNodeInfo);
-                        await CustomerLightningD.FundChannelAsync(merchantNodeInfo, Money.Satoshis(16777215));
+                        await CustomerLightningD.FundChannelAsync(clightning, Money.Satoshis(16777215));
                         break;
                     case "CHANNELD_AWAITING_LOCKIN":
-                        ExplorerNode.Generate(awaitingLocking ? 1 : 10);
-                        await WaitLNSynched(client, CustomerLightningD, MerchantLightningD);
-                        awaitingLocking = true;
+                        ExplorerNode.Generate(1);
+                        await WaitLNSynched();
                         break;
                     case "CHANNELD_NORMAL":
                         return;
@@ -139,29 +122,23 @@ namespace BTCPayServer.Tests
             }
         }
 
-        private async Task<LightningNodeInformation> WaitLNSynched(params ILightningInvoiceClient[] clients)
+        private async Task<GetInfoResponse> WaitLNSynched()
         {
             while (true)
             {
+                var merchantInfo = await MerchantCharge.Client.GetInfoAsync();
                 var blockCount = await ExplorerNode.GetBlockCountAsync();
-                var synching = clients.Select(c => WaitLNSynchedCore(blockCount, c)).ToArray();
-                await Task.WhenAll(synching);
-                if (synching.All(c => c.Result != null))
-                    return synching[0].Result;
-                await Task.Delay(1000);
+                if (merchantInfo.BlockHeight != blockCount)
+                {
+                    await Task.Delay(1000);
+                }
+                else
+                {
+                    return merchantInfo;
+                }
             }
         }
 
-        private async Task<LightningNodeInformation> WaitLNSynchedCore(int blockCount, ILightningInvoiceClient client)
-        {
-            var merchantInfo = await client.GetInfo();
-            if (merchantInfo.BlockHeight == blockCount)
-            {
-                return merchantInfo;
-            }
-            return null;
-        }
-
         public void SendLightningPayment(Invoice invoice)
         {
             SendLightningPaymentAsync(invoice).GetAwaiter().GetResult();
@@ -175,10 +152,8 @@ namespace BTCPayServer.Tests
         }
 
         public CLightningRPCClient CustomerLightningD { get; set; }
-
         public CLightningRPCClient MerchantLightningD { get; private set; }
         public ChargeTester MerchantCharge { get; private set; }
-        public LndMockTester MerchantLnd { get; set; }
 
         internal string GetEnvironment(string variable, string defaultValue)
         {
@@ -210,18 +185,106 @@ namespace BTCPayServer.Tests
 
         HttpClient _Http = new HttpClient();
 
+        class MockHttpRequest : HttpRequest
+        {
+            Uri serverUri;
+            public MockHttpRequest(Uri serverUri)
+            {
+                this.serverUri = serverUri;
+            }
+            public override HttpContext HttpContext => throw new NotImplementedException();
+
+            public override string Method
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+            public override string Scheme
+            {
+                get => serverUri.Scheme;
+                set => throw new NotImplementedException();
+            }
+            public override bool IsHttps
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+            public override HostString Host
+            {
+                get => new HostString(serverUri.Host, serverUri.Port);
+                set => throw new NotImplementedException();
+            }
+            public override PathString PathBase
+            {
+                get => "";
+                set => throw new NotImplementedException();
+            }
+            public override PathString Path
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+            public override QueryString QueryString
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+            public override IQueryCollection Query
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+            public override string Protocol
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+
+            public override IHeaderDictionary Headers => throw new NotImplementedException();
+
+            public override IRequestCookieCollection Cookies
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+            public override long? ContentLength
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+            public override string ContentType
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+            public override Stream Body
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+
+            public override bool HasFormContentType => throw new NotImplementedException();
+
+            public override IFormCollection Form
+            {
+                get => throw new NotImplementedException();
+                set => throw new NotImplementedException();
+            }
+
+            public override Task<IFormCollection> ReadFormAsync(CancellationToken cancellationToken = default(CancellationToken))
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+
         public BTCPayServerTester PayTester
         {
             get; set;
         }
-        public List<string> Stores { get; internal set; } = new List<string>();
 
         public void Dispose()
         {
-            foreach(var store in Stores)
-            {
-                Xunit.Assert.True(PayTester.StoreRepository.DeleteStore(store).GetAwaiter().GetResult());
-            }
             if (PayTester != null)
                 PayTester.Dispose();
         }

BTCPayServer.Tests/TestAccount.cs

@@ -65,7 +65,6 @@ namespace BTCPayServer.Tests
             var store = this.GetController<UserStoresController>();
             await store.CreateStore(new CreateStoreViewModel() { Name = "Test Store" });
             StoreId = store.CreatedStoreId;
-            parent.Stores.Add(StoreId);
         }
 
         public BTCPayNetwork SupportedNetwork { get; set; }
@@ -118,7 +117,7 @@ namespace BTCPayServer.Tests
         {
             get; set;
         }
-
+        
         public void RegisterLightningNode(string cryptoCode, LightningConnectionType connectionType)
         {
             RegisterLightningNodeAsync(cryptoCode, connectionType).GetAwaiter().GetResult();
@@ -127,24 +126,15 @@ namespace BTCPayServer.Tests
         public async Task RegisterLightningNodeAsync(string cryptoCode, LightningConnectionType connectionType)
         {
             var storeController = this.GetController<StoresController>();
-
-            string connectionString = null;
-            if (connectionType == LightningConnectionType.Charge)
-                connectionString = "type=charge;server=" + parent.MerchantCharge.Client.Uri.AbsoluteUri;
-            else if (connectionType == LightningConnectionType.CLightning)
-                connectionString = "type=clightning;server=" + parent.MerchantLightningD.Address.AbsoluteUri;
-            else if (connectionType == LightningConnectionType.LndREST)
-                connectionString = $"type=lnd-rest;server={parent.MerchantLnd.Swagger.BaseUrl};allowinsecure=true";
-            else
-                throw new NotSupportedException(connectionType.ToString());
-
             await storeController.AddLightningNode(StoreId, new LightningNodeViewModel()
             {
-                ConnectionString = connectionString,
+                Url = connectionType == LightningConnectionType.Charge ? parent.MerchantCharge.Client.Uri.AbsoluteUri :
+                      connectionType == LightningConnectionType.CLightning ? parent.MerchantLightningD.Address.AbsoluteUri
+                      : throw new NotSupportedException(connectionType.ToString()),
                 SkipPortTest = true
             }, "save", "BTC");
             if (storeController.ModelState.ErrorCount != 0)
                 Assert.False(true, storeController.ModelState.FirstOrDefault().Value.Errors[0].ErrorMessage);
         }
-    }
+}
 }

BTCPayServer.Tests/UnitTest1.cs

@@ -35,11 +35,9 @@ using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Stores;
 using System.Net.Http;
 using System.Text;
-using BTCPayServer.Models;
 using BTCPayServer.Rating;
 using BTCPayServer.Validation;
 using ExchangeSharp;
-using System.Security.Cryptography.X509Certificates;
 
 namespace BTCPayServer.Tests
 {
@@ -323,7 +321,7 @@ namespace BTCPayServer.Tests
         [Fact]
         public void RoundupCurrenciesCorrectly()
         {
-            foreach (var test in new[]
+            foreach(var test in new[] 
             {
                 (0.0005m, "$0.0005 (USD)"),
                 (0.001m, "$0.001 (USD)"),
@@ -345,7 +343,6 @@ namespace BTCPayServer.Tests
                 var user = tester.NewAccount();
                 user.GrantAccess();
                 user.RegisterDerivationScheme("BTC");
-                Assert.True(user.BitPay.TestAccess(Facade.Merchant));
                 var invoice = user.BitPay.CreateInvoice(new Invoice()
                 {
                     Buyer = new Buyer() { email = "test@fwf.com" },
@@ -411,21 +408,14 @@ namespace BTCPayServer.Tests
 
                 var testResult = storeController.AddLightningNode(user.StoreId, new LightningNodeViewModel()
                 {
-                    ConnectionString = "type=charge;server=" + tester.MerchantCharge.Client.Uri.AbsoluteUri,
-                    SkipPortTest = true // We can't test this as the IP can't be resolved by the test host :(
+                    Url = tester.MerchantCharge.Client.Uri.AbsoluteUri
                 }, "test", "BTC").GetAwaiter().GetResult();
                 Assert.DoesNotContain("Error", ((LightningNodeViewModel)Assert.IsType<ViewResult>(testResult).Model).StatusMessage, StringComparison.OrdinalIgnoreCase);
                 Assert.True(storeController.ModelState.IsValid);
 
                 Assert.IsType<RedirectToActionResult>(storeController.AddLightningNode(user.StoreId, new LightningNodeViewModel()
                 {
-                    ConnectionString = "type=charge;server=" + tester.MerchantCharge.Client.Uri.AbsoluteUri
-                }, "save", "BTC").GetAwaiter().GetResult());
-
-                // Make sure old connection string format does not work
-                Assert.IsType<ViewResult>(storeController.AddLightningNode(user.StoreId, new LightningNodeViewModel()
-                {
-                    ConnectionString = tester.MerchantCharge.Client.Uri.AbsoluteUri
+                    Url = tester.MerchantCharge.Client.Uri.AbsoluteUri
                 }, "save", "BTC").GetAwaiter().GetResult());
 
                 var storeVm = Assert.IsType<Models.StoreViewModels.StoreViewModel>(Assert.IsType<ViewResult>(storeController.UpdateStore()).Model);
@@ -437,148 +427,106 @@ namespace BTCPayServer.Tests
         public void CanParseLightningURL()
         {
             LightningConnectionString conn = null;
-            Assert.True(LightningConnectionString.TryParse("/test/a", true, out conn));
-            for (int i = 0; i < 2; i++)
-            {
-                if (i == 1)
-                    Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
-                Assert.Equal(i == 0, conn.IsLegacy);
-                Assert.Equal("type=clightning;server=unix://test/a", conn.ToString());
-                Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
-                Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
-                Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
-            }
+            Assert.True(LightningConnectionString.TryParse("/test/a", out conn));
+            Assert.Equal("unix://test/a", conn.ToString());
+            Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
+            Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
+            Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
 
-            Assert.True(LightningConnectionString.TryParse("unix://test/a", true, out conn));
-            for (int i = 0; i < 2; i++)
-            {
-                if (i == 1)
-                    Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
-                Assert.Equal("type=clightning;server=unix://test/a", conn.ToString());
-                Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
-                Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
-                Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
-            }
+            Assert.True(LightningConnectionString.TryParse("unix://test/a", out conn));
+            Assert.Equal("unix://test/a", conn.ToString());
+            Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
+            Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
+            Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
 
-            Assert.True(LightningConnectionString.TryParse("unix://test/a", true, out conn));
-            for (int i = 0; i < 2; i++)
-            {
-                if (i == 1)
-                    Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
-                Assert.Equal("type=clightning;server=unix://test/a", conn.ToString());
-                Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
-                Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
-                Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
-            }
+            Assert.True(LightningConnectionString.TryParse("unix://test/a", out conn));
+            Assert.Equal("unix://test/a", conn.ToString());
+            Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
+            Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
+            Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
 
-            Assert.True(LightningConnectionString.TryParse("tcp://test/a", true, out conn));
-            for (int i = 0; i < 2; i++)
-            {
-                if (i == 1)
-                    Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
-                Assert.Equal("type=clightning;server=tcp://test/a", conn.ToString());
-                Assert.Equal("tcp://test/a", conn.ToUri(true).AbsoluteUri);
-                Assert.Equal("tcp://test/a", conn.ToUri(false).AbsoluteUri);
-                Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
-            }
+            Assert.True(LightningConnectionString.TryParse("tcp://test/a", out conn));
+            Assert.Equal("tcp://test/a", conn.ToString());
+            Assert.Equal("tcp://test/a", conn.ToUri(true).AbsoluteUri);
+            Assert.Equal("tcp://test/a", conn.ToUri(false).AbsoluteUri);
+            Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
 
-            Assert.True(LightningConnectionString.TryParse("http://aaa:bbb@test/a", true, out conn));
-            for (int i = 0; i < 2; i++)
-            {
-                if (i == 1)
-                    Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
-                Assert.Equal("type=charge;server=http://aaa:bbb@test/a", conn.ToString());
-                Assert.Equal("http://aaa:bbb@test/a", conn.ToUri(true).AbsoluteUri);
-                Assert.Equal("http://test/a", conn.ToUri(false).AbsoluteUri);
-                Assert.Equal(LightningConnectionType.Charge, conn.ConnectionType);
-                Assert.Equal("aaa", conn.Username);
-                Assert.Equal("bbb", conn.Password);
-            }
+            Assert.True(LightningConnectionString.TryParse("http://aaa:bbb@test/a", out conn));
+            Assert.Equal("http://aaa:bbb@test/a", conn.ToString());
+            Assert.Equal("http://aaa:bbb@test/a", conn.ToUri(true).AbsoluteUri);
+            Assert.Equal("http://test/a", conn.ToUri(false).AbsoluteUri);
+            Assert.Equal(LightningConnectionType.Charge, conn.ConnectionType);
+            Assert.Equal("aaa", conn.Username);
+            Assert.Equal("bbb", conn.Password);
 
-            Assert.True(LightningConnectionString.TryParse("http://api-token:bbb@test/a", true, out conn));
-            for (int i = 0; i < 2; i++)
-            {
-                if (i == 1)
-                    Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
-                Assert.Equal("type=charge;server=http://test/a;api-token=bbb", conn.ToString());
-            }
-
-            Assert.False(LightningConnectionString.TryParse("lol://aaa:bbb@test/a", true, out conn));
-            Assert.False(LightningConnectionString.TryParse("https://test/a", true, out conn));
-            Assert.False(LightningConnectionString.TryParse("unix://dwewoi:dwdwqd@test/a", true, out conn));
-            Assert.False(LightningConnectionString.TryParse("tcp://test/a", false, out conn));
-            Assert.False(LightningConnectionString.TryParse("type=charge;server=http://aaa:bbb@test/a;unk=lol", false, out conn));
-            Assert.False(LightningConnectionString.TryParse("type=charge;server=tcp://aaa:bbb@test/a", false, out conn));
-            Assert.False(LightningConnectionString.TryParse("type=charge", false, out conn));
-            Assert.False(LightningConnectionString.TryParse("type=clightning", false, out conn));
-            Assert.True(LightningConnectionString.TryParse("type=clightning;server=tcp://aaa:bbb@test/a", false, out conn));
-            Assert.True(LightningConnectionString.TryParse("type=clightning;server=/aaa:bbb@test/a", false, out conn));
-            Assert.True(LightningConnectionString.TryParse("type=clightning;server=unix://aaa:bbb@test/a", false, out conn));
-            Assert.False(LightningConnectionString.TryParse("type=clightning;server=wtf://aaa:bbb@test/a", false, out conn));
-
-            var macaroon = "0201036c6e640247030a10b0dbbde28f009f83d330bde05075ca251201301a160a0761646472657373120472656164120577726974651a170a08696e766f6963657312047265616412057772697465000006200ae088692e67cf14e767c3d2a4a67ce489150bf810654ff980e1b7a7e263d5e8";
-
-            var certthumbprint = "c51bb1d402306d0da00e85581b32aa56166bcbab7eb888ff925d7167eb436d06";
-
-            // We get this format from "openssl x509 -noout -fingerprint -sha256 -inform pem -in <certificate>"
-            var certthumbprint2 = "C5:1B:B1:D4:02:30:6D:0D:A0:0E:85:58:1B:32:AA:56:16:6B:CB:AB:7E:B8:88:FF:92:5D:71:67:EB:43:6D:06";
-
-            var lndUri = $"type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;macaroon={macaroon};certthumbprint={certthumbprint}";
-            var lndUri2 = $"type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;macaroon={macaroon};certthumbprint={certthumbprint2}";
-
-            var certificateHash = new X509Certificate2(Encoders.Hex.DecodeData("2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d494942396a4343415a7967417749424167495156397a62474252724e54716b4e4b55676d72524d377a414b42676771686b6a4f50515144416a41784d5238770a485159445651514b45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d51347744415944565151444577564754304e56557a41650a467730784f4441304d6a55794d7a517a4d6a4261467730784f5441324d6a41794d7a517a4d6a42614d444578487a416442674e5642416f54466d78755a4342680a645852765a3256755a584a686447566b49474e6c636e5178446a414d42674e5642414d5442555a50513156544d466b77457759484b6f5a497a6a3043415159490a4b6f5a497a6a304441516344516741454b7557424568564f75707965434157476130766e713262712f59396b41755a78616865646d454553482b753936436d450a397577486b4b2b4a7667547a66385141783550513741357254637155374b57595170303175364f426c5443426b6a414f42674e56485138424166384542414d430a4171517744775944565230544151482f42415577417745422f7a427642674e56485245456144426d6767564754304e565534494a6247396a5957786f62334e300a6877522f4141414268784141414141414141414141414141414141414141414268775373474f69786877514b41457342687753702f717473687754417141724c0a687753702f6d4a72687753702f754f77687753702f714e59687753702f6874436877514b70514157687753702f6c42514d416f4743437147534d343942414d430a413067414d45554349464866716d595a5043647a4a5178386b47586859473834394c31766541364c784d6f7a4f5774356d726835416945413662756e51556c710a6558553070474168776c3041654d726a4d4974394c7652736179756162565a593278343d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a"))
-                            .GetCertHash(System.Security.Cryptography.HashAlgorithmName.SHA256);
-
-
-            Assert.True(LightningConnectionString.TryParse(lndUri, false, out conn));
-            Assert.True(LightningConnectionString.TryParse(lndUri2, false, out var conn2));
-            Assert.Equal(conn2.ToString(), conn.ToString());
-            Assert.Equal(lndUri, conn.ToString());
-            Assert.Equal(LightningConnectionType.LndREST, conn.ConnectionType);
-            Assert.Equal(macaroon, Encoders.Hex.EncodeData(conn.Macaroon));
-            Assert.Equal(certthumbprint.Replace(":", "", StringComparison.OrdinalIgnoreCase).ToLowerInvariant(), Encoders.Hex.EncodeData(conn.CertificateThumbprint));
-            Assert.True(certificateHash.SequenceEqual(conn.CertificateThumbprint));
-
-            // AllowInsecure can be set to allow http
-            Assert.False(LightningConnectionString.TryParse($"type=lnd-rest;server=http://127.0.0.1:53280/;macaroon={macaroon};allowinsecure=false", false, out conn2));
-            Assert.True(LightningConnectionString.TryParse($"type=lnd-rest;server=http://127.0.0.1:53280/;macaroon={macaroon};allowinsecure=true", false, out conn2));
-            Assert.True(LightningConnectionString.TryParse($"type=lnd-rest;server=http://127.0.0.1:53280/;macaroon={macaroon};allowinsecure=true", false, out conn2));
+            Assert.False(LightningConnectionString.TryParse("lol://aaa:bbb@test/a", out conn));
+            Assert.False(LightningConnectionString.TryParse("https://test/a", out conn));
+            Assert.False(LightningConnectionString.TryParse("unix://dwewoi:dwdwqd@test/a", out conn));
         }
 
         [Fact]
-        public void CanSendLightningPaymentCLightning()
+        public void CanSendLightningPayment2()
         {
-            ProcessLightningPayment(LightningConnectionType.CLightning);
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                tester.PrepareLightning();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                user.RegisterLightningNode("BTC", LightningConnectionType.CLightning);
+                user.RegisterDerivationScheme("BTC");
+
+                var invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 0.01m,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description"
+                });
+
+                tester.SendLightningPayment(invoice);
+
+                Eventually(() =>
+                {
+                    var localInvoice = user.BitPay.GetInvoice(invoice.Id);
+                    Assert.Equal("complete", localInvoice.Status);
+                    Assert.Equal("False", localInvoice.ExceptionStatus.ToString());
+                });
+            }
         }
 
         [Fact]
-        public void CanSendLightningPaymentCharge()
+        public void CanSendLightningPayment()
         {
-            ProcessLightningPayment(LightningConnectionType.Charge);
-        }
-
-        [Fact]
-        public void CanSendLightningPaymentLnd()
-        {
-            ProcessLightningPayment(LightningConnectionType.LndREST);
-        }
-
-        void ProcessLightningPayment(LightningConnectionType type)
-        {
-            // For easier debugging and testing
-            // LightningLikePaymentHandler.LIGHTNING_TIMEOUT = int.MaxValue;
 
             using (var tester = ServerTester.Create())
             {
                 tester.Start();
+                tester.PrepareLightning();
                 var user = tester.NewAccount();
                 user.GrantAccess();
-                user.RegisterLightningNode("BTC", type);
+                user.RegisterLightningNode("BTC", LightningConnectionType.Charge);
                 user.RegisterDerivationScheme("BTC");
 
-                tester.PrepareLightning(type);
+                var invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 0.01m,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description"
+                });
+
+                tester.SendLightningPayment(invoice);
+
+                Eventually(() =>
+                {
+                    var localInvoice = user.BitPay.GetInvoice(invoice.Id);
+                    Assert.Equal("complete", localInvoice.Status);
+                    Assert.Equal("False", localInvoice.ExceptionStatus.ToString());
+                });
 
-                Task.WaitAll(CanSendLightningPaymentCore(tester, user));
 
                 Task.WaitAll(Enumerable.Range(0, 5)
                     .Select(_ => CanSendLightningPaymentCore(tester, user))
@@ -588,10 +536,7 @@ namespace BTCPayServer.Tests
 
         async Task CanSendLightningPaymentCore(ServerTester tester, TestAccount user)
         {
-            // TODO: If this parameter is less than 1 second we start having concurrency problems
-            await Task.Delay(TimeSpan.FromMilliseconds(1000));
-            //
-
+            await Task.Delay(TimeSpan.FromSeconds(RandomUtils.GetUInt32() % 5));
             var invoice = await user.BitPay.CreateInvoiceAsync(new Invoice()
             {
                 Price = 0.01m,
@@ -732,40 +677,6 @@ namespace BTCPayServer.Tests
             }
         }
 
-        [Fact]
-        public void CanGetRates()
-        {
-            using (var tester = ServerTester.Create())
-            {
-                tester.Start();
-                var acc = tester.NewAccount();
-                acc.GrantAccess();
-                acc.RegisterDerivationScheme("BTC");
-                acc.RegisterDerivationScheme("LTC");
-
-                var rateController = acc.GetController<RateController>();
-                var GetBaseCurrencyRatesResult = JObject.Parse(((JsonResult)rateController.GetBaseCurrencyRates("BTC", acc.StoreId)
-                    .GetAwaiter().GetResult()).ToJson()).ToObject<DataWrapper<Rate[]>>();
-                Assert.NotNull(GetBaseCurrencyRatesResult);
-                Assert.NotNull(GetBaseCurrencyRatesResult.Data);
-                Assert.Single(GetBaseCurrencyRatesResult.Data);
-                Assert.Equal("LTC", GetBaseCurrencyRatesResult.Data.First().Code);
-
-                var GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, acc.StoreId)
-                    .GetAwaiter().GetResult()).ToJson()).ToObject<DataWrapper<Rate[]>>();
-                Assert.NotNull(GetRatesResult);
-                Assert.NotNull(GetRatesResult.Data);
-                Assert.Equal(2, GetRatesResult.Data.Length);
-
-                var GetCurrencyPairRateResult = JObject.Parse(((JsonResult)rateController.GetCurrencyPairRate("BTC", "LTC", acc.StoreId)
-                    .GetAwaiter().GetResult()).ToJson()).ToObject<DataWrapper<Rate>>();
-
-                Assert.NotNull(GetCurrencyPairRateResult);
-                Assert.NotNull(GetCurrencyPairRateResult.Data);
-                Assert.Equal("LTC", GetCurrencyPairRateResult.Data.Code);
-            }
-        }
-
         private void AssertSearchInvoice(TestAccount acc, bool expected, string invoiceId, string filter)
         {
             var result = (Models.InvoicingModels.InvoicesModel)((ViewResult)acc.GetController<InvoiceController>().ListInvoices(filter).Result).Model;
@@ -859,30 +770,8 @@ namespace BTCPayServer.Tests
                 Assert.False(user.BitPay.TestAccess(Facade.Merchant));
                 user.GrantAccess();
                 user.RegisterDerivationScheme("BTC");
-
                 Assert.True(user.BitPay.TestAccess(Facade.Merchant));
 
-                // Test request pairing code client side
-                var storeController = user.GetController<StoresController>();
-                storeController.CreateToken(new CreateTokenViewModel()
-                {
-                    Facade = Facade.Merchant.ToString(),
-                    Label = "test2",
-                    StoreId = user.StoreId
-                }).GetAwaiter().GetResult();
-                Assert.NotNull(storeController.GeneratedPairingCode);
-
-
-                var k = new Key();
-                var bitpay = new Bitpay(k, tester.PayTester.ServerUri);
-                bitpay.AuthorizeClient(new PairingCode(storeController.GeneratedPairingCode)).Wait();
-                Assert.True(bitpay.TestAccess(Facade.Merchant));
-                Assert.True(bitpay.TestAccess(Facade.PointOfSale));
-                // Same with new instance
-                bitpay = new Bitpay(k, tester.PayTester.ServerUri);
-                Assert.True(bitpay.TestAccess(Facade.Merchant));
-                Assert.True(bitpay.TestAccess(Facade.PointOfSale));
-
                 // Can generate API Key
                 var repo = tester.PayTester.GetService<TokenRepository>();
                 Assert.Empty(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult());
@@ -1373,7 +1262,7 @@ namespace BTCPayServer.Tests
                 Assert.Equal("orange", vmview.Items[1].Title);
                 Assert.Equal(10.0m, vmview.Items[1].Price.Value);
                 Assert.Equal("$5.00", vmview.Items[0].Price.Formatted);
-                Assert.IsType<RedirectResult>(apps.ViewPointOfSale(appId, 0, null, null, null, null, "orange").Result);
+                Assert.IsType<RedirectResult>(apps.ViewPointOfSale(appId, 0, "orange").Result);
                 var invoice = user.BitPay.GetInvoices().First();
                 Assert.Equal(10.00m, invoice.Price);
                 Assert.Equal("CAD", invoice.Currency);
@@ -1397,9 +1286,8 @@ namespace BTCPayServer.Tests
                 Assert.NotNull(vm.SelectedAppType);
                 Assert.Null(vm.Name);
                 vm.Name = "test";
-                vm.SelectedAppType = AppType.PointOfSale.ToString();
                 var redirectToAction = Assert.IsType<RedirectToActionResult>(apps.CreateApp(vm).Result);
-                Assert.Equal(nameof(apps.UpdatePointOfSale), redirectToAction.ActionName);
+                Assert.Equal(nameof(apps.ListApps), redirectToAction.ActionName);
                 var appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps().Result).Model);
                 var appList2 = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps2.ListApps().Result).Model);
                 Assert.Single(appList.Apps);
@@ -1437,8 +1325,6 @@ namespace BTCPayServer.Tests
                 var repo = tester.PayTester.GetService<InvoiceRepository>();
                 var ctx = tester.PayTester.GetService<ApplicationDbContextFactory>().CreateContext();
                 Assert.Equal(0, invoice.CryptoInfo[0].TxCount);
-                Assert.True(invoice.MinerFees.ContainsKey("BTC"));
-                Assert.Equal(100m, invoice.MinerFees["BTC"].SatoshiPerBytes);
                 Eventually(() =>
                 {
                     var textSearchResult = tester.PayTester.InvoiceRepository.GetInvoices(new InvoiceQuery()
@@ -1578,10 +1464,10 @@ namespace BTCPayServer.Tests
             var quadri = new QuadrigacxRateProvider();
             var rates = quadri.GetRatesAsync().GetAwaiter().GetResult();
             Assert.NotEmpty(rates);
-            Assert.NotEqual(0.0m, rates.First().BidAsk.Bid);
-            Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("BTC_CAD")).Bid);
-            Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("BTC_USD")).Bid);
-            Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("LTC_CAD")).Bid);
+            Assert.NotEqual(0.0m, rates.First().Value);
+            Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("BTC_CAD")).Value);
+            Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("BTC_USD")).Value);
+            Assert.NotEqual(0.0m, rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("LTC_CAD")).Value);
             Assert.Null(rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("LTC_USD")));
         }
 
@@ -1606,7 +1492,7 @@ namespace BTCPayServer.Tests
                         e => (e.CurrencyPair == new CurrencyPair("BTC", "USD") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "EUR") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "USDT"))
-                               && e.BidAsk.Bid > 1.0m // 1BTC will always be more than 1USD
+                               && e.Value > 1.0m // 1BTC will always be more than 1USD
                                );
             }
         }
@@ -1627,7 +1513,7 @@ namespace BTCPayServer.Tests
             foreach (var value in result)
             {
                 var rateResult = value.Value.GetAwaiter().GetResult();
-                Assert.NotNull(rateResult.BidAsk);
+                Assert.NotNull(rateResult.Value);
             }
         }
 
@@ -1664,7 +1550,7 @@ namespace BTCPayServer.Tests
             // Should cache at exchange level so this should hit the cache
             var fetchedRate2 = factory.FetchRate(CurrencyPair.Parse("LTC_USD"), rateRules).GetAwaiter().GetResult();
             Assert.True(fetchedRate.Cached);
-            Assert.NotEqual(fetchedRate.BidAsk.Bid, fetchedRate2.BidAsk.Bid);
+            Assert.NotEqual(fetchedRate.Value.Value, fetchedRate2.Value.Value);
 
             // Should cache at exchange level this should not hit the cache as it is different exchange
             RateRules.TryParse("X_X = bittrex(X_X);", out rateRules);

BTCPayServer.Tests/UnitTestPeusa.cs

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

BTCPayServer.Tests/docker-compose.yml

@@ -17,10 +17,9 @@ services:
       TESTS_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver
       TESTS_PORT: 80
       TESTS_HOSTNAME: tests
-      TEST_MERCHANTLIGHTNINGD: "type=clightning;server=/etc/merchant_lightningd_datadir/lightning-rpc"
-      TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=/etc/customer_lightningd_datadir/lightning-rpc"
-      TEST_MERCHANTCHARGE: "type=charge;server=https://lightning-charged:9112/;api-token=foiewnccewuify;allowinsecure=true"
-      TEST_MERCHANTLND: "type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;allowinsecure=true"
+      TEST_MERCHANTLIGHTNINGD: "/etc/merchant_lightningd_datadir/lightning-rpc"
+      TEST_CUSTOMERLIGHTNINGD: "/etc/customer_lightningd_datadir/lightning-rpc"
+      TEST_MERCHANTCHARGE: http://api-token:foiewnccewuify@lightning-charged:9112/
       TESTS_INCONTAINER: "true"
     expose:
       - "80"
@@ -45,25 +44,9 @@ services:
       - customer_lightningd
       - merchant_lightningd
       - lightning-charged
-      - customer_lnd
-      - merchant_lnd
-
-  devlnd: 
-    image: nicolasdorier/docker-bitcoin:0.16.0
-    environment:
-      BITCOIN_EXTRA_ARGS: |
-        regtest=1
-        connect=bitcoind:39388
-    links:
-      - nbxplorer
-      - postgres
-      - customer_lnd
-      - merchant_lnd
-
-
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.2.14
+    image: nicolasdorier/nbxplorer:1.0.2.6
     ports:
       - "32838:32838"
     expose: 
@@ -97,13 +80,8 @@ services:
         rpcport=43782
         port=39388
         whitelist=0.0.0.0/0
-        zmqpubrawtx=tcp://0.0.0.0:28332
-        zmqpubrawblock=tcp://0.0.0.0:28332
-        zmqpubrawtxlock=tcp://0.0.0.0:28332
-        zmqpubhashblock=tcp://0.0.0.0:28332
     ports: 
       - "43782:43782"
-      - "28332:28332"
     expose:
       - "43782" # RPC
       - "39388" # P2P
@@ -111,7 +89,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: nicolasdorier/clightning:v0.6-dev
+    image: nicolasdorier/clightning:0.0.0.16-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -134,7 +112,7 @@ services:
       - bitcoind
 
   lightning-charged:
-    image: shesek/lightning-charge:0.3.15
+    image: shesek/lightning-charge:0.3.9
     environment:
       NETWORK: regtest
       API_TOKEN: foiewnccewuify
@@ -153,7 +131,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: nicolasdorier/clightning:v0.6-dev
+    image: nicolasdorier/clightning:0.0.0.14-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -199,59 +177,8 @@ services:
     expose:
       - "5432"
 
-  merchant_lnd:
-    image: btcpayserver/lnd:0.4.2.0
-    environment:
-      LND_CHAIN: "btc"
-      LND_ENVIRONMENT: "regtest"
-      LND_EXTRA_ARGS: |
-        restlisten=0.0.0.0:8080
-        bitcoin.node=bitcoind
-        bitcoind.rpchost=bitcoind:43782
-        bitcoind.zmqpath=tcp://bitcoind:28332
-        externalip=merchant_lnd:9735
-        no-macaroons=1
-        debuglevel=debug
-        noencryptwallet=1
-    ports:
-      - "53280:8080"
-    expose:
-      - "9735"
-    volumes:
-      - "merchant_lnd_datadir:/data"
-      - "bitcoin_datadir:/deps/.bitcoin"
-    links:
-      - bitcoind
-
-  customer_lnd:
-    image: btcpayserver/lnd:0.4.2.0
-    environment:
-      LND_CHAIN: "btc"
-      LND_ENVIRONMENT: "regtest"
-      LND_EXTRA_ARGS: |
-        restlisten=0.0.0.0:8080
-        bitcoin.node=bitcoind
-        bitcoind.rpchost=bitcoind:43782
-        bitcoind.zmqpath=tcp://bitcoind:28332
-        externalip=customer_lnd:10009
-        no-macaroons=1
-        debuglevel=debug
-        noencryptwallet=1
-    ports:
-      - "53281:8080"
-    expose:
-      - "8080"
-      - "10009"
-    volumes:
-      - "customer_lnd_datadir:/root/.lnd"
-      - "bitcoin_datadir:/deps/.bitcoin"
-    links:
-      - bitcoind
-
 volumes:
     bitcoin_datadir:
     customer_lightningd_datadir:
     merchant_lightningd_datadir:
     lightning_charge_datadir:
-    customer_lnd_datadir:
-    merchant_lnd_datadir:

BTCPayServer/BTCPayNetwork.cs

@@ -44,8 +44,6 @@ namespace BTCPayServer
         public string CryptoCode { get; internal set; }
         public string BlockExplorerLink { get; internal set; }
         public string UriScheme { get; internal set; }
-        public Money MinFee { get; internal set; }
-        public string DisplayName { get; set; }
 
         [Obsolete("Should not be needed")]
         public bool IsBTC

BTCPayServer/BTCPayNetworkProvider.Bitcoin.cs

@@ -17,13 +17,12 @@ namespace BTCPayServer
             Add(new BTCPayNetwork()
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Bitcoin",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://www.smartbit.com.au/tx/{0}" : "https://testnet.smartbit.com.au/tx/{0}",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "bitcoin",
-                CryptoImagePath = "imlegacy/bitcoin.svg",
-                LightningImagePath = "imlegacy/bitcoin-lightning.svg",
+                CryptoImagePath = "imlegacy/bitcoin-symbol.svg",
+                LightningImagePath = "imlegacy/btc-lightning.svg",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
                 CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("0'") : new KeyPath("1'")
             });

BTCPayServer/BTCPayNetworkProvider.BitcoinGold.cs

@@ -10,7 +10,6 @@ namespace BTCPayServer
             Add(new BTCPayNetwork()
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "BGold",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.bitcoingold.org/insight/tx/{0}/" : "https://test-explorer.bitcoingold.org/insight/tx/{0}",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
@@ -20,8 +19,8 @@ namespace BTCPayServer
                     "BTG_X = BTG_BTC * BTC_X",
                     "BTG_BTC = bitfinex(BTG_BTC)",
                 },
-                CryptoImagePath = "imlegacy/btg.svg",
-                LightningImagePath = "imlegacy/btg-lightning.svg",
+                CryptoImagePath = "imlegacy/btg-symbol.svg",
+                LightningImagePath = "imlegacy/btg-symbol.svg",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
                 CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("156'") : new KeyPath("1'")
             });

BTCPayServer/BTCPayNetworkProvider.Dogecoin.cs

@@ -16,7 +16,6 @@ namespace BTCPayServer
             Add(new BTCPayNetwork()
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Dogecoin",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://dogechain.info/tx/{0}" : "https://dogechain.info/tx/{0}",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
@@ -28,8 +27,7 @@ namespace BTCPayServer
                 },
                 CryptoImagePath = "imlegacy/dogecoin.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("3'") : new KeyPath("1'"),
-                MinFee = Money.Coins(1m)
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("3'") : new KeyPath("1'")
             });
         }
     }

BTCPayServer/BTCPayNetworkProvider.Feathercoin.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Services.Rates;
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitFeathercoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("FTC");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Feathercoin",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.feathercoin.com/tx/{0}" : "https://explorer.feathercoin.com/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
-                NBXplorerNetwork = nbxplorerNetwork,
-                UriScheme = "feathercoin",
-                DefaultRateRules = new[] 
-                {
-                                "FTC_X = FTC_BTC * BTC_X",
-                                "FTC_BTC = bittrex(FTC_BTC)"
-                },
-                CryptoImagePath = "imlegacy/feathercoin.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("8'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer/BTCPayNetworkProvider.Groestlcoin.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitGroestlcoin()
-        {
-
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("GRS");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Groestlcoin",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/grs/tx.dws?{0}.htm" : "https://chainz.cryptoid.info/grs-test/tx.dws?{0}.htm",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
-                NBXplorerNetwork = nbxplorerNetwork,
-                UriScheme = "groestlcoin",
-                DefaultRateRules = new[]
-                {
-                                "GRS_X = GRS_BTC * BTC_X",
-                                "GRS_BTC = bittrex(GRS_BTC)"
-                },
-                CryptoImagePath = "imlegacy/groestlcoin.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("17'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer/BTCPayNetworkProvider.Litecoin.cs

@@ -16,13 +16,12 @@ namespace BTCPayServer
             Add(new BTCPayNetwork()
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Litecoin",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://live.blockcypher.com/ltc/tx/{0}/" : "http://explorer.litecointools.com/tx/{0}",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "litecoin",
-                CryptoImagePath = "imlegacy/litecoin.svg",
-                LightningImagePath = "imlegacy/litecoin-lightning.svg",
+                CryptoImagePath = "imlegacy/litecoin-symbol.svg",
+                LightningImagePath = "imlegacy/ltc-lightning.svg",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
                 CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("2'") : new KeyPath("1'")
             });

BTCPayServer/BTCPayNetworkProvider.Monacoin.cs

@@ -16,7 +16,6 @@ namespace BTCPayServer
             Add(new BTCPayNetwork()
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Monacoin",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://mona.insight.monaco-ex.org/insight/tx/{0}" : "https://testnet-mona.insight.monaco-ex.org/insight/tx/{0}",
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,

BTCPayServer/BTCPayNetworkProvider.Polis.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Services.Rates;
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitPolis()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("POLIS");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Polis",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://insight.polispay.org/tx/{0}" : "https://insight.polispay.org/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
-                NBXplorerNetwork = nbxplorerNetwork,
-                UriScheme = "polis",
-                DefaultRateRules = new[]
-                {
-                                "POLIS_X = POLIS_BTC * BTC_X",
-                                "POLIS_BTC = cryptopia(POLIS_BTC)"
-                },
-                CryptoImagePath = "imlegacy/polis.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("1997'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer/BTCPayNetworkProvider.Ufo.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Services.Rates;
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitUfo()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("UFO");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Ufo",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/ufo/tx.dws?{0}" : "https://chainz.cryptoid.info/ufo/tx.dws?{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
-                NBXplorerNetwork = nbxplorerNetwork,
-                UriScheme = "ufo",
-                DefaultRateRules = new[] 
-                {
-                                "UFO_X = UFO_BTC * BTC_X",
-                                "UFO_BTC = coinexchange(UFO_BTC)"
-                },
-                CryptoImagePath = "imlegacy/ufo.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("202'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer/BTCPayNetworkProvider.Viacoin.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Services.Rates;
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitViacoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("VIA");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Viacoin",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.viacoin.org/tx/{0}" : "https://explorer.viacoin.org/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
-                NBXplorerNetwork = nbxplorerNetwork,
-                UriScheme = "viacoin",
-                DefaultRateRules = new[]
-                {
-                                "VIA_X = VIA_BTC * BTC_X",
-                                "VIA_BTC = bittrex(VIA_BTC)"
-                },
-                CryptoImagePath = "imlegacy/viacoin.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("14'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer/BTCPayNetworkProvider.cs

@@ -50,11 +50,6 @@ namespace BTCPayServer
             InitDogecoin();
             InitBitcoinGold();
             InitMonacoin();
-            InitPolis();
-            InitFeathercoin();
-            InitGroestlcoin();
-            InitViacoin();
-            //InitUfo();
         }
 
         /// <summary>

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.81</Version>
+		<Version>1.0.2.25</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -35,27 +35,26 @@
     <PackageReference Include="Hangfire" Version="1.6.19" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
     <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.2" />
-    <PackageReference Include="LedgerWallet" Version="2.0.0" />
+    <PackageReference Include="LedgerWallet" Version="1.0.1.36" />
     <PackageReference Include="Meziantou.AspNetCore.BundleTagHelpers" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0-rc1-final" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.0" />
-    <PackageReference Include="NBitcoin" Version="4.1.1.32" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.29" />	  
+    <PackageReference Include="NBitcoin" Version="4.1.1.7" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.23" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.2.15" />
-    <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
-    <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
-    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.16" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0" />
-    <PackageReference Include="SSH.NET" Version="2016.1.0" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.2.8" />
+    <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />
+    <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.2" />
+    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.13" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1-rc1" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
     <PackageReference Include="Text.Analyzers" Version="2.6.0" />
   </ItemGroup>
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version=" 2.1.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version=" 2.1.0-rc1-final" PrivateAssets="All" />
 		<PackageReference Include="YamlDotNet" Version="4.3.1" />
 	</ItemGroup>
 
@@ -112,34 +111,6 @@
 	<ItemGroup>
 	  <Folder Include="Build\" />
 	  <Folder Include="wwwroot\vendor\clipboard.js\" />
-	  <Folder Include="wwwroot\vendor\highlightjs\" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <Content Update="Views\Server\LNDGRPCServices.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
-	  <Content Update="Views\Server\Maintenance.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
-	  <Content Update="Views\Server\Services.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
-	  <Content Update="Views\Wallets\ListWallets.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
-	  <Content Update="Views\Wallets\WalletTransactions.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
-	  <Content Update="Views\Wallets\_Nav.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
-	  <Content Update="Views\Wallets\_ViewImports.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
-	  <Content Update="Views\Wallets\_ViewStart.cshtml">
-	    <Pack>$(IncludeRazorContentInPack)</Pack>
-	  </Content>
 	</ItemGroup>
 
 	<ItemGroup>

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -74,40 +74,16 @@ namespace BTCPayServer.Configuration
                 setting.ExplorerUri = conf.GetOrDefault<Uri>($"{net.CryptoCode}.explorer.url", net.NBXplorerNetwork.DefaultSettings.DefaultUrl);
                 setting.CookieFile = conf.GetOrDefault<string>($"{net.CryptoCode}.explorer.cookiefile", net.NBXplorerNetwork.DefaultSettings.DefaultCookieFile);
                 NBXplorerConnectionSettings.Add(setting);
+                var lightning = conf.GetOrDefault<string>($"{net.CryptoCode}.lightning", string.Empty);
+                if(lightning.Length != 0)
                 {
-                    var lightning = conf.GetOrDefault<string>($"{net.CryptoCode}.lightning", string.Empty);
-                    if (lightning.Length != 0)
+                    if(!LightningConnectionString.TryParse(lightning, out var connectionString, out var error))
                     {
-                        if (!LightningConnectionString.TryParse(lightning, true, out var connectionString, out var error))
-                        {
-                            throw new ConfigException($"Invalid setting {net.CryptoCode}.lightning, " + Environment.NewLine +
-                                $"If you have a lightning server use: 'type=clightning;server=/root/.lightning/lightning-rpc', " + Environment.NewLine +
-                                $"If you have a lightning charge server: 'type=charge;server=https://charge.example.com;api-token=yourapitoken'" + Environment.NewLine +
-                                $"If you have a lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                $"              lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                error);
-                        }
-                        if (connectionString.IsLegacy)
-                        {
-                            Logs.Configuration.LogWarning($"Setting {net.CryptoCode}.lightning will work but use an deprecated format, please replace it by '{connectionString.ToString()}'");
-                        }
-                        InternalLightningByCryptoCode.Add(net.CryptoCode, connectionString);
-                    }
-                }
-
-                {
-                    var lightning = conf.GetOrDefault<string>($"{net.CryptoCode}.external.lnd.grpc", string.Empty);
-                    if (lightning.Length != 0)
-                    {
-                        if (!LightningConnectionString.TryParse(lightning, false, out var connectionString, out var error))
-                        {
-                            throw new ConfigException($"Invalid setting {net.CryptoCode}.external.lnd.grpc, " + Environment.NewLine +
-                                $"lnd server: 'type=lnd-grpc;server=https://lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                $"lnd server: 'type=lnd-grpc;server=https://lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                error);
-                        }
-                        ExternalServicesByCryptoCode.Add(net.CryptoCode, new ExternalLNDGRPC(connectionString));
+                        throw new ConfigException($"Invalid setting {net.CryptoCode}.lightning, you need to pass either " +
+                            $"the absolute path to the unix socket of a running CLightning instance (eg. /root/.lightning/lightning-rpc), " +
+                            $"or the url to a charge server with crendetials (eg. https://apitoken@API_TOKEN_SECRET:charge.example.com/)");
                     }
+                    InternalLightningByCryptoCode.Add(net.CryptoCode, connectionString);
                 }
             }
 
@@ -121,12 +97,11 @@ namespace BTCPayServer.Configuration
             if (!RootPath.StartsWith("/", StringComparison.InvariantCultureIgnoreCase))
                 RootPath = "/" + RootPath;
             var old = conf.GetOrDefault<Uri>("internallightningnode", null);
-            if (old != null)
+            if(old != null)
                 throw new ConfigException($"internallightningnode should not be used anymore, use btclightning instead");
         }
         public string RootPath { get; set; }
         public Dictionary<string, LightningConnectionString> InternalLightningByCryptoCode { get; set; } = new Dictionary<string, LightningConnectionString>();
-        public ExternalServices ExternalServicesByCryptoCode { get; set; } = new ExternalServices();
 
         public BTCPayNetworkProvider NetworkProvider { get; set; }
         public string PostgresConnectionString
@@ -154,29 +129,4 @@ namespace BTCPayServer.Configuration
             return builder.ToString();
         }
     }
-    
-    public class ExternalServices : MultiValueDictionary<string, ExternalService>
-    {
-        public IEnumerable<T> GetServices<T>(string cryptoCode) where T : ExternalService
-        {
-            if (!this.TryGetValue(cryptoCode.ToUpperInvariant(), out var services))
-                return Array.Empty<T>();
-            return services.OfType<T>();
-        }
-    }
-
-    public class ExternalService
-    {
-
-    }
-
-    public class ExternalLNDGRPC : ExternalService
-    {
-        public ExternalLNDGRPC(LightningConnectionString connectionString)
-        {
-            ConnectionString = connectionString;
-        }
-
-        public LightningConnectionString ConnectionString { get; set; }
-    }
 }

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -27,20 +27,19 @@ namespace BTCPayServer.Configuration
             };
             app.HelpOption("-? | -h | --help");
             app.Option("-n | --network", $"Set the network among (mainnet,testnet,regtest) (default: mainnet)", CommandOptionType.SingleValue);
-            app.Option("--testnet | -testnet", $"Use testnet (deprecated, use --network instead)", CommandOptionType.BoolValue);
-            app.Option("--regtest | -regtest", $"Use regtest (deprecated, use --network instead)", CommandOptionType.BoolValue);
-            app.Option("--chains | -c", $"Chains to support as a comma separated (default: btc; available: {chains})", CommandOptionType.SingleValue);
-            app.Option("--postgres", $"Connection string to a PostgreSQL database (default: SQLite)", 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("--bundlejscss", $"Bundle JavaScript and CSS files for better performance (default: true)", CommandOptionType.SingleValue);
+            app.Option("--testnet | -testnet", $"Use testnet (Deprecated, use --network instead)", CommandOptionType.BoolValue);
+            app.Option("--regtest | -regtest", $"Use regtest (Deprecated, use --network instead)", CommandOptionType.BoolValue);
+            app.Option("--chains | -c", $"Chains to support comma separated (default: btc, available: {chains})", CommandOptionType.SingleValue);
+            app.Option("--postgres", $"Connection string to postgres database (default: sqlite is used)", CommandOptionType.SingleValue);
+            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("--bundlejscss", $"Bundle javascript and css files for better performance (default: true)", CommandOptionType.SingleValue);
             app.Option("--rootpath", "The root path in the URL to access BTCPay (default: /)", CommandOptionType.SingleValue);
             foreach (var network in provider.GetAll())
             {
                 var crypto = network.CryptoCode.ToLowerInvariant();
-                app.Option($"--{crypto}explorerurl", $"URL of the NBXplorer for {network.CryptoCode} (default: {network.NBXplorerNetwork.DefaultSettings.DefaultUrl})", CommandOptionType.SingleValue);
+                app.Option($"--{crypto}explorerurl", $"Url of the NBxplorer for {network.CryptoCode} (default: {network.NBXplorerNetwork.DefaultSettings.DefaultUrl})", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}explorercookiefile", $"Path to the cookie file (default: {network.NBXplorerNetwork.DefaultSettings.DefaultCookieFile})", CommandOptionType.SingleValue);
-                app.Option($"--{crypto}lightning", $"Easy configuration of lightning for the server administrator: Must be a UNIX socket of c-lightning (lightning-rpc) or URL to a charge server (default: empty)", CommandOptionType.SingleValue);
-                app.Option($"--{crypto}externallndgrpc", $"The LND gRPC configuration BTCPay will expose to easily connect to the internal lnd wallet from Zap wallet (default: empty)", CommandOptionType.SingleValue);
+                app.Option($"--{crypto}lightning", $"Easy configuration of lightning for the server adnistrator: Must be a unix socket of CLightning (lightning-rpc) or URL to a charge server (default: empty)", CommandOptionType.SingleValue);
             }
             return app;
         }

BTCPayServer/Controllers/AccessTokenController.cs

@@ -12,8 +12,7 @@ using System.Threading.Tasks;
 
 namespace BTCPayServer.Controllers
 {
-    [Authorize(AuthenticationSchemes = Security.Policies.BitpayAuthentication)]
-    [BitpayAPIConstraint(true)]
+    [BitpayAPIConstraint]
     public class AccessTokenController : Controller
     {
         TokenRepository _TokenRepository;
@@ -31,7 +30,6 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("tokens")]
-        [AllowAnonymous]
         public async Task<DataWrapper<List<PairingCodeResponse>>> Tokens([FromBody] TokenRequest request)
         {
             PairingCodeEntity pairingEntity = null;
@@ -55,7 +53,7 @@ namespace BTCPayServer.Controllers
             else
             {
                 var sin = this.User.GetSIN() ?? request.Id;
-                if (string.IsNullOrEmpty(sin) || !NBitpayClient.Extensions.BitIdExtensions.ValidateSIN(sin))
+                if (string.IsNullOrEmpty(request.Id) || !NBitpayClient.Extensions.BitIdExtensions.ValidateSIN(request.Id))
                     throw new BitpayHttpException(400, "'id' property is required, alternatively, use BitId");
 
                 pairingEntity = await _TokenRepository.GetPairingAsync(request.PairingCode);
@@ -79,7 +77,6 @@ namespace BTCPayServer.Controllers
                 {
                     new PairingCodeResponse()
                     {
-                        Policies = new Newtonsoft.Json.Linq.JArray(),
                         PairingCode = pairingEntity.Id,
                         PairingExpiration = pairingEntity.Expiration,
                         DateCreated = pairingEntity.CreatedTime,

BTCPayServer/Controllers/AppsController.PointOfSale.cs

@@ -17,8 +17,6 @@ using YamlDotNet.RepresentationModel;
 using System.IO;
 using BTCPayServer.Services.Rates;
 using System.Globalization;
-using System.Text;
-using System.Text.Encodings.Web;
 
 namespace BTCPayServer.Controllers
 {
@@ -59,50 +57,9 @@ namespace BTCPayServer.Controllers
             var app = await GetOwnedApp(appId, AppType.PointOfSale);
             if (app == null)
                 return NotFound();
-            var settings = app.GetSettings<PointOfSaleSettings>();
-            var vm = new UpdatePointOfSaleViewModel()
-            {
-                Title = settings.Title,
-                ShowCustomAmount = settings.ShowCustomAmount,
-                Currency = settings.Currency,
-                Template = settings.Template
-            };
-            if (HttpContext?.Request != null)
-            {
-                var appUrl = HttpContext.Request.GetAbsoluteRoot().WithTrailingSlash() + $"apps/{appId}/pos";
-                var encoder = HtmlEncoder.Default;
-                if (settings.ShowCustomAmount)
-                {
-                    StringBuilder builder = new StringBuilder();
-                    builder.AppendLine($"<form method=\"POST\" action=\"{encoder.Encode(appUrl)}\">");
-                    builder.AppendLine($"  <input type=\"hidden\" name=\"amount\" value=\"100\" />");
-                    builder.AppendLine($"  <input type=\"hidden\" name=\"email\" value=\"customer@example.com\" />");
-                    builder.AppendLine($"  <input type=\"hidden\" name=\"orderId\" value=\"CustomOrderId\" />");
-                    builder.AppendLine($"  <input type=\"hidden\" name=\"notificationUrl\" value=\"https://example.com/callbacks\" />");
-                    builder.AppendLine($"  <input type=\"hidden\" name=\"redirectUrl\" value=\"https://example.com/thanksyou\" />");
-                    builder.AppendLine($"  <button type=\"submit\">Buy now</button>");
-                    builder.AppendLine($"</form>");
-                    vm.Example1 = builder.ToString();
-                }
-                try
-                {
-                    var items = Parse(settings.Template, settings.Currency);
-                    var builder = new StringBuilder();
-                    builder.AppendLine($"<form method=\"POST\" action=\"{encoder.Encode(appUrl)}\">");
-                    builder.AppendLine($"  <input type=\"hidden\" name=\"email\" value=\"customer@example.com\" />");
-                    builder.AppendLine($"  <input type=\"hidden\" name=\"orderId\" value=\"CustomOrderId\" />");
-                    builder.AppendLine($"  <input type=\"hidden\" name=\"notificationUrl\" value=\"https://example.com/callbacks\" />");
-                    builder.AppendLine($"  <input type=\"hidden\" name=\"redirectUrl\" value=\"https://example.com/thanksyou\" />");
-                    builder.AppendLine($"  <button type=\"submit\" name=\"choiceKey\" value=\"{items[0].Id}\">Buy now</button>");
-                    builder.AppendLine($"</form>");
-                    vm.Example2 = builder.ToString();
-                }
-                catch { }
-                vm.InvoiceUrl = appUrl + "invoices/SkdsDghkdP3D3qkj7bLq3";
-            }
 
-            vm.ExampleCallback = "{\n  \"id\":\"SkdsDghkdP3D3qkj7bLq3\",\n  \"url\":\"https://btcpay.example.com/invoice?id=SkdsDghkdP3D3qkj7bLq3\",\n  \"status\":\"paid\",\n  \"price\":10,\n  \"currency\":\"EUR\",\n  \"invoiceTime\":1520373130312,\n  \"expirationTime\":1520374030312,\n  \"currentTime\":1520373179327,\n  \"exceptionStatus\":false,\n  \"buyerFields\":{\n    \"buyerEmail\":\"customer@example.com\",\n    \"buyerNotify\":false\n  },\n  \"paymentSubtotals\": {\n    \"BTC\":114700\n  },\n  \"paymentTotals\": {\n    \"BTC\":118400\n  },\n  \"transactionCurrency\": \"BTC\",\n  \"amountPaid\": \"1025900\",\n  \"exchangeRates\": {\n    \"BTC\": {\n      \"EUR\": 8721.690715789999,\n      \"USD\": 10817.99\n    }\n  }\n}";
-            return View(vm);
+            var settings = app.GetSettings<PointOfSaleSettings>();
+            return View(new UpdatePointOfSaleViewModel() { Title = settings.Title, ShowCustomAmount = settings.ShowCustomAmount, Currency = settings.Currency, Template = settings.Template });
         }
         [HttpPost]
         [Route("{appId}/settings/pos")]
@@ -134,7 +91,7 @@ namespace BTCPayServer.Controllers
             });
             await UpdateAppSettings(app);
             StatusMessage = "App updated";
-            return RedirectToAction(nameof(ListApps));
+            return RedirectToAction(nameof(UpdatePointOfSale));
         }
 
         [HttpGet]
@@ -147,7 +104,6 @@ namespace BTCPayServer.Controllers
             var settings = app.GetSettings<PointOfSaleSettings>();
             var currency = _Currencies.GetCurrencyData(settings.Currency, false);
             double step = currency == null ? 1 : Math.Pow(10, -(currency.Divisibility));
-
             return View(new ViewPointOfSaleViewModel()
             {
                 Title = settings.Title,
@@ -162,8 +118,7 @@ namespace BTCPayServer.Controllers
             using (var ctx = _ContextFactory.CreateContext())
             {
                 return await ctx.Apps
-                                .Where(us => us.Id == appId && 
-                                             us.AppType == appType.ToString())
+                                .Where(us => us.Id == appId && us.AppType == appType.ToString())
                                 .FirstOrDefaultAsync();
             }
         }
@@ -208,13 +163,7 @@ namespace BTCPayServer.Controllers
         [HttpPost]
         [Route("{appId}/pos")]
         [IgnoreAntiforgeryToken]
-        public async Task<IActionResult> ViewPointOfSale(string appId,
-                                                        decimal amount,
-                                                        string email,
-                                                        string orderId,
-                                                        string notificationUrl,
-                                                        string redirectUrl,
-                                                        string choiceKey)
+        public async Task<IActionResult> ViewPointOfSale(string appId, decimal amount, string choiceKey)
         {
             var app = await GetApp(appId, AppType.PointOfSale);
             if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
@@ -224,7 +173,7 @@ namespace BTCPayServer.Controllers
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<PointOfSaleSettings>();
-            if (string.IsNullOrEmpty(choiceKey) && !settings.ShowCustomAmount)
+            if(string.IsNullOrEmpty(choiceKey) && !settings.ShowCustomAmount)
             {
                 return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId });
             }
@@ -241,22 +190,16 @@ namespace BTCPayServer.Controllers
             }
             else
             {
-                if (!settings.ShowCustomAmount)
-                    return NotFound();
                 price = amount;
                 title = settings.Title;
             }
+
             var store = await GetStore(app);
             var invoice = await _InvoiceController.CreateInvoiceCore(new NBitpayClient.Invoice()
             {
                 ItemDesc = title,
                 Currency = settings.Currency,
                 Price = price,
-                BuyerEmail = email,
-                OrderId = orderId,
-                NotificationURL = notificationUrl,
-                RedirectURL = redirectUrl,
-                FullNotifications = true
             }, store, HttpContext.Request.GetAbsoluteRoot());
             return Redirect(invoice.Data.Url);
         }

BTCPayServer/Controllers/AppsController.cs

@@ -102,9 +102,9 @@ namespace BTCPayServer.Controllers
                 StatusMessage = "Error: You are not owner of this store";
                 return RedirectToAction(nameof(ListApps));
             }
-            var id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(32));
             using (var ctx = _ContextFactory.CreateContext())
             {
+                var id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(32));
                 var appData = new AppData() { Id = id };
                 appData.StoreDataId = selectedStore;
                 appData.Name = vm.Name;
@@ -113,9 +113,6 @@ namespace BTCPayServer.Controllers
                 await ctx.SaveChangesAsync();
             }
             StatusMessage = "App successfully created";
-
-            if (appType == AppType.PointOfSale)
-                return RedirectToAction(nameof(UpdatePointOfSale), new { appId = id });
             return RedirectToAction(nameof(ListApps));
         }
 

BTCPayServer/Controllers/HomeController.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using BTCPayServer.Models;
-using NBitcoin.DataEncoders;
 
 namespace BTCPayServer.Controllers
 {

BTCPayServer/Controllers/InvoiceController.API.cs

@@ -20,7 +20,7 @@ namespace BTCPayServer.Controllers
 {
     [EnableCors("BitpayAPI")]
     [BitpayAPIConstraint]
-    [Authorize(Policies.CanUseStore.Key, AuthenticationSchemes = Policies.BitpayAuthentication)]
+    [Authorize(Policies.CanUseStore.Key)]
     public class InvoiceControllerAPI : Controller
     {
         private InvoiceController _InvoiceController;

BTCPayServer/Controllers/InvoiceController.PaymentProtocol.cs

@@ -78,7 +78,7 @@ namespace BTCPayServer.Controllers
             var wallet = _WalletProvider.GetWallet(network);
             if (wallet == null)
                 return NotFound();
-            var payment = PaymentMessage.Load(Request.Body, network.NBitcoinNetwork);
+            var payment = PaymentMessage.Load(Request.Body);
             var unused = wallet.BroadcastTransactionsAsync(payment.Transactions);
             await _InvoiceRepository.AddRefundsAsync(invoiceId, payment.RefundTo.Select(p => new TxOut(p.Amount, p.Script)).ToArray(), network.NBitcoinNetwork);
             return new PaymentAckActionResult(payment.CreateACK(invoiceId + " is currently processing, thanks for your purchase..."));

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -175,7 +175,6 @@ namespace BTCPayServer.Controllers
         [Route("invoice")]
         [AcceptMediaTypeConstraint("application/bitcoin-paymentrequest", false)]
         [XFrameOptionsAttribute(null)]
-        [ReferrerPolicyAttribute("origin")]
         public async Task<IActionResult> Checkout(string invoiceId, string id = null, string paymentMethodId = null)
         {
             //Keep compatibility with Bitpay
@@ -187,20 +186,6 @@ namespace BTCPayServer.Controllers
             if (model == null)
                 return NotFound();
 
-
-            _CSP.Add(new ConsentSecurityPolicy("script-src", "'unsafe-eval'")); // Needed by Vue
-            if (!string.IsNullOrEmpty(model.CustomCSSLink) &&
-                Uri.TryCreate(model.CustomCSSLink, UriKind.Absolute, out var uri))
-            {
-                _CSP.Clear();
-            }
-
-            if (!string.IsNullOrEmpty(model.CustomLogoLink) &&
-                Uri.TryCreate(model.CustomLogoLink, UriKind.Absolute, out uri))
-            {
-                _CSP.Clear();
-            }
-
             return View(nameof(Checkout), model);
         }
 
@@ -213,7 +198,7 @@ namespace BTCPayServer.Controllers
             bool isDefaultCrypto = false;
             if (paymentMethodIdStr == null)
             {
-                paymentMethodIdStr = store.GetDefaultCrypto(_NetworkProvider);
+                paymentMethodIdStr = store.GetDefaultCrypto();
                 isDefaultCrypto = true;
             }
 
@@ -248,8 +233,6 @@ namespace BTCPayServer.Controllers
             {
                 CryptoCode = network.CryptoCode,
                 PaymentMethodId = paymentMethodId.ToString(),
-                PaymentMethodName = GetDisplayName(paymentMethodId, network),
-                CryptoImage = GetImage(paymentMethodId, network),
                 IsLightning = paymentMethodId.PaymentType == PaymentTypes.LightningLike,
                 ServerUrl = HttpContext.Request.GetAbsoluteRoot(),
                 OrderId = invoice.OrderId,
@@ -281,6 +264,7 @@ namespace BTCPayServer.Controllers
                 TxCount = accounting.TxRequired,
                 BtcPaid = accounting.Paid.ToString(),
                 Status = invoice.Status,
+                CryptoImage = "/" + GetImage(paymentMethodId, network),
                 NetworkFee = paymentMethodDetails.GetTxFee(),
                 IsMultiCurrency = invoice.GetPayments().Select(p => p.GetPaymentMethodId()).Concat(new[] { paymentMethod.GetId() }).Distinct().Count() > 1,
                 AllowCoinConversion = storeBlob.AllowCoinConversion,
@@ -289,14 +273,10 @@ namespace BTCPayServer.Controllers
                                           .Select(kv => new PaymentModel.AvailableCrypto()
                                           {
                                               PaymentMethodId = kv.GetId().ToString(),
-                                              CryptoCode = kv.GetId().CryptoCode,
-                                              PaymentMethodName = GetDisplayName(kv.GetId(), kv.Network),
-                                              IsLightning = kv.GetId().PaymentType == PaymentTypes.LightningLike,
-                                              CryptoImage = GetImage(kv.GetId(), kv.Network),
+                                              CryptoImage = "/" + GetImage(kv.GetId(), kv.Network),
                                               Link = Url.Action(nameof(Checkout), new { invoiceId = invoiceId, paymentMethodId = kv.GetId().ToString() })
                                           }).Where(c => c.CryptoImage != "/")
-                                          .OrderByDescending(a => a.CryptoCode == "BTC").ThenBy(a => a.PaymentMethodName).ThenBy(a => a.IsLightning ? 1 : 0)
-                                          .ToList()
+                .ToList()
             };
 
             var expiration = TimeSpan.FromSeconds(model.ExpirationSeconds);
@@ -304,17 +284,9 @@ namespace BTCPayServer.Controllers
             return model;
         }
 
-        private string GetDisplayName(PaymentMethodId paymentMethodId, BTCPayNetwork network)
-        {
-            return paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
-                network.DisplayName : network.DisplayName + " (via Lightning)";
-        }
-
         private string GetImage(PaymentMethodId paymentMethodId, BTCPayNetwork network)
         {
-            var res = paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
-                Url.Content(network.CryptoImagePath) : Url.Content(network.LightningImagePath);
-            return "/" + res;
+            return (paymentMethodId.PaymentType == PaymentTypes.BTCLike ? Url.Content(network.CryptoImagePath) : Url.Content(network.LightningImagePath));
         }
 
         private string OrderAmountFromInvoice(string cryptoCode, ProductInformation productInformation)
@@ -351,7 +323,7 @@ namespace BTCPayServer.Controllers
                 provider = (NumberFormatInfo)provider.Clone();
                 provider.CurrencyDecimalDigits = divisibility;
             }
-
+            
             if (currencyData.Crypto)
                 return price.ToString("C", provider);
             else
@@ -384,7 +356,7 @@ namespace BTCPayServer.Controllers
             {
                 leases.Add(_EventAggregator.Subscribe<Events.InvoiceDataChangedEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
                 leases.Add(_EventAggregator.Subscribe<Events.InvoiceNewAddressEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
-                leases.Add(_EventAggregator.Subscribe<Events.InvoiceEvent>(async o => await NotifySocket(webSocket, o.Invoice.Id, invoiceId)));
+                leases.Add(_EventAggregator.Subscribe<Events.InvoiceEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
                 while (true)
                 {
                     var message = await webSocket.ReceiveAsync(DummyBuffer, default(CancellationToken));
@@ -453,7 +425,7 @@ namespace BTCPayServer.Controllers
                 {
                     Status = invoice.Status + (invoice.ExceptionStatus == null ? string.Empty : $" ({invoice.ExceptionStatus})"),
                     ShowCheckout = invoice.Status == "new",
-                    Date = invoice.InvoiceTime,
+                    Date = (DateTimeOffset.UtcNow - invoice.InvoiceTime).Prettify() + " ago",
                     InvoiceId = invoice.Id,
                     OrderId = invoice.OrderId ?? string.Empty,
                     RedirectUrl = invoice.RedirectURL ?? string.Empty,
@@ -563,11 +535,8 @@ namespace BTCPayServer.Controllers
         [BitpayAPIConstraint(false)]
         public async Task<IActionResult> InvalidatePaidInvoice(string invoiceId)
         {
-            var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId);
-            if (invoice == null)
-                return NotFound();
             await _InvoiceRepository.UpdatePaidInvoiceToInvalid(invoiceId);
-            _EventAggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1008, "invoice_markedInvalid"));
+            _EventAggregator.Publish(new InvoiceEvent(invoiceId, 1008, "invoice_markedInvalid"));
             return RedirectToAction(nameof(ListInvoices));
         }
 

BTCPayServer/Controllers/InvoiceController.cs

@@ -41,14 +41,12 @@ using NBXplorer;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Payments;
 using BTCPayServer.Rating;
-using BTCPayServer.Security;
 
 namespace BTCPayServer.Controllers
 {
     public partial class InvoiceController : Controller
     {
         InvoiceRepository _InvoiceRepository;
-        ContentSecurityPolicies _CSP;
         BTCPayRateProviderFactory _RateProvider;
         StoreRepository _StoreRepository;
         UserManager<ApplicationUser> _UserManager;
@@ -66,7 +64,6 @@ namespace BTCPayServer.Controllers
             StoreRepository storeRepository,
             EventAggregator eventAggregator,
             BTCPayWalletProvider walletProvider,
-            ContentSecurityPolicies csp,
             BTCPayNetworkProvider networkProvider)
         {
             _ServiceProvider = serviceProvider;
@@ -78,14 +75,11 @@ namespace BTCPayServer.Controllers
             _EventAggregator = eventAggregator;
             _NetworkProvider = networkProvider;
             _WalletProvider = walletProvider;
-            _CSP = csp;
         }
 
 
         internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl)
         {
-            InvoiceLogs logs = new InvoiceLogs();
-            logs.Write("Creation of invoice starting");
             var entity = new InvoiceEntity
             {
                 InvoiceTime = DateTimeOffset.UtcNow
@@ -115,12 +109,10 @@ namespace BTCPayServer.Controllers
             }
             entity.ProductInformation = Map<Invoice, ProductInformation>(invoice);
             entity.RedirectURL = invoice.RedirectURL ?? store.StoreWebsite;
-            if (!Uri.IsWellFormedUriString(entity.RedirectURL, UriKind.Absolute))
-                entity.RedirectURL = null;
-
             entity.Status = "new";
             entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);
 
+
             HashSet<CurrencyPair> currencyPairsToFetch = new HashSet<CurrencyPair>();
             var rules = storeBlob.GetRateRules(_NetworkProvider);
 
@@ -138,7 +130,6 @@ namespace BTCPayServer.Controllers
             var rateRules = storeBlob.GetRateRules(_NetworkProvider);
             var fetchingByCurrencyPair = _RateProvider.FetchRates(currencyPairsToFetch, rateRules);
 
-            var fetchingAll = WhenAllFetched(logs, fetchingByCurrencyPair);
             var supportedPaymentMethods = store.GetSupportedPaymentMethods(_NetworkProvider)
                                                .Select(c =>
                                                 (Handler: (IPaymentMethodHandler)_ServiceProvider.GetService(typeof(IPaymentMethodHandler<>).MakeGenericType(c.GetType())),
@@ -147,26 +138,65 @@ namespace BTCPayServer.Controllers
                                                 .Where(c => c.Network != null)
                                                 .Select(o =>
                                                     (SupportedPaymentMethod: o.SupportedPaymentMethod,
-                                                    PaymentMethod: CreatePaymentMethodAsync(fetchingByCurrencyPair, o.Handler, o.SupportedPaymentMethod, o.Network, entity, store, logs)))
+                                                    PaymentMethod: CreatePaymentMethodAsync(fetchingByCurrencyPair, o.Handler, o.SupportedPaymentMethod, o.Network, entity, store)))
                                                 .ToList();
+
+            List<string> paymentMethodErrors = new List<string>();
             List<ISupportedPaymentMethod> supported = new List<ISupportedPaymentMethod>();
             var paymentMethods = new PaymentMethodDictionary();
+
+            foreach(var pair in fetchingByCurrencyPair)
+            {
+                var rateResult = await pair.Value;
+                bool hasError = false;
+                if(rateResult.Errors.Count != 0)
+                {
+                    var allRateRuleErrors = string.Join(", ", rateResult.Errors.ToArray());
+                    paymentMethodErrors.Add($"{pair.Key}: Rate rule error ({allRateRuleErrors})");
+                    hasError = true;
+                }
+                if(rateResult.ExchangeExceptions.Count != 0)
+                {
+                    foreach(var ex in rateResult.ExchangeExceptions)
+                    {
+                        paymentMethodErrors.Add($"{pair.Key}: Exception reaching exchange {ex.ExchangeName} ({ex.Exception.Message})");
+                    }
+                    hasError = true;
+                }
+                if(hasError)
+                {
+                    paymentMethodErrors.Add($"{pair.Key}: The rule is {rateResult.Rule}");
+                    paymentMethodErrors.Add($"{pair.Key}: Evaluated rule is {rateResult.EvaluatedRule}");
+                }
+            }
+
             foreach (var o in supportedPaymentMethods)
             {
-                var paymentMethod = await o.PaymentMethod;
-                if (paymentMethod == null)
-                    continue;
-                supported.Add(o.SupportedPaymentMethod);
-                paymentMethods.Add(paymentMethod);
+                try
+                {
+                    var paymentMethod = await o.PaymentMethod;
+                    if (paymentMethod == null)
+                        throw new PaymentMethodUnavailableException("Payment method unavailable");
+                    supported.Add(o.SupportedPaymentMethod);
+                    paymentMethods.Add(paymentMethod);
+                }
+                catch (PaymentMethodUnavailableException ex)
+                {
+                    paymentMethodErrors.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Payment method unavailable ({ex.Message})");
+                }
+                catch (Exception ex)
+                {
+                    paymentMethodErrors.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Unexpected exception ({ex.ToString()})");
+                }
             }
 
             if (supported.Count == 0)
             {
                 StringBuilder errors = new StringBuilder();
                 errors.AppendLine("No payment method available for this store");
-                foreach (var error in logs.ToList())
+                foreach (var error in paymentMethodErrors)
                 {
-                    errors.AppendLine(error.ToString());
+                    errors.AppendLine(error);
                 }
                 throw new BitpayHttpException(400, errors.ToString());
             }
@@ -174,108 +204,71 @@ namespace BTCPayServer.Controllers
             entity.SetSupportedPaymentMethods(supported);
             entity.SetPaymentMethods(paymentMethods);
             entity.PosData = invoice.PosData;
-            entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, logs, _NetworkProvider);
-            await fetchingAll;
-            _EventAggregator.Publish(new Events.InvoiceEvent(entity.EntityToDTO(_NetworkProvider), 1001, "invoice_created"));
+            entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, paymentMethodErrors, _NetworkProvider);
+
+            _EventAggregator.Publish(new Events.InvoiceEvent(entity, 1001, "invoice_created"));
             var resp = entity.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }
 
-        private Task WhenAllFetched(InvoiceLogs logs, Dictionary<CurrencyPair, Task<RateResult>> fetchingByCurrencyPair)
+        private async Task<PaymentMethod> CreatePaymentMethodAsync(Dictionary<CurrencyPair, Task<RateResult>> fetchingByCurrencyPair, IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store)
         {
-            return Task.WhenAll(fetchingByCurrencyPair.Select(async pair =>
+            var storeBlob = store.GetStoreBlob();
+            var rate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, entity.ProductInformation.Currency)];
+            if (rate.Value == null)
+                return null;
+            PaymentMethod paymentMethod = new PaymentMethod();
+            paymentMethod.ParentEntity = entity;
+            paymentMethod.Network = network;
+            paymentMethod.SetId(supportedPaymentMethod.PaymentId);
+            paymentMethod.Rate = rate.Value.Value;
+            var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, store, network);
+            if (storeBlob.NetworkFeeDisabled)
+                paymentDetails.SetNoTxFee();
+            paymentMethod.SetPaymentMethodDetails(paymentDetails);
+
+            Func<Money, Money, bool> compare = null;
+            CurrencyValue limitValue = null;
+            string errorMessage = null;
+            if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.LightningLike &&
+               storeBlob.LightningMaxValue != null)
             {
-                var rateResult = await pair.Value;
-                logs.Write($"{pair.Key}: The rating rule is {rateResult.Rule}");
-                logs.Write($"{pair.Key}: The evaluated rating rule is {rateResult.EvaluatedRule}");
-                if (rateResult.Errors.Count != 0)
+                compare = (a, b) => a > b;
+                limitValue = storeBlob.LightningMaxValue;
+                errorMessage = "The amount of the invoice is too high to be paid with lightning";
+            }
+            else if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.BTCLike &&
+               storeBlob.OnChainMinValue != null)
+            {
+                compare = (a, b) => a < b;
+                limitValue = storeBlob.OnChainMinValue;
+                errorMessage = "The amount of the invoice is too low to be paid on chain";
+            }
+
+            if (compare != null)
+            {
+                var limitValueRate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, limitValue.Currency)];
+                if (limitValueRate.Value.HasValue)
                 {
-                    var allRateRuleErrors = string.Join(", ", rateResult.Errors.ToArray());
-                    logs.Write($"{pair.Key}: Rate rule error ({allRateRuleErrors})");
-                }
-                if (rateResult.ExchangeExceptions.Count != 0)
-                {
-                    foreach (var ex in rateResult.ExchangeExceptions)
+                    var limitValueCrypto = Money.Coins(limitValue.Value / limitValueRate.Value.Value);
+                    if (compare(paymentMethod.Calculate().Due, limitValueCrypto))
                     {
-                        logs.Write($"{pair.Key}: Exception reaching exchange {ex.ExchangeName} ({ex.Exception.Message})");
+                        throw new PaymentMethodUnavailableException(errorMessage);
                     }
                 }
-            }).ToArray());
-        }
-
-        private async Task<PaymentMethod> CreatePaymentMethodAsync(Dictionary<CurrencyPair, Task<RateResult>> fetchingByCurrencyPair, IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store, InvoiceLogs logs)
-        {
-            try
-            {
-                var storeBlob = store.GetStoreBlob();
-                var rate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, entity.ProductInformation.Currency)];
-                if (rate.BidAsk == null)
-                {
-                    return null;
-                }
-                PaymentMethod paymentMethod = new PaymentMethod();
-                paymentMethod.ParentEntity = entity;
-                paymentMethod.Network = network;
-                paymentMethod.SetId(supportedPaymentMethod.PaymentId);
-                paymentMethod.Rate = rate.BidAsk.Bid;
-                var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, store, network);
-                if (storeBlob.NetworkFeeDisabled)
-                    paymentDetails.SetNoTxFee();
-                paymentMethod.SetPaymentMethodDetails(paymentDetails);
-
-                Func<Money, Money, bool> compare = null;
-                CurrencyValue limitValue = null;
-                string errorMessage = null;
-                if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.LightningLike &&
-                   storeBlob.LightningMaxValue != null)
-                {
-                    compare = (a, b) => a > b;
-                    limitValue = storeBlob.LightningMaxValue;
-                    errorMessage = "The amount of the invoice is too high to be paid with lightning";
-                }
-                else if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.BTCLike &&
-                   storeBlob.OnChainMinValue != null)
-                {
-                    compare = (a, b) => a < b;
-                    limitValue = storeBlob.OnChainMinValue;
-                    errorMessage = "The amount of the invoice is too low to be paid on chain";
-                }
-
-                if (compare != null)
-                {
-                    var limitValueRate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, limitValue.Currency)];
-                    if (limitValueRate.BidAsk != null)
-                    {
-                        var limitValueCrypto = Money.Coins(limitValue.Value / limitValueRate.BidAsk.Bid);
-                        if (compare(paymentMethod.Calculate().Due, limitValueCrypto))
-                        {
-                            logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: {errorMessage}");
-                            return null;
-                        }
-                    }
-                }
-                ///////////////
+            }
+            ///////////////
 
 
 #pragma warning disable CS0618
-                if (paymentMethod.GetId().IsBTCOnChain)
-                {
-                    entity.TxFee = paymentMethod.TxFee;
-                    entity.Rate = paymentMethod.Rate;
-                    entity.DepositAddress = paymentMethod.DepositAddress;
-                }
+            if (paymentMethod.GetId().IsBTCOnChain)
+            {
+                entity.TxFee = paymentMethod.TxFee;
+                entity.Rate = paymentMethod.Rate;
+                entity.DepositAddress = paymentMethod.DepositAddress;
+            }
 #pragma warning restore CS0618
-                return paymentMethod;
-            }
-            catch (PaymentMethodUnavailableException ex)
-            {
-                logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: Payment method unavailable ({ex.Message})");
-            }
-            catch (Exception ex)
-            {
-                logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: Unexpected exception ({ex.ToString()})");
-            }
-            return null;
+            return paymentMethod;
         }
 
         private SpeedPolicy ParseSpeedPolicy(string transactionSpeed, SpeedPolicy defaultPolicy)

BTCPayServer/Controllers/RateController.cs

@@ -31,57 +31,6 @@ namespace BTCPayServer.Controllers
             _CurrencyNameTable = currencyNameTable ?? throw new ArgumentNullException(nameof(currencyNameTable));
         }
 
-        [Route("rates/{baseCurrency}")]
-        [HttpGet]
-        [BitpayAPIConstraint]
-        public async Task<IActionResult> GetBaseCurrencyRates(string baseCurrency, string storeId)
-        {
-            storeId = storeId ?? this.HttpContext.GetStoreData()?.Id;
-            var store = this.HttpContext.GetStoreData();
-            if (store == null || store.Id != storeId)
-                store = await _StoreRepo.FindStore(storeId);
-            if (store == null)
-            {
-                var err = Json(new BitpayErrorsModel() { Error = "Store not found" });
-                err.StatusCode = 404;
-                return err;
-            }
-            var currencypairs = "";
-            var supportedMethods = store.GetSupportedPaymentMethods(_NetworkProvider);
-
-            var currencyCodes = supportedMethods.Where(method => !string.IsNullOrEmpty(method.PaymentId.CryptoCode))
-                .Select(method => method.PaymentId.CryptoCode).Distinct();
-
-
-            foreach (var currencyCode in currencyCodes)
-            {
-                if (!string.IsNullOrEmpty(currencypairs))
-                {
-                    currencypairs += ",";
-                }
-                currencypairs += baseCurrency + "_ " + currencyCode;
-            }
-            var result = await GetRates2(currencypairs, store.Id);
-            var rates = (result as JsonResult)?.Value as Rate[];
-            if (rates == null)
-                return result;
-            return Json(new DataWrapper<Rate[]>(rates));
-        }
-
-
-        [Route("rates/{baseCurrency}/{currency}")]
-        [HttpGet]
-        [BitpayAPIConstraint]
-        public async Task<IActionResult> GetCurrencyPairRate(string baseCurrency, string currency, string storeId)
-        {
-            storeId = storeId ?? this.HttpContext.GetStoreData()?.Id;
-            var result = await GetRates2($"{baseCurrency}_{currency}", storeId);
-            var rates = (result as JsonResult)?.Value as Rate[];
-            if (rates == null)
-                return result;
-            return Json(new DataWrapper<Rate>(rates.First()));
-        }
-
         [Route("rates")]
         [HttpGet]
         [BitpayAPIConstraint]
@@ -95,19 +44,19 @@ namespace BTCPayServer.Controllers
             return Json(new DataWrapper<Rate[]>(rates));
         }
 
-
         [Route("api/rates")]
         [HttpGet]
         public async Task<IActionResult> GetRates2(string currencyPairs, string storeId)
         {
-            if (storeId == null)
+            if(storeId == null || currencyPairs == null)
             {
-                var result = Json(new BitpayErrorsModel() { Error = "You need to specify storeId (in your store settings)" });
+                var result = Json(new BitpayErrorsModel() { Error = "You need to specify storeId (in your store settings) and currencyPairs (eg. BTC_USD,LTC_CAD)" });
                 result.StatusCode = 400;
                 return result;
             }
+
             var store = this.HttpContext.GetStoreData();
-            if (store == null || store.Id != storeId)
+            if(store == null || store.Id != storeId)
                 store = await _StoreRepo.FindStore(storeId);
             if (store == null)
             {
@@ -115,40 +64,12 @@ namespace BTCPayServer.Controllers
                 result.StatusCode = 404;
                 return result;
             }
-
-            if (currencyPairs == null)
-            {
-                currencyPairs = "";
-                var supportedMethods = store.GetSupportedPaymentMethods(_NetworkProvider);
-                var currencyCodes = supportedMethods.Where(method => !string.IsNullOrEmpty(method.PaymentId.CryptoCode))
-                    .Select(method => method.PaymentId.CryptoCode).Distinct();
-                var defaultCrypto = store.GetDefaultCrypto(_NetworkProvider);
-
-                foreach (var currencyCode in currencyCodes)
-                {
-                    if (!string.IsNullOrEmpty(currencyPairs))
-                    {
-                        currencyPairs += ",";
-                    }
-                    currencyPairs += $"{defaultCrypto}_{currencyCode}";
-                }
-
-
-                if (string.IsNullOrEmpty(currencyPairs))
-                {
-                    var result = Json(new BitpayErrorsModel() { Error = "You need to specify currencyPairs (eg. BTC_USD,LTC_CAD)" });
-                    result.StatusCode = 400;
-                    return result;
-                }
-            }
-
-
             var rules = store.GetStoreBlob().GetRateRules(_NetworkProvider);
 
             HashSet<CurrencyPair> pairs = new HashSet<CurrencyPair>();
-            foreach (var currency in currencyPairs.Split(','))
+            foreach(var currency in currencyPairs.Split(','))
             {
-                if (!CurrencyPair.TryParse(currency, out var pair))
+                if(!CurrencyPair.TryParse(currency, out var pair))
                 {
                     var result = Json(new BitpayErrorsModel() { Error = $"Currency pair {currency} uncorrectly formatted" });
                     result.StatusCode = 400;
@@ -160,8 +81,7 @@ namespace BTCPayServer.Controllers
             var fetching = _RateProviderFactory.FetchRates(pairs, rules);
             await Task.WhenAll(fetching.Select(f => f.Value).ToArray());
             return Json(pairs
-                            .AsParallel()
-                            .Select(r => (Pair: r, Value: fetching[r].GetAwaiter().GetResult().BidAsk?.Bid))
+                            .Select(r => (Pair: r, Value: fetching[r].GetAwaiter().GetResult().Value))
                             .Where(r => r.Value.HasValue)
                             .Select(r =>
                             new Rate()

BTCPayServer/Controllers/ServerController.cs

@@ -1,19 +1,13 @@
-using BTCPayServer.Configuration;
-using Microsoft.Extensions.Logging;
-using BTCPayServer.HostedServices;
+using BTCPayServer.HostedServices;
 using BTCPayServer.Models;
 using BTCPayServer.Models.ServerViewModels;
-using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Mails;
 using BTCPayServer.Services.Rates;
-using BTCPayServer.Services.Stores;
 using BTCPayServer.Validations;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using NBitcoin;
-using NBitcoin.DataEncoders;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -22,8 +16,6 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Mail;
 using System.Threading.Tasks;
-using Renci.SshNet;
-using BTCPayServer.Logging;
 
 namespace BTCPayServer.Controllers
 {
@@ -33,23 +25,14 @@ namespace BTCPayServer.Controllers
         private UserManager<ApplicationUser> _UserManager;
         SettingsRepository _SettingsRepository;
         private BTCPayRateProviderFactory _RateProviderFactory;
-        private StoreRepository _StoreRepository;
-        LightningConfigurationProvider _LnConfigProvider;
-        BTCPayServerOptions _Options;
 
         public ServerController(UserManager<ApplicationUser> userManager,
-            Configuration.BTCPayServerOptions options,
             BTCPayRateProviderFactory rateProviderFactory,
-            SettingsRepository settingsRepository,
-            LightningConfigurationProvider lnConfigProvider,
-            Services.Stores.StoreRepository storeRepository)
+            SettingsRepository settingsRepository)
         {
-            _Options = options;
             _UserManager = userManager;
             _SettingsRepository = settingsRepository;
             _RateProviderFactory = rateProviderFactory;
-            _StoreRepository = storeRepository;
-            _LnConfigProvider = lnConfigProvider;
         }
 
         [Route("server/rates")]
@@ -91,7 +74,7 @@ namespace BTCPayServer.Controllers
             try
             {
                 var service = GetCoinaverageService(vm, true);
-                if (service != null)
+                if(service != null)
                     await service.TestAuthAsync();
             }
             catch
@@ -151,150 +134,6 @@ namespace BTCPayServer.Controllers
             return View(userVM);
         }
 
-        [Route("server/maintenance")]
-        public IActionResult Maintenance()
-        {
-            MaintenanceViewModel vm = new MaintenanceViewModel();
-            vm.UserName = "btcpayserver";
-            vm.DNSDomain = this.Request.Host.Host;
-            if (IPAddress.TryParse(vm.DNSDomain, out var unused))
-                vm.DNSDomain = null;
-            return View(vm);
-        }
-        [Route("server/maintenance")]
-        [HttpPost]
-        public async Task<IActionResult> Maintenance(MaintenanceViewModel vm, string command)
-        {
-            if (!ModelState.IsValid)
-                return View(vm);
-            if (command == "changedomain")
-            {
-                if (string.IsNullOrWhiteSpace(vm.DNSDomain))
-                {
-                    ModelState.AddModelError(nameof(vm.DNSDomain), $"Required field");
-                    return View(vm);
-                }
-                vm.DNSDomain = vm.DNSDomain.Trim().ToLowerInvariant();
-                if (IPAddress.TryParse(vm.DNSDomain, out var unused))
-                {
-                    ModelState.AddModelError(nameof(vm.DNSDomain), $"This should be a domain name");
-                    return View(vm);
-                }
-                if (vm.DNSDomain.Equals(this.Request.Host.Host, StringComparison.InvariantCultureIgnoreCase))
-                {
-                    ModelState.AddModelError(nameof(vm.DNSDomain), $"The server is already set to use this domain");
-                    return View(vm);
-                }
-                var builder = new UriBuilder();
-                using (var client = new HttpClient(new HttpClientHandler()
-                {
-                    ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
-                }))
-                {
-                    try
-                    {
-                        builder.Scheme = this.Request.Scheme;
-                        builder.Host = vm.DNSDomain;
-                        if (this.Request.Host.Port != null)
-                            builder.Port = this.Request.Host.Port.Value;
-                        builder.Path = "runid";
-                        builder.Query = $"expected={RunId}";
-                        var response = await client.GetAsync(builder.Uri);
-                        if (!response.IsSuccessStatusCode)
-                        {
-                            ModelState.AddModelError(nameof(vm.DNSDomain), $"Invalid host ({vm.DNSDomain} is not pointing to this BTCPay instance)");
-                            return View(vm);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        var messages = new List<object>();
-                        messages.Add(ex.Message);
-                        if (ex.InnerException != null)
-                            messages.Add(ex.InnerException.Message);
-                        ModelState.AddModelError(nameof(vm.DNSDomain), $"Invalid domain ({string.Join(", ", messages.ToArray())})");
-                        return View(vm);
-                    }
-                }
-
-                var error = RunSSH(vm, $"changedomain.sh {vm.DNSDomain}");
-                if (error != null)
-                    return error;
-
-                builder.Path = null;
-                builder.Query = null;
-                StatusMessage = $"Domain name changing... the server will restart, please use \"{builder.Uri.AbsoluteUri}\"";
-            }
-            else if (command == "update")
-            {
-                var error = RunSSH(vm, $"btcpay-update.sh");
-                if (error != null)
-                    return error;
-                StatusMessage = $"The server might restart soon if an update is available...";
-            }
-            else
-            {
-                return NotFound();
-            }
-            return RedirectToAction(nameof(Maintenance));
-        }
-
-        public static string RunId = Encoders.Hex.EncodeData(NBitcoin.RandomUtils.GetBytes(32));
-        [HttpGet]
-        [Route("runid")]
-        [AllowAnonymous]
-        public IActionResult SeeRunId(string expected = null)
-        {
-            if (expected == RunId)
-                return Ok();
-            return BadRequest();
-        }
-
-        private IActionResult RunSSH(MaintenanceViewModel vm, string ssh)
-        {
-            ssh = $"sudo bash -c '. /etc/profile.d/btcpay-env.sh && nohup {ssh} > /dev/null 2>&1 & disown'";
-            var sshClient = vm.CreateSSHClient(this.Request.Host.Host);
-            try
-            {
-                sshClient.Connect();
-            }
-            catch (Renci.SshNet.Common.SshAuthenticationException)
-            {
-                ModelState.AddModelError(nameof(vm.Password), "Invalid credentials");
-                sshClient.Dispose();
-                return View(vm);
-            }
-            catch (Exception ex)
-            {
-                var message = ex.Message;
-                if (ex is AggregateException aggrEx && aggrEx.InnerException?.Message != null)
-                {
-                    message = aggrEx.InnerException.Message;
-                }
-                ModelState.AddModelError(nameof(vm.UserName), $"Connection problem ({message})");
-                sshClient.Dispose();
-                return View(vm);
-            }
-
-            var sshCommand = sshClient.CreateCommand(ssh);
-            sshCommand.CommandTimeout = TimeSpan.FromMinutes(1.0);
-            sshCommand.BeginExecute(ar =>
-            {
-                try
-                {
-                    Logs.PayServer.LogInformation("Running SSH command: " + ssh);
-                    var result = sshCommand.EndExecute(ar);
-                    Logs.PayServer.LogInformation("SSH command executed: " + result);
-                }
-                catch (Exception ex)
-                {
-                    Logs.PayServer.LogWarning("Error while executing SSH command: " + ex.Message);
-                }
-                sshClient.Dispose();
-            });
-            return null;
-        }
-
         private static bool IsAdmin(IList<string> roles)
         {
             return roles.Contains(Roles.ServerAdmin, StringComparer.Ordinal);
@@ -349,7 +188,6 @@ namespace BTCPayServer.Controllers
             if (user == null)
                 return NotFound();
             await _UserManager.DeleteAsync(user);
-            await _StoreRepository.CleanUnreachableStores();
             StatusMessage = "User deleted";
             return RedirectToAction(nameof(ListUsers));
         }
@@ -382,122 +220,6 @@ namespace BTCPayServer.Controllers
             return View(settings);
         }
 
-        [Route("server/services")]
-        public IActionResult Services()
-        {
-            var result = new ServicesViewModel();
-            foreach (var cryptoCode in _Options.ExternalServicesByCryptoCode.Keys)
-            {
-                {
-                    int i = 0;
-                    foreach (var grpcService in _Options.ExternalServicesByCryptoCode.GetServices<ExternalLNDGRPC>(cryptoCode))
-                    {
-                        result.LNDServices.Add(new ServicesViewModel.LNDServiceViewModel()
-                        {
-                            Crypto = cryptoCode,
-                            Type = "gRPC",
-                            Index = i++,
-                        });
-                    }
-                }
-            }
-            return View(result);
-        }
-
-        [Route("server/services/lnd-grpc/{cryptoCode}/{index}")]
-        public IActionResult LNDGRPCServices(string cryptoCode, int index, uint? nonce)
-        {
-            var external = GetExternalLNDConnectionString(cryptoCode, index);
-            if (external == null)
-                return NotFound();
-            var model = new LNDGRPCServicesViewModel();
-
-            model.Host = $"{external.BaseUri.DnsSafeHost}:{external.BaseUri.Port}";
-            model.SSL = external.BaseUri.Scheme == "https";
-            if (external.CertificateThumbprint != null)
-            {
-                model.CertificateThumbprint = Encoders.Hex.EncodeData(external.CertificateThumbprint);
-            }
-            if (external.Macaroon != null)
-            {
-                model.Macaroon = Encoders.Hex.EncodeData(external.Macaroon);
-            }
-
-            if (nonce != null)
-            {
-                var configKey = GetConfigKey("lnd-grpc", cryptoCode, index, nonce.Value);
-                var lnConfig = _LnConfigProvider.GetConfig(configKey);
-                if (lnConfig != null)
-                {
-                    model.QRCodeLink = $"{this.Request.GetAbsoluteRoot().WithTrailingSlash()}lnd-config/{configKey}/lnd.config";
-                    model.QRCode = $"config={model.QRCodeLink}";
-                }
-            }
-
-            return View(model);
-        }
-
-        private static uint GetConfigKey(string type, string cryptoCode, int index, uint nonce)
-        {
-            return (uint)HashCode.Combine(type, cryptoCode, index, nonce);
-        }
-
-        [Route("lnd-config/{configKey}/lnd.config")]
-        [AllowAnonymous]
-        public IActionResult GetLNDConfig(uint configKey)
-        {
-            var conf = _LnConfigProvider.GetConfig(configKey);
-            if (conf == null)
-                return NotFound();
-            return Json(conf);
-        }
-
-        [Route("server/services/lnd-grpc/{cryptoCode}/{index}")]
-        [HttpPost]
-        public IActionResult LNDGRPCServicesPOST(string cryptoCode, int index)
-        {
-            var external = GetExternalLNDConnectionString(cryptoCode, index);
-            if (external == null)
-                return NotFound();
-            LightningConfigurations confs = new LightningConfigurations();
-            LightningConfiguration conf = new LightningConfiguration();
-            conf.Type = "grpc";
-            conf.CryptoCode = cryptoCode;
-            conf.Host = external.BaseUri.DnsSafeHost;
-            conf.Port = external.BaseUri.Port;
-            conf.SSL = external.BaseUri.Scheme == "https";
-            conf.Macaroon = external.Macaroon == null ? null : Encoders.Hex.EncodeData(external.Macaroon);
-            conf.CertificateThumbprint = external.CertificateThumbprint == null ? null : Encoders.Hex.EncodeData(external.CertificateThumbprint);
-            confs.Configurations.Add(conf);
-
-            var nonce = RandomUtils.GetUInt32();
-            var configKey = GetConfigKey("lnd-grpc", cryptoCode, index, nonce);
-            _LnConfigProvider.KeepConfig(configKey, confs);
-            return RedirectToAction(nameof(LNDGRPCServices), new { cryptoCode = cryptoCode, nonce = nonce });
-        }
-
-        private LightningConnectionString GetExternalLNDConnectionString(string cryptoCode, int index)
-        {
-            var connectionString = _Options.ExternalServicesByCryptoCode.GetServices<ExternalLNDGRPC>(cryptoCode).Skip(index).Select(c => c.ConnectionString).FirstOrDefault();
-            if (connectionString == null)
-                return null;
-            connectionString = connectionString.Clone();
-            if (connectionString.MacaroonFilePath != null)
-            {
-                try
-                {
-                    connectionString.Macaroon = System.IO.File.ReadAllBytes(connectionString.MacaroonFilePath);
-                    connectionString.MacaroonFilePath = null;
-                }
-                catch
-                {
-                    Logging.Logs.Configuration.LogWarning($"{cryptoCode}: The macaroon file path of the external LND grpc config was not found ({connectionString.MacaroonFilePath})");
-                    return null;
-                }
-            }
-            return connectionString;
-        }
-
         [Route("server/theme")]
         public async Task<IActionResult> Theme()
         {
@@ -521,7 +243,7 @@ namespace BTCPayServer.Controllers
             {
                 try
                 {
-                    if (!model.Settings.IsComplete())
+                    if(!model.Settings.IsComplete())
                     {
                         model.StatusMessage = "Error: Required fields missing";
                         return View(model);

BTCPayServer/Controllers/StoresController.BTCLike.cs

@@ -34,7 +34,7 @@ namespace BTCPayServer.Controllers
             }
 
             DerivationSchemeViewModel vm = new DerivationSchemeViewModel();
-            vm.ServerUrl = WalletsController.GetLedgerWebsocketUrl(this.HttpContext, cryptoCode, null);
+            vm.ServerUrl = GetStoreUrl(storeId);
             vm.CryptoCode = cryptoCode;
             vm.RootKeyPath = network.GetRootKeyPath();
             SetExistingValues(store, vm);
@@ -59,7 +59,7 @@ namespace BTCPayServer.Controllers
         [Route("{storeId}/derivations/{cryptoCode}")]
         public async Task<IActionResult> AddDerivationScheme(string storeId, DerivationSchemeViewModel vm, string cryptoCode)
         {
-            vm.ServerUrl = WalletsController.GetLedgerWebsocketUrl(this.HttpContext, cryptoCode, null);
+            vm.ServerUrl = GetStoreUrl(storeId);
             vm.CryptoCode = cryptoCode;
             var store = HttpContext.GetStoreData();
             if (store == null)
@@ -161,5 +161,262 @@ namespace BTCPayServer.Controllers
             vm.Confirmation = true;
             return View(vm);
         }
+
+
+        public class GetInfoResult
+        {
+            public int RecommendedSatoshiPerByte { get; set; }
+            public double Balance { get; set; }
+        }
+
+        public class SendToAddressResult
+        {
+            public string TransactionId { get; set; }
+        }
+
+        [HttpGet]
+        [Route("{storeId}/ws/ledger")]
+        public async Task<IActionResult> LedgerConnection(
+            string storeId,
+            string command,
+            // getinfo
+            string cryptoCode = null,
+            // getxpub
+            int account = 0,
+            // sendtoaddress
+            string destination = null, string amount = null, string feeRate = null, string substractFees = null
+            )
+        {
+            if (!HttpContext.WebSockets.IsWebSocketRequest)
+                return NotFound();
+            var store = HttpContext.GetStoreData();
+            if (store == null)
+                return NotFound();
+
+            var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
+
+            var hw = new HardwareWalletService(webSocket);
+            object result = null;
+            try
+            {
+                BTCPayNetwork network = null;
+                if (cryptoCode != null)
+                {
+                    network = _NetworkProvider.GetNetwork(cryptoCode);
+                    if (network == null)
+                        throw new FormatException("Invalid value for crypto code");
+                }
+
+                BitcoinAddress destinationAddress = null;
+                if (destination != null)
+                {
+                    try
+                    {
+                        destinationAddress = BitcoinAddress.Create(destination, network.NBitcoinNetwork);
+                    }
+                    catch { }
+                    if (destinationAddress == null)
+                        throw new FormatException("Invalid value for destination");
+                }
+
+                FeeRate feeRateValue = null;
+                if (feeRate != null)
+                {
+                    try
+                    {
+                        feeRateValue = new FeeRate(Money.Satoshis(int.Parse(feeRate, CultureInfo.InvariantCulture)), 1);
+                    }
+                    catch { }
+                    if (feeRateValue == null || feeRateValue.FeePerK <= Money.Zero)
+                        throw new FormatException("Invalid value for fee rate");
+                }
+
+                Money amountBTC = null;
+                if (amount != null)
+                {
+                    try
+                    {
+                        amountBTC = Money.Parse(amount);
+                    }
+                    catch { }
+                    if (amountBTC == null || amountBTC <= Money.Zero)
+                        throw new FormatException("Invalid value for amount");
+                }
+
+                bool subsctractFeesValue = false;
+                if (substractFees != null)
+                {
+                    try
+                    {
+                        subsctractFeesValue = bool.Parse(substractFees);
+                    }
+                    catch { throw new FormatException("Invalid value for subtract fees"); }
+                }
+                if (command == "test")
+                {
+                    result = await hw.Test();
+                }
+                if (command == "getxpub")
+                {
+                    var getxpubResult = await hw.GetExtPubKey(network, account);
+                    result = getxpubResult;
+                }
+                if (command == "getinfo")
+                {
+                    var strategy = GetDirectDerivationStrategy(store, network);
+                    var strategyBase = GetDerivationStrategy(store, network);
+                    if (strategy == null || await hw.GetKeyPath(network, strategy) == null)
+                    {
+                        throw new Exception($"This store is not configured to use this ledger");
+                    }
+
+                    var feeProvider = _FeeRateProvider.CreateFeeProvider(network);
+                    var recommendedFees = feeProvider.GetFeeRateAsync();
+                    var balance = _WalletProvider.GetWallet(network).GetBalance(strategyBase);
+                    result = new GetInfoResult() { Balance = (double)(await balance).ToDecimal(MoneyUnit.BTC), RecommendedSatoshiPerByte = (int)(await recommendedFees).GetFee(1).Satoshi };
+                }
+
+                if (command == "sendtoaddress")
+                {
+                    if (!_Dashboard.IsFullySynched(network.CryptoCode, out var summary))
+                        throw new Exception($"{network.CryptoCode}: not started or fully synched");
+                    var strategy = GetDirectDerivationStrategy(store, network);
+                    var strategyBase = GetDerivationStrategy(store, network);
+                    var wallet = _WalletProvider.GetWallet(network);
+                    var change = wallet.GetChangeAddressAsync(strategyBase);
+
+                    var unspentCoins = await wallet.GetUnspentCoins(strategyBase);
+                    var changeAddress = await change;
+                    var send = new[] { (
+                        destination: destinationAddress as IDestination, 
+                        amount: amountBTC,
+                        substractFees: subsctractFeesValue) };
+
+                    foreach (var element in send)
+                    {
+                        if (element.destination == null)
+                            throw new ArgumentNullException(nameof(element.destination));
+                        if (element.amount == null)
+                            throw new ArgumentNullException(nameof(element.amount));
+                        if (element.amount <= Money.Zero)
+                            throw new ArgumentOutOfRangeException(nameof(element.amount), "The amount should be above zero");
+                    }
+
+                    var foundKeyPath = await hw.GetKeyPath(network, strategy);
+                    if (foundKeyPath == null)
+                    {
+                        throw new HardwareWalletException($"This store is not configured to use this ledger");
+                    }
+
+                    TransactionBuilder builder = new TransactionBuilder();
+                    builder.StandardTransactionPolicy.MinRelayTxFee = summary.Status.BitcoinStatus.MinRelayTxFee;
+                    builder.SetConsensusFactory(network.NBitcoinNetwork);
+                    builder.AddCoins(unspentCoins.Select(c => c.Coin).ToArray());
+
+                    foreach (var element in send)
+                    {
+                        builder.Send(element.destination, element.amount);
+                        if (element.substractFees)
+                            builder.SubtractFees();
+                    }
+                    builder.SetChange(changeAddress.Item1);
+                    builder.SendEstimatedFees(feeRateValue);
+                    builder.Shuffle();
+                    var unsigned = builder.BuildTransaction(false);
+
+                    var keypaths = new Dictionary<Script, KeyPath>();
+                    foreach (var c in unspentCoins)
+                    {
+                        keypaths.TryAdd(c.Coin.ScriptPubKey, c.KeyPath);
+                    }
+
+                    var hasChange = unsigned.Outputs.Count == 2;
+                    var usedCoins = builder.FindSpentCoins(unsigned);
+
+                    Dictionary<uint256, Transaction> parentTransactions = new Dictionary<uint256, Transaction>();
+
+                    if(!strategy.Segwit)
+                    {
+                        var parentHashes = usedCoins.Select(c => c.Outpoint.Hash).ToHashSet();
+                        var explorer = _ExplorerProvider.GetExplorerClient(network);
+                        var getTransactionAsyncs = parentHashes.Select(h => (Op: explorer.GetTransactionAsync(h), Hash: h)).ToList();
+                        foreach(var getTransactionAsync in getTransactionAsyncs)
+                        {
+                            var tx = (await getTransactionAsync.Op);
+                            if(tx == null)
+                                throw new Exception($"Parent transaction {getTransactionAsync.Hash} not found");
+                            parentTransactions.Add(tx.Transaction.GetHash(), tx.Transaction);
+                        }
+                    }
+
+                    var transaction = await hw.SignTransactionAsync(usedCoins.Select(c => new SignatureRequest
+                    {
+                        InputTransaction = parentTransactions.TryGet(c.Outpoint.Hash),
+                        InputCoin = c,
+                        KeyPath = foundKeyPath.Derive(keypaths[c.TxOut.ScriptPubKey]),
+                        PubKey = strategy.Root.Derive(keypaths[c.TxOut.ScriptPubKey]).PubKey
+                    }).ToArray(), unsigned, hasChange ? foundKeyPath.Derive(changeAddress.Item2) : null);
+                    
+                    try
+                    {
+                        var broadcastResult = await wallet.BroadcastTransactionsAsync(new List<Transaction>() { transaction });
+                        if (!broadcastResult[0].Success)
+                        {
+                            throw new Exception($"RPC Error while broadcasting: {broadcastResult[0].RPCCode} {broadcastResult[0].RPCCodeMessage} {broadcastResult[0].RPCMessage}");
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new Exception("Error while broadcasting: " + ex.Message);
+                    }
+                    wallet.InvalidateCache(strategyBase);
+                    result = new SendToAddressResult() { TransactionId = transaction.GetHash().ToString() };
+                }
+            }
+            catch (OperationCanceledException)
+            { result = new LedgerTestResult() { Success = false, Error = "Timeout" }; }
+            catch (Exception ex)
+            { result = new LedgerTestResult() { Success = false, Error = ex.Message }; }
+
+            try
+            {
+                if (result != null)
+                {
+                    UTF8Encoding UTF8NOBOM = new UTF8Encoding(false);
+                    var bytes = UTF8NOBOM.GetBytes(JsonConvert.SerializeObject(result, _MvcJsonOptions.SerializerSettings));
+                    await webSocket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, true, new CancellationTokenSource(2000).Token);
+                }
+            }
+            catch { }
+            finally
+            {
+                await webSocket.CloseSocket();
+            }
+
+            return new EmptyResult();
+        }
+
+        private DirectDerivationStrategy GetDirectDerivationStrategy(StoreData store, BTCPayNetwork network)
+        {
+            var strategy = GetDerivationStrategy(store, network);
+            var directStrategy = strategy as DirectDerivationStrategy;
+            if (directStrategy == null)
+                directStrategy = (strategy as P2SHDerivationStrategy).Inner as DirectDerivationStrategy;
+            return directStrategy;
+        }
+
+        private DerivationStrategyBase GetDerivationStrategy(StoreData store, BTCPayNetwork network)
+        {
+            var strategy = store
+                            .GetSupportedPaymentMethods(_NetworkProvider)
+                            .OfType<DerivationStrategy>()
+                            .FirstOrDefault(s => s.Network.NBitcoinNetwork == network.NBitcoinNetwork);
+            if (strategy == null)
+            {
+                throw new Exception($"Derivation strategy for {network.CryptoCode} is not set");
+            }
+
+            return strategy.DerivationStrategyBase;
+        }
     }
 }

BTCPayServer/Controllers/StoresController.LightningLike.cs

@@ -26,15 +26,16 @@ namespace BTCPayServer.Controllers
                 return NotFound();
             LightningNodeViewModel vm = new LightningNodeViewModel();
             vm.CryptoCode = cryptoCode;
-            vm.InternalLightningNode = GetInternalLighningNode(cryptoCode)?.ToString();
+            vm.InternalLightningNode = GetInternalLighningNode(cryptoCode)?.ToUri(true)?.AbsoluteUri;
             SetExistingValues(store, vm);
             return View(vm);
         }
 
         private void SetExistingValues(StoreData store, LightningNodeViewModel vm)
         {
-            vm.ConnectionString = GetExistingLightningSupportedPaymentMethod(vm.CryptoCode, store)?.GetLightningUrl()?.ToString();
+            vm.Url = GetExistingLightningSupportedPaymentMethod(vm.CryptoCode, store)?.GetLightningUrl()?.ToString();
         }
+
         private LightningSupportedPaymentMethod GetExistingLightningSupportedPaymentMethod(string cryptoCode, StoreData store)
         {
             var id = new PaymentMethodId(cryptoCode, PaymentTypes.LightningLike);
@@ -64,7 +65,7 @@ namespace BTCPayServer.Controllers
             var network = vm.CryptoCode == null ? null : _ExplorerProvider.GetNetwork(vm.CryptoCode);
 
             var internalLightning = GetInternalLighningNode(network.CryptoCode);
-            vm.InternalLightningNode = internalLightning?.ToString();
+            vm.InternalLightningNode = internalLightning?.ToUri(true)?.AbsoluteUri;
             if (network == null)
             {
                 ModelState.AddModelError(nameof(vm.CryptoCode), "Invalid network");
@@ -73,57 +74,33 @@ namespace BTCPayServer.Controllers
 
             PaymentMethodId paymentMethodId = new PaymentMethodId(network.CryptoCode, PaymentTypes.LightningLike);
             Payments.Lightning.LightningSupportedPaymentMethod paymentMethod = null;
-            if (!string.IsNullOrEmpty(vm.ConnectionString))
+            if (!string.IsNullOrEmpty(vm.Url))
             {
-                if (!LightningConnectionString.TryParse(vm.ConnectionString, false, out var connectionString, out var error))
+                if (!LightningConnectionString.TryParse(vm.Url, out var connectionString, out var error))
                 {
-                    ModelState.AddModelError(nameof(vm.ConnectionString), $"Invalid URL ({error})");
+                    ModelState.AddModelError(nameof(vm.Url), $"Invalid URL ({error})");
                     return View(vm);
                 }
 
-                if(connectionString.ConnectionType == LightningConnectionType.LndGRPC)
-                {
-                    ModelState.AddModelError(nameof(vm.ConnectionString), $"BTCPay does not support gRPC connections");
-                    return View(vm);
-                }
-
-                var internalDomain = internalLightning?.BaseUri?.DnsSafeHost;
+                var internalDomain = internalLightning?.ToUri(false)?.DnsSafeHost;
+                bool isLocal = (internalDomain == "127.0.0.1" || internalDomain == "localhost");
 
                 bool isInternalNode = connectionString.ConnectionType == LightningConnectionType.CLightning ||
                                       connectionString.BaseUri.DnsSafeHost == internalDomain ||
-                                      (internalDomain == "127.0.0.1" || internalDomain == "localhost");
+                                      isLocal;
 
-                if (connectionString.BaseUri.Scheme == "http")
+                if (connectionString.BaseUri.Scheme == "http" && !isLocal)
                 {
-                    if (!isInternalNode)
+                    if (!isInternalNode || (isInternalNode && !CanUseInternalLightning()))
                     {
-                        ModelState.AddModelError(nameof(vm.ConnectionString), "The url must be HTTPS");
-                        return View(vm);
-                    }
-                }
-
-                if(connectionString.MacaroonFilePath != null)
-                {
-                    if(!CanUseInternalLightning())
-                    {
-                        ModelState.AddModelError(nameof(vm.ConnectionString), "You are not authorized to use macaroonfilepath");
-                        return View(vm);
-                    }
-                    if(!System.IO.File.Exists(connectionString.MacaroonFilePath))
-                    {
-                        ModelState.AddModelError(nameof(vm.ConnectionString), "The macaroonfilepath file does exist");
-                        return View(vm);
-                    }
-                    if(!System.IO.Path.IsPathRooted(connectionString.MacaroonFilePath))
-                    {
-                        ModelState.AddModelError(nameof(vm.ConnectionString), "The macaroonfilepath should be fully rooted");
+                        ModelState.AddModelError(nameof(vm.Url), "The url must be HTTPS");
                         return View(vm);
                     }
                 }
 
                 if (isInternalNode && !CanUseInternalLightning())
                 {
-                    ModelState.AddModelError(nameof(vm.ConnectionString), "Unauthorized url");
+                    ModelState.AddModelError(nameof(vm.Url), "Unauthorized url");
                     return View(vm);
                 }
 
@@ -133,7 +110,6 @@ namespace BTCPayServer.Controllers
                 };
                 paymentMethod.SetLightningUrl(connectionString);
             }
-
             if (command == "save")
             {
                 store.SetSupportedPaymentMethod(paymentMethodId, paymentMethod);
@@ -145,7 +121,7 @@ namespace BTCPayServer.Controllers
             {
                 if (paymentMethod == null)
                 {
-                    ModelState.AddModelError(nameof(vm.ConnectionString), "Missing url parameter");
+                    ModelState.AddModelError(nameof(vm.Url), "Missing url parameter");
                     return View(vm);
                 }
                 var handler = (LightningLikePaymentHandler)_ServiceProvider.GetRequiredService<IPaymentMethodHandler<Payments.Lightning.LightningSupportedPaymentMethod>>();
@@ -159,7 +135,7 @@ namespace BTCPayServer.Controllers
                             await handler.TestConnection(info, cts.Token);
                         }
                     }
-                    vm.StatusMessage = $"Connection to the lightning node succeeded ({info})";
+                    vm.StatusMessage = $"Connection to the lightning node succeed ({info})";
                 }
                 catch (Exception ex)
                 {

BTCPayServer/Controllers/StoresController.cs

@@ -38,9 +38,11 @@ namespace BTCPayServer.Controllers
         BTCPayRateProviderFactory _RateFactory;
         public string CreatedStoreId { get; set; }
         public StoresController(
+            NBXplorerDashboard dashboard,
             IServiceProvider serviceProvider,
             BTCPayServerOptions btcpayServerOptions,
             BTCPayServerEnvironment btcpayEnv,
+            IOptions<MvcJsonOptions> mvcJsonOptions,
             StoreRepository repo,
             TokenRepository tokenRepo,
             UserManager<ApplicationUser> userManager,
@@ -54,6 +56,7 @@ namespace BTCPayServer.Controllers
             IHostingEnvironment env)
         {
             _RateFactory = rateFactory;
+            _Dashboard = dashboard;
             _Repo = repo;
             _TokenRepository = tokenRepo;
             _UserManager = userManager;
@@ -63,16 +66,19 @@ namespace BTCPayServer.Controllers
             _Env = env;
             _NetworkProvider = networkProvider;
             _ExplorerProvider = explorerProvider;
+            _MvcJsonOptions = mvcJsonOptions.Value;
             _FeeRateProvider = feeRateProvider;
             _ServiceProvider = serviceProvider;
             _BtcpayServerOptions = btcpayServerOptions;
             _BTCPayEnv = btcpayEnv;
         }
+        NBXplorerDashboard _Dashboard;
         BTCPayServerOptions _BtcpayServerOptions;
         BTCPayServerEnvironment _BTCPayEnv;
         IServiceProvider _ServiceProvider;
         BTCPayNetworkProvider _NetworkProvider;
         private ExplorerClientProvider _ExplorerProvider;
+        private MvcJsonOptions _MvcJsonOptions;
         private IFeeProviderFactory _FeeRateProvider;
         BTCPayWalletProvider _WalletProvider;
         AccessTokenController _TokenController;
@@ -88,6 +94,21 @@ namespace BTCPayServer.Controllers
             get; set;
         }
 
+        [HttpGet]
+        [Route("{storeId}/wallet/{cryptoCode}")]
+        public IActionResult Wallet(string cryptoCode)
+        {
+            WalletModel model = new WalletModel();
+            model.ServerUrl = GetStoreUrl(StoreData.Id);
+            model.CryptoCurrency = cryptoCode;
+            return View(model);
+        }
+
+        private string GetStoreUrl(string storeId)
+        {
+            return HttpContext.Request.GetAbsoluteRoot() + "/stores/" + storeId + "/";
+        }
+
         [HttpGet]
         [Route("{storeId}/users")]
         public async Task<IActionResult> StoreUsers()
@@ -262,7 +283,7 @@ namespace BTCPayServer.Controllers
                     {
                         CurrencyPair = fetch.Key.ToString(),
                         Error = testResult.Errors.Count != 0,
-                        Rule = testResult.Errors.Count == 0 ? testResult.Rule + " = " + testResult.BidAsk.Bid.ToString(CultureInfo.InvariantCulture)
+                        Rule = testResult.Errors.Count == 0 ? testResult.Rule + " = " + testResult.Value.Value.ToString(CultureInfo.InvariantCulture) 
                                                             : testResult.EvaluatedRule
                     });
                 }
@@ -292,7 +313,7 @@ namespace BTCPayServer.Controllers
                 Action = "Continue",
                 Title = "Rate rule scripting",
                 Description = scripting ?
-                                "This action will modify your current rate sources. Are you sure to turn on rate rules scripting? (Advanced users)"
+                                "This action will mofify your current rate sources. Are you sure to turn on rate rules scripting? (Advanced users)"
                                 : "This action will delete your rate script. Are you sure to turn off rate rules scripting?",
                 ButtonClass = "btn-primary"
             });
@@ -317,7 +338,7 @@ namespace BTCPayServer.Controllers
         {
             var storeBlob = StoreData.GetStoreBlob();
             var vm = new CheckoutExperienceViewModel();
-            vm.SetCryptoCurrencies(_ExplorerProvider, StoreData.GetDefaultCrypto(_NetworkProvider));
+            vm.SetCryptoCurrencies(_ExplorerProvider, StoreData.GetDefaultCrypto());
             vm.SetLanguages(_LangService, storeBlob.DefaultLang);
             vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
             vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
@@ -352,7 +373,7 @@ namespace BTCPayServer.Controllers
             }
             bool needUpdate = false;
             var blob = StoreData.GetStoreBlob();
-            if (StoreData.GetDefaultCrypto(_NetworkProvider) != model.DefaultCryptoCurrency)
+            if (StoreData.GetDefaultCrypto() != model.DefaultCryptoCurrency)
             {
                 needUpdate = true;
                 StoreData.SetDefaultCrypto(model.DefaultCryptoCurrency);
@@ -403,7 +424,6 @@ namespace BTCPayServer.Controllers
             vm.StoreWebsite = store.StoreWebsite;
             vm.NetworkFee = !storeBlob.NetworkFeeDisabled;
             vm.SpeedPolicy = store.SpeedPolicy;
-            vm.CanDelete = _Repo.CanDeleteStores();
             AddPaymentMethods(store, vm);
             vm.MonitoringExpiration = storeBlob.MonitoringExpiration;
             vm.InvoiceExpiration = storeBlob.InvoiceExpiration;
@@ -426,8 +446,7 @@ namespace BTCPayServer.Controllers
                 vm.DerivationSchemes.Add(new StoreViewModel.DerivationScheme()
                 {
                     Crypto = network.CryptoCode,
-                    Value = strategy?.DerivationStrategyBase?.ToString() ?? string.Empty,
-                    WalletId = new WalletId(store.Id, network.CryptoCode),
+                    Value = strategy?.DerivationStrategyBase?.ToString() ?? string.Empty
                 });
             }
 
@@ -449,8 +468,10 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("{storeId}")]
-        public async Task<IActionResult> UpdateStore(StoreViewModel model, string command = null)
+        public async Task<IActionResult> UpdateStore(StoreViewModel model)
         {
+            AddPaymentMethods(StoreData, model);
+
             bool needUpdate = false;
             if (StoreData.SpeedPolicy != model.SpeedPolicy)
             {
@@ -490,29 +511,6 @@ namespace BTCPayServer.Controllers
             {
                 storeId = StoreData.Id
             });
-
-        }
-
-        [HttpGet]
-        [Route("{storeId}/delete")]
-        public IActionResult DeleteStore(string storeId)
-        {
-            return View("Confirm", new ConfirmModel()
-            {
-                Action = "Delete this store",
-                Title = "Delete this store",
-                Description = "This action is irreversible and will remove all information related to this store. (Invoices, Apps etc...)",
-                ButtonClass = "btn-danger"
-            });
-        }
-
-        [HttpPost]
-        [Route("{storeId}/delete")]
-        public async Task<IActionResult> DeleteStorePost(string storeId)
-        {
-            await _Repo.DeleteStore(StoreData.Id);
-            StatusMessage = "Success: Store successfully deleted";
-            return RedirectToAction(nameof(UserStoresController.ListStores), "UserStores");
         }
 
         private CoinAverageExchange[] GetSupportedExchanges()

BTCPayServer/Controllers/UserStoresController.cs

@@ -23,31 +23,21 @@ namespace BTCPayServer.Controllers
         private StoreRepository _Repo;
         private BTCPayNetworkProvider _NetworkProvider;
         private UserManager<ApplicationUser> _UserManager;
+        private BTCPayWalletProvider _WalletProvider;
 
         public UserStoresController(
             UserManager<ApplicationUser> userManager,
             BTCPayNetworkProvider networkProvider,
+            BTCPayWalletProvider walletProvider,
             StoreRepository storeRepository)
         {
             _Repo = storeRepository;
             _NetworkProvider = networkProvider;
             _UserManager = userManager;
-        }        
-
-        [HttpGet]
-        [Route("create")]
-        public IActionResult CreateStore()
-        {
-            return View();
+            _WalletProvider = walletProvider;
         }
-
-        public string CreatedStoreId
-        {
-            get; set;
-        }
-
         [HttpGet]
-        [Route("{storeId}/me/delete")]
+        [Route("{storeId}/delete")]
         public IActionResult DeleteStore(string storeId)
         {
             var store = HttpContext.GetStoreData();
@@ -61,8 +51,20 @@ namespace BTCPayServer.Controllers
             });
         }
 
+        [HttpGet]
+        [Route("create")]
+        public IActionResult CreateStore()
+        {
+            return View();
+        }
+
+        public string CreatedStoreId
+        {
+            get; set;
+        }
+
         [HttpPost]
-        [Route("{storeId}/me/delete")]
+        [Route("{storeId}/delete")]
         public async Task<IActionResult> DeleteStorePost(string storeId)
         {
             var userId = GetUserId();
@@ -82,6 +84,17 @@ namespace BTCPayServer.Controllers
         {
             StoresViewModel result = new StoresViewModel();
             var stores = await _Repo.GetStoresByUserId(GetUserId());
+
+            var balances = stores
+                                .Select(s => s.GetSupportedPaymentMethods(_NetworkProvider)
+                                              .OfType<DerivationStrategy>()
+                                              .Select(d => ((Wallet: _WalletProvider.GetWallet(d.Network),
+                                                            DerivationStrategy: d.DerivationStrategyBase)))
+                                              .Where(_ => _.Wallet != null)
+                                              .Select(async _ => (await GetBalanceString(_)) + " " + _.Wallet.Network.CryptoCode))
+                                .ToArray();
+
+            await Task.WhenAll(balances.SelectMany(_ => _));
             for (int i = 0; i < stores.Length; i++)
             {
                 var store = stores[i];
@@ -90,7 +103,8 @@ namespace BTCPayServer.Controllers
                     Id = store.Id,
                     Name = store.StoreName,
                     WebSite = store.StoreWebsite,
-                    IsOwner = store.HasClaim(Policies.CanModifyStoreSettings.Key)
+                    IsOwner = store.HasClaim(Policies.CanModifyStoreSettings.Key),
+                    Balances = store.HasClaim(Policies.CanModifyStoreSettings.Key) ? balances[i].Select(t => t.Result).ToArray() : Array.Empty<string>()
                 });
             }
             return View(result);
@@ -107,12 +121,25 @@ namespace BTCPayServer.Controllers
             var store = await _Repo.CreateStore(GetUserId(), vm.Name);
             CreatedStoreId = store.Id;
             StatusMessage = "Store successfully created";
-            return RedirectToAction(nameof(StoresController.UpdateStore), "Stores", new
-            {
-                storeId = store.Id
-            });
+            return RedirectToAction(nameof(ListStores));
         }
 
+        private static async Task<string> GetBalanceString((BTCPayWallet Wallet, DerivationStrategyBase DerivationStrategy) _)
+        {
+            using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(10)))
+            {
+                try
+                {
+                    return (await _.Wallet.GetBalance(_.DerivationStrategy, cts.Token)).ToString();
+                }
+                catch
+                {
+                    return "--";
+                }
+            }
+        }
+
+
         private string GetUserId()
         {
             return _UserManager.GetUserId(User);

BTCPayServer/Controllers/WalletsController.cs

@@ -1,487 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net.WebSockets;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Data;
-using BTCPayServer.HostedServices;
-using BTCPayServer.ModelBinders;
-using BTCPayServer.Models;
-using BTCPayServer.Models.WalletViewModels;
-using BTCPayServer.Security;
-using BTCPayServer.Services;
-using BTCPayServer.Services.Rates;
-using BTCPayServer.Services.Stores;
-using BTCPayServer.Services.Wallets;
-using LedgerWallet;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using NBitcoin;
-using NBXplorer.DerivationStrategy;
-using Newtonsoft.Json;
-using static BTCPayServer.Controllers.StoresController;
-
-namespace BTCPayServer.Controllers
-{
-    [Route("wallets")]
-    [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
-    [AutoValidateAntiforgeryToken]
-    public class WalletsController : Controller
-    {
-        private StoreRepository _Repo;
-        private BTCPayNetworkProvider _NetworkProvider;
-        private readonly UserManager<ApplicationUser> _userManager;
-        private readonly IOptions<MvcJsonOptions> _mvcJsonOptions;
-        private readonly NBXplorerDashboard _dashboard;
-        private readonly ExplorerClientProvider _explorerProvider;
-        private readonly IFeeProviderFactory _feeRateProvider;
-        private readonly BTCPayWalletProvider _walletProvider;
-        BTCPayRateProviderFactory _RateProvider;
-        CurrencyNameTable _currencyTable;
-        public WalletsController(StoreRepository repo,
-                                 CurrencyNameTable currencyTable,
-                                 BTCPayNetworkProvider networkProvider,
-                                 UserManager<ApplicationUser> userManager,
-                                 IOptions<MvcJsonOptions> mvcJsonOptions,
-                                 NBXplorerDashboard dashboard,
-                                 BTCPayRateProviderFactory rateProvider,
-                                 ExplorerClientProvider explorerProvider,
-                                 IFeeProviderFactory feeRateProvider,
-                                 BTCPayWalletProvider walletProvider)
-        {
-            _currencyTable = currencyTable;
-            _Repo = repo;
-            _RateProvider = rateProvider;
-            _NetworkProvider = networkProvider;
-            _userManager = userManager;
-            _mvcJsonOptions = mvcJsonOptions;
-            _dashboard = dashboard;
-            _explorerProvider = explorerProvider;
-            _feeRateProvider = feeRateProvider;
-            _walletProvider = walletProvider;
-        }
-
-        public async Task<IActionResult> ListWallets()
-        {
-            var wallets = new ListWalletsViewModel();
-            var stores = await _Repo.GetStoresByUserId(GetUserId());
-
-            var onChainWallets = stores
-                                .SelectMany(s => s.GetSupportedPaymentMethods(_NetworkProvider)
-                                              .OfType<DerivationStrategy>()
-                                              .Select(d => ((Wallet: _walletProvider.GetWallet(d.Network),
-                                                            DerivationStrategy: d.DerivationStrategyBase,
-                                                            Network: d.Network)))
-                                              .Where(_ => _.Wallet != null)
-                                              .Select(_ => (Wallet: _.Wallet,
-                                                            Store: s,
-                                                            Balance: GetBalanceString(_.Wallet, _.DerivationStrategy),
-                                                            DerivationStrategy: _.DerivationStrategy,
-                                                            Network: _.Network)))
-                                              .ToList();
-
-            foreach (var wallet in onChainWallets)
-            {
-                ListWalletsViewModel.WalletViewModel walletVm = new ListWalletsViewModel.WalletViewModel();
-                wallets.Wallets.Add(walletVm);
-                walletVm.Balance = await wallet.Balance + " " + wallet.Wallet.Network.CryptoCode;
-                if (!wallet.Store.HasClaim(Policies.CanModifyStoreSettings.Key))
-                {
-                    walletVm.Balance = "";
-                }
-                walletVm.CryptoCode = wallet.Network.CryptoCode;
-                walletVm.StoreId = wallet.Store.Id;
-                walletVm.Id = new WalletId(wallet.Store.Id, wallet.Network.CryptoCode);
-                walletVm.StoreName = wallet.Store.StoreName;
-                walletVm.IsOwner = wallet.Store.HasClaim(Policies.CanModifyStoreSettings.Key);
-            }
-
-            return View(wallets);
-        }
-
-        [HttpGet]
-        [Route("{walletId}")]
-        public async Task<IActionResult> WalletTransactions(
-            [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId)
-        {
-            var store = await _Repo.FindStore(walletId.StoreId, GetUserId());
-            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
-            if (paymentMethod == null)
-                return NotFound();
-
-            var wallet = _walletProvider.GetWallet(paymentMethod.Network);
-            var transactions = await wallet.FetchTransactions(paymentMethod.DerivationStrategyBase);
-
-            var model = new ListTransactionsViewModel();
-            foreach(var tx in transactions.UnconfirmedTransactions.Transactions.Concat(transactions.ConfirmedTransactions.Transactions))
-            {
-                var vm = new ListTransactionsViewModel.TransactionViewModel();
-                model.Transactions.Add(vm);
-                vm.Id = tx.TransactionId.ToString();
-                vm.Link = string.Format(CultureInfo.InvariantCulture, paymentMethod.Network.BlockExplorerLink, vm.Id);
-                vm.Timestamp = tx.Timestamp;
-                vm.Positive = tx.BalanceChange >= Money.Zero;
-                vm.Balance = tx.BalanceChange.ToString();
-            }
-            model.Transactions = model.Transactions.OrderByDescending(t => t.Timestamp).ToList();
-            return View(model);
-        }
-
-
-        [HttpGet]
-        [Route("{walletId}/send")]
-        public async Task<IActionResult> WalletSend(
-            [ModelBinder(typeof(WalletIdModelBinder))]
-            WalletId walletId)
-        {
-            if (walletId?.StoreId == null)
-                return NotFound();
-            var store = await _Repo.FindStore(walletId.StoreId, GetUserId());
-            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
-            if (paymentMethod == null)
-                return NotFound();
-
-            var storeData = store.GetStoreBlob();
-            var rateRules = store.GetStoreBlob().GetRateRules(_NetworkProvider);
-            rateRules.GlobalMultiplier = 1.0m;
-            var currencyPair = new Rating.CurrencyPair(paymentMethod.PaymentId.CryptoCode, GetCurrencyCode(storeData.DefaultLang) ?? "USD");
-            WalletModel model = new WalletModel();
-            model.ServerUrl = GetLedgerWebsocketUrl(this.HttpContext, walletId.CryptoCode, paymentMethod.DerivationStrategyBase);
-            model.CryptoCurrency = walletId.CryptoCode;
-
-            using (CancellationTokenSource cts = new CancellationTokenSource())
-            {
-                try
-                {
-                    cts.CancelAfter(TimeSpan.FromSeconds(5));
-                    var result = await _RateProvider.FetchRate(currencyPair, rateRules).WithCancellation(cts.Token);
-                    if (result.BidAsk != null)
-                    {
-                        model.Rate = result.BidAsk.Center;
-                        model.Divisibility = _currencyTable.GetNumberFormatInfo(currencyPair.Right, true).CurrencyDecimalDigits;
-                        model.Fiat = currencyPair.Right;
-                    }
-                    else
-                    {
-                        model.RateError = $"{result.EvaluatedRule} ({string.Join(", ", result.Errors.OfType<object>().ToArray())})";
-                    }
-                }
-                catch(Exception ex) { model.RateError = ex.Message; }
-            }
-            return View(model);
-        }
-
-        private string GetCurrencyCode(string defaultLang)
-        {
-            if (defaultLang == null)
-                return null;
-            try
-            {
-                var ri = new RegionInfo(defaultLang);
-                return ri.ISOCurrencySymbol;
-            }
-            catch(ArgumentException) { }
-            return null;
-        }
-
-        private DerivationStrategy GetPaymentMethod(WalletId walletId, StoreData store)
-        {
-            if (store == null || !store.HasClaim(Policies.CanModifyStoreSettings.Key))
-                return null;
-
-            var paymentMethod = store
-                            .GetSupportedPaymentMethods(_NetworkProvider)
-                            .OfType<DerivationStrategy>()
-                            .FirstOrDefault(p => p.PaymentId.PaymentType == Payments.PaymentTypes.BTCLike && p.PaymentId.CryptoCode == walletId.CryptoCode);
-            return paymentMethod;
-        }
-
-        private static async Task<string> GetBalanceString(BTCPayWallet wallet, DerivationStrategyBase derivationStrategy)
-        {
-            using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(10)))
-            {
-                try
-                {
-                    return (await wallet.GetBalance(derivationStrategy, cts.Token)).ToString();
-                }
-                catch
-                {
-                    return "--";
-                }
-            }
-        }
-
-        private string GetUserId()
-        {
-            return _userManager.GetUserId(User);
-        }
-
-        public static string GetLedgerWebsocketUrl(HttpContext httpContext, string cryptoCode, DerivationStrategyBase derivationStrategy)
-        {
-            return $"{httpContext.Request.GetAbsoluteRoot().WithTrailingSlash()}ws/ledger/{cryptoCode}/{derivationStrategy?.ToString() ?? string.Empty}";
-        }
-
-        [HttpGet]
-        [Route("/ws/ledger/{cryptoCode}/{derivationScheme?}")]
-        public async Task<IActionResult> LedgerConnection(
-            string command,
-            // getinfo
-            string cryptoCode = null,
-            // getxpub
-            [ModelBinder(typeof(ModelBinders.DerivationSchemeModelBinder))]
-            DerivationStrategyBase derivationScheme = null,
-            int account = 0,
-            // sendtoaddress
-            string destination = null, string amount = null, string feeRate = null, string substractFees = null
-            )
-        {
-            if (!HttpContext.WebSockets.IsWebSocketRequest)
-                return NotFound();
-            var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
-
-            using (var normalOperationTimeout = new CancellationTokenSource())
-            using (var signTimeout = new CancellationTokenSource())
-            {
-                normalOperationTimeout.CancelAfter(TimeSpan.FromMinutes(30));
-                var hw = new HardwareWalletService(webSocket);
-                object result = null;
-                try
-                {
-                    BTCPayNetwork network = null;
-                    if (cryptoCode != null)
-                    {
-                        network = _NetworkProvider.GetNetwork(cryptoCode);
-                        if (network == null)
-                            throw new FormatException("Invalid value for crypto code");
-                    }
-
-                    BitcoinAddress destinationAddress = null;
-                    if (destination != null)
-                    {
-                        try
-                        {
-                            destinationAddress = BitcoinAddress.Create(destination, network.NBitcoinNetwork);
-                        }
-                        catch { }
-                        if (destinationAddress == null)
-                            throw new FormatException("Invalid value for destination");
-                    }
-
-                    FeeRate feeRateValue = null;
-                    if (feeRate != null)
-                    {
-                        try
-                        {
-                            feeRateValue = new FeeRate(Money.Satoshis(int.Parse(feeRate, CultureInfo.InvariantCulture)), 1);
-                        }
-                        catch { }
-                        if (feeRateValue == null || feeRateValue.FeePerK <= Money.Zero)
-                            throw new FormatException("Invalid value for fee rate");
-                    }
-
-                    Money amountBTC = null;
-                    if (amount != null)
-                    {
-                        try
-                        {
-                            amountBTC = Money.Parse(amount);
-                        }
-                        catch { }
-                        if (amountBTC == null || amountBTC <= Money.Zero)
-                            throw new FormatException("Invalid value for amount");
-                    }
-
-                    bool subsctractFeesValue = false;
-                    if (substractFees != null)
-                    {
-                        try
-                        {
-                            subsctractFeesValue = bool.Parse(substractFees);
-                        }
-                        catch { throw new FormatException("Invalid value for subtract fees"); }
-                    }
-                    if (command == "test")
-                    {
-                        result = await hw.Test(normalOperationTimeout.Token);
-                    }
-                    if (command == "getxpub")
-                    {
-                        var getxpubResult = await hw.GetExtPubKey(network, account, normalOperationTimeout.Token);
-                        result = getxpubResult;
-                    }
-                    if (command == "getinfo")
-                    {
-                        var strategy = GetDirectDerivationStrategy(derivationScheme);
-                        if (strategy == null || await hw.GetKeyPath(network, strategy, normalOperationTimeout.Token) == null)
-                        {
-                            throw new Exception($"This store is not configured to use this ledger");
-                        }
-
-                        var feeProvider = _feeRateProvider.CreateFeeProvider(network);
-                        var recommendedFees = feeProvider.GetFeeRateAsync();
-                        var balance = _walletProvider.GetWallet(network).GetBalance(derivationScheme);
-                        result = new GetInfoResult() { Balance = (double)(await balance).ToDecimal(MoneyUnit.BTC), RecommendedSatoshiPerByte = (int)(await recommendedFees).GetFee(1).Satoshi };
-                    }
-
-                    if (command == "sendtoaddress")
-                    {
-                        if (!_dashboard.IsFullySynched(network.CryptoCode, out var summary))
-                            throw new Exception($"{network.CryptoCode}: not started or fully synched");
-                        var strategy = GetDirectDerivationStrategy(derivationScheme);
-                        var wallet = _walletProvider.GetWallet(network);
-                        var change = wallet.GetChangeAddressAsync(derivationScheme);
-
-                        var unspentCoins = await wallet.GetUnspentCoins(derivationScheme);
-                        var changeAddress = await change;
-                        var send = new[] { (
-                        destination: destinationAddress as IDestination,
-                        amount: amountBTC,
-                        substractFees: subsctractFeesValue) };
-
-                        foreach (var element in send)
-                        {
-                            if (element.destination == null)
-                                throw new ArgumentNullException(nameof(element.destination));
-                            if (element.amount == null)
-                                throw new ArgumentNullException(nameof(element.amount));
-                            if (element.amount <= Money.Zero)
-                                throw new ArgumentOutOfRangeException(nameof(element.amount), "The amount should be above zero");
-                        }
-
-                        var foundKeyPath = await hw.GetKeyPath(network, strategy, normalOperationTimeout.Token);
-                        if (foundKeyPath == null)
-                        {
-                            throw new HardwareWalletException($"This store is not configured to use this ledger");
-                        }
-
-                        TransactionBuilder builder = new TransactionBuilder();
-                        builder.StandardTransactionPolicy.MinRelayTxFee = summary.Status.BitcoinStatus.MinRelayTxFee;
-                        builder.SetConsensusFactory(network.NBitcoinNetwork);
-                        builder.AddCoins(unspentCoins.Select(c => c.Coin).ToArray());
-
-                        foreach (var element in send)
-                        {
-                            builder.Send(element.destination, element.amount);
-                            if (element.substractFees)
-                                builder.SubtractFees();
-                        }
-                        builder.SetChange(changeAddress.Item1);
-
-                        if (network.MinFee == null)
-                        {
-                            builder.SendEstimatedFees(feeRateValue);
-                        }
-                        else
-                        {
-                            var estimatedFee = builder.EstimateFees(feeRateValue);
-                            if (network.MinFee > estimatedFee)
-                                builder.SendFees(network.MinFee);
-                            else
-                                builder.SendEstimatedFees(feeRateValue);
-                        }
-                        builder.Shuffle();
-                        var unsigned = builder.BuildTransaction(false);
-
-                        var keypaths = new Dictionary<Script, KeyPath>();
-                        foreach (var c in unspentCoins)
-                        {
-                            keypaths.TryAdd(c.Coin.ScriptPubKey, c.KeyPath);
-                        }
-
-                        var hasChange = unsigned.Outputs.Count == 2;
-                        var usedCoins = builder.FindSpentCoins(unsigned);
-
-                        Dictionary<uint256, Transaction> parentTransactions = new Dictionary<uint256, Transaction>();
-
-                        if (!strategy.Segwit)
-                        {
-                            var parentHashes = usedCoins.Select(c => c.Outpoint.Hash).ToHashSet();
-                            var explorer = _explorerProvider.GetExplorerClient(network);
-                            var getTransactionAsyncs = parentHashes.Select(h => (Op: explorer.GetTransactionAsync(h), Hash: h)).ToList();
-                            foreach (var getTransactionAsync in getTransactionAsyncs)
-                            {
-                                var tx = (await getTransactionAsync.Op);
-                                if (tx == null)
-                                    throw new Exception($"Parent transaction {getTransactionAsync.Hash} not found");
-                                parentTransactions.Add(tx.Transaction.GetHash(), tx.Transaction);
-                            }
-                        }
-
-
-                        signTimeout.CancelAfter(TimeSpan.FromMinutes(5));
-                        var transaction = await hw.SignTransactionAsync(usedCoins.Select(c => new SignatureRequest
-                        {
-                            InputTransaction = parentTransactions.TryGet(c.Outpoint.Hash),
-                            InputCoin = c,
-                            KeyPath = foundKeyPath.Derive(keypaths[c.TxOut.ScriptPubKey]),
-                            PubKey = strategy.Root.Derive(keypaths[c.TxOut.ScriptPubKey]).PubKey
-                        }).ToArray(), unsigned, hasChange ? foundKeyPath.Derive(changeAddress.Item2) : null, signTimeout.Token);
-                        try
-                        {
-                            var broadcastResult = await wallet.BroadcastTransactionsAsync(new List<Transaction>() { transaction });
-                            if (!broadcastResult[0].Success)
-                            {
-                                throw new Exception($"RPC Error while broadcasting: {broadcastResult[0].RPCCode} {broadcastResult[0].RPCCodeMessage} {broadcastResult[0].RPCMessage}");
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            throw new Exception("Error while broadcasting: " + ex.Message);
-                        }
-                        wallet.InvalidateCache(derivationScheme);
-                        result = new SendToAddressResult() { TransactionId = transaction.GetHash().ToString() };
-                    }
-                }
-                catch (OperationCanceledException)
-                { result = new LedgerTestResult() { Success = false, Error = "Timeout" }; }
-                catch (Exception ex)
-                { result = new LedgerTestResult() { Success = false, Error = ex.Message }; }
-                finally { hw.Dispose(); }
-                try
-                {
-                    if (result != null)
-                    {
-                        UTF8Encoding UTF8NOBOM = new UTF8Encoding(false);
-                        var bytes = UTF8NOBOM.GetBytes(JsonConvert.SerializeObject(result, _mvcJsonOptions.Value.SerializerSettings));
-                        await webSocket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, true, new CancellationTokenSource(2000).Token);
-                    }
-                }
-                catch { }
-                finally
-                {
-                    await webSocket.CloseSocket();
-                }
-            }
-            return new EmptyResult();
-        }
-
-        private DirectDerivationStrategy GetDirectDerivationStrategy(DerivationStrategyBase strategy)
-        {
-            if (strategy == null)
-                throw new Exception("The derivation scheme is not provided");
-            var directStrategy = strategy as DirectDerivationStrategy;
-            if (directStrategy == null)
-                directStrategy = (strategy as P2SHDerivationStrategy).Inner as DirectDerivationStrategy;
-            return directStrategy;
-        }
-    }
-
-
-    public class GetInfoResult
-    {
-        public int RecommendedSatoshiPerByte { get; set; }
-        public double Balance { get; set; }
-    }
-
-    public class SendToAddressResult
-    {
-        public string TransactionId { get; set; }
-    }
-}

BTCPayServer/Data/APIKeyData.cs

@@ -19,7 +19,5 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-
-        public StoreData StoreData { get; set; }
     }
 }

BTCPayServer/Data/ApplicationDbContext.cs

@@ -102,27 +102,14 @@ namespace BTCPayServer.Data
         {
             base.OnModelCreating(builder);
             builder.Entity<InvoiceData>()
-                .HasOne(o => o.StoreData)
-                .WithMany(a => a.Invoices).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<InvoiceData>().HasIndex(o => o.StoreDataId);
-
+                .HasIndex(o => o.StoreDataId);
 
             builder.Entity<PaymentData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.Payments).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<PaymentData>()
-                   .HasIndex(o => o.InvoiceDataId);
+                .HasIndex(o => o.InvoiceDataId);
 
-
-            builder.Entity<RefundAddressesData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.RefundAddresses).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<RefundAddressesData>()
                 .HasIndex(o => o.InvoiceDataId);
 
-            builder.Entity<UserStore>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.UserStores).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<UserStore>()
                    .HasKey(t => new
                    {
@@ -130,16 +117,9 @@ namespace BTCPayServer.Data
                        t.StoreDataId
                    });
 
-            builder.Entity<APIKeyData>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.APIKeys)
-                   .HasForeignKey(i => i.StoreId).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<APIKeyData>()
                 .HasIndex(o => o.StoreId);
 
-            builder.Entity<AppData>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.Apps).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<AppData>()
                     .HasOne(a => a.StoreData);
 
@@ -153,10 +133,6 @@ namespace BTCPayServer.Data
                 .WithMany(t => t.UserStores)
                 .HasForeignKey(pt => pt.StoreDataId);
 
-
-            builder.Entity<AddressInvoiceData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.AddressInvoices).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<AddressInvoiceData>()
 #pragma warning disable CS0618
                 .HasKey(o => o.Address);
@@ -165,24 +141,12 @@ namespace BTCPayServer.Data
             builder.Entity<PairingCodeData>()
                 .HasKey(o => o.Id);
 
-            builder.Entity<PendingInvoiceData>()
-                .HasOne(o => o.InvoiceData)
-                .WithMany(o => o.PendingInvoices)
-                .HasForeignKey(o => o.Id).OnDelete(DeleteBehavior.Cascade);
-
-
-            builder.Entity<PairedSINData>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.PairedSINs).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<PairedSINData>(b =>
             {
                 b.HasIndex(o => o.SIN);
                 b.HasIndex(o => o.StoreDataId);
             });
 
-            builder.Entity<HistoricalAddressInvoiceData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.HistoricalAddressInvoices).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<HistoricalAddressInvoiceData>()
                 .HasKey(o => new
                 {
@@ -192,10 +156,6 @@ namespace BTCPayServer.Data
 #pragma warning restore CS0618
                 });
 
-
-            builder.Entity<InvoiceEventData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.Events).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<InvoiceEventData>()
                 .HasKey(o => new
                 {

BTCPayServer/Data/ApplicationDbContextFactory.cs

@@ -6,11 +6,6 @@ using System.Threading.Tasks;
 using Hangfire;
 using Hangfire.MemoryStorage;
 using Hangfire.PostgreSql;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations;
-using JetBrains.Annotations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations.Operations;
-using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace BTCPayServer.Data
 {
@@ -29,15 +24,6 @@ namespace BTCPayServer.Data
             _Type = type;
         }
 
-
-        public DatabaseType Type
-        {
-            get
-            {
-                return _Type;
-            }
-        }
-
         public ApplicationDbContext CreateContext()
         {
             var builder = new DbContextOptionsBuilder<ApplicationDbContext>();
@@ -45,56 +31,12 @@ namespace BTCPayServer.Data
             return new ApplicationDbContext(builder.Options);
         }
 
-        class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator
-        {
-            public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies) : base(dependencies)
-            {
-            }
-
-            protected override void Generate(NpgsqlCreateDatabaseOperation operation, IModel model, MigrationCommandListBuilder builder)
-            {
-                builder
-                     .Append("CREATE DATABASE ")
-                     .Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(operation.Name));
-
-                // POSTGRES gotcha: Indexed Text column (even if PK) are not used if we are not using C locale
-                builder
-                    .Append(" TEMPLATE ")
-                    .Append(Dependencies.SqlGenerationHelper.DelimitIdentifier("template0"));
-
-                builder
-                    .Append(" LC_CTYPE ")
-                    .Append(Dependencies.SqlGenerationHelper.DelimitIdentifier("C"));
-
-                builder
-                    .Append(" LC_COLLATE ")
-                    .Append(Dependencies.SqlGenerationHelper.DelimitIdentifier("C"));
-
-                builder
-                    .Append(" ENCODING ")
-                    .Append(Dependencies.SqlGenerationHelper.DelimitIdentifier("UTF8"));
-
-                if (operation.Tablespace != null)
-                {
-                    builder
-                        .Append(" TABLESPACE ")
-                        .Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(operation.Tablespace));
-                }
-
-                builder.AppendLine(Dependencies.SqlGenerationHelper.StatementTerminator);
-
-                EndStatement(builder, suppressTransaction: true);
-            }
-        }
-
         public void ConfigureBuilder(DbContextOptionsBuilder builder)
         {
             if (_Type == DatabaseType.Sqlite)
                 builder.UseSqlite(_ConnectionString);
             else if (_Type == DatabaseType.Postgres)
-                builder
-                    .UseNpgsql(_ConnectionString)
-                    .ReplaceService<IMigrationsSqlGenerator, CustomNpgsqlMigrationsSqlGenerator>();
+                builder.UseNpgsql(_ConnectionString);
         }
 
         public void ConfigureHangfireBuilder(IGlobalConfiguration builder)

BTCPayServer/Data/HistoricalAddressInvoiceData.cs

@@ -12,11 +12,6 @@ namespace BTCPayServer.Data
             get; set;
         }
 
-        public InvoiceData InvoiceData
-        {
-            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" 

BTCPayServer/Data/InvoiceData.cs

@@ -80,6 +80,5 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-        public List<PendingInvoiceData> PendingInvoices { get; set; }
     }
 }

BTCPayServer/Data/InvoiceEventData.cs

@@ -11,10 +11,6 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-        public InvoiceData InvoiceData
-        {
-            get; set;
-        }
         public string UniqueId { get; internal set; }
         public DateTimeOffset Timestamp
         {

BTCPayServer/Data/PairedSINData.cs

@@ -21,9 +21,6 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-
-        public StoreData StoreData { get; set; }
-
         public string Label
         {
             get;

BTCPayServer/Data/PendingInvoiceData.cs

@@ -11,6 +11,5 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-        public InvoiceData InvoiceData { get; set; }
     }
 }

BTCPayServer/Data/StoreData.cs

@@ -34,13 +34,12 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
+
         public List<AppData> Apps
         {
             get; set;
         }
 
-        public List<InvoiceData> Invoices { get; set; }
-
         [Obsolete("Use GetDerivationStrategies instead")]
         public string DerivationStrategy
         {
@@ -193,13 +192,11 @@ namespace BTCPayServer.Data
         }
         [Obsolete("Use GetDefaultCrypto instead")]
         public string DefaultCrypto { get; set; }
-        public List<PairedSINData> PairedSINs { get; set; }
-        public IEnumerable<APIKeyData> APIKeys { get; set; }
 
 #pragma warning disable CS0618
-        public string GetDefaultCrypto(BTCPayNetworkProvider networkProvider = null)
+        public string GetDefaultCrypto()
         {
-            return DefaultCrypto ?? (networkProvider == null? "BTC" : GetSupportedPaymentMethods(networkProvider).First().PaymentId.CryptoCode);
+            return DefaultCrypto ?? "BTC";
         }
         public void SetDefaultCrypto(string defaultCryptoCurrency)
         {

BTCPayServer/DerivationSchemeParser.cs

@@ -72,7 +72,7 @@ namespace BTCPayServer
                 }
                 try
                 {
-                    var data = Network.GetBase58CheckEncoder().DecodeData(parts[i]);
+                    var data = Encoders.Base58Check.DecodeData(parts[i]);
                     if (data.Length < 4)
                         continue;
                     var prefix = Utils.ToUInt32(data, false);
@@ -80,7 +80,7 @@ namespace BTCPayServer
                     for (int ii = 0; ii < 4; ii++)
                         data[ii] = standardPrefix[ii];
 
-                    var derivationScheme = new BitcoinExtPubKey(Network.GetBase58CheckEncoder().EncodeData(data), Network).ToString();
+                    var derivationScheme = new BitcoinExtPubKey(Encoders.Base58Check.EncodeData(data), Network).ToString();
                     electrumMapping.TryGetValue(prefix, out string[] labels);
                     if (labels != null)
                     {

BTCPayServer/DerivationStrategy.cs

@@ -32,7 +32,7 @@ namespace BTCPayServer
 
         public BTCPayNetwork Network { get { return this._Network; } }
 
-        public DerivationStrategyBase DerivationStrategyBase => this._DerivationStrategy;
+        public DerivationStrategyBase DerivationStrategyBase { get { return this._DerivationStrategy; } }
 
         public PaymentMethodId PaymentId => new PaymentMethodId(Network.CryptoCode, PaymentTypes.BTCLike);
 

BTCPayServer/Events/InvoiceEvent.cs

@@ -8,20 +8,24 @@ namespace BTCPayServer.Events
 {
     public class InvoiceEvent
     {
-        public InvoiceEvent(Models.InvoiceResponse invoice, int code, string name)
+        public InvoiceEvent(InvoiceEntity invoice, int code, string name) : this(invoice.Id, code, name)
         {
-            Invoice = invoice;
+
+        }
+        public InvoiceEvent(string invoiceId, int code, string name)
+        {
+            InvoiceId = invoiceId;
             EventCode = code;
             Name = name;
         }
 
-        public Models.InvoiceResponse Invoice { get; set; }
+        public string InvoiceId { get; set; }
         public int EventCode { get; set; }
         public string Name { get; set; }
 
         public override string ToString()
         {
-            return $"Invoice {Invoice.Id} new event: {Name} ({EventCode})";
+            return $"Invoice {InvoiceId} new event: {Name} ({EventCode})";
         }
     }
 }

BTCPayServer/Extensions.cs

@@ -31,12 +31,33 @@ using System.Security.Claims;
 using System.Globalization;
 using BTCPayServer.Services;
 using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer
 {
     public static class Extensions
     {
+        public static string Prettify(this TimeSpan timeSpan)
+        {
+            if (timeSpan.TotalMinutes < 1)
+            {
+                return $"{(int)timeSpan.TotalSeconds} second{Plural((int)timeSpan.TotalSeconds)}";
+            }
+            if (timeSpan.TotalHours < 1)
+            {
+                return $"{(int)timeSpan.TotalMinutes} minute{Plural((int)timeSpan.TotalMinutes)}";
+            }
+            if (timeSpan.Days < 1)
+            {
+                return $"{(int)timeSpan.TotalHours} hour{Plural((int)timeSpan.TotalHours)}";
+            }
+            return $"{(int)timeSpan.TotalDays} day{Plural((int)timeSpan.TotalDays)}";
+        }
+
+        private static string Plural(int totalDays)
+        {
+            return totalDays > 1 ? "s" : string.Empty;
+        }
+
         public static string PrettyPrint(this TimeSpan expiration)
         {
             StringBuilder builder = new StringBuilder();
@@ -83,15 +104,6 @@ namespace BTCPayServer
             return activeProvider != "Microsoft.EntityFrameworkCore.Sqlite";
         }
 
-        public static bool SupportDropForeignKey(this Microsoft.EntityFrameworkCore.Migrations.Migration migration, string activeProvider)
-        {
-            return activeProvider != "Microsoft.EntityFrameworkCore.Sqlite";
-        }
-        public static bool SupportDropForeignKey(this DatabaseFacade facade)
-        {
-            return facade.ProviderName != "Microsoft.EntityFrameworkCore.Sqlite";
-        }
-
         public static async Task<Dictionary<uint256, TransactionResult>> GetTransactions(this BTCPayWallet client, uint256[] hashes, CancellationToken cts = default(CancellationToken))
         {
             hashes = hashes.Distinct().ToArray();
@@ -108,26 +120,6 @@ namespace BTCPayServer
             return str + "/";
         }
 
-        public static void SetHeaderOnStarting(this HttpResponse resp, string name, string value)
-        {
-            if (resp.HasStarted)
-                return;
-            resp.OnStarting(() =>
-            {
-                SetHeader(resp, name, value);
-                return Task.CompletedTask;
-            });
-        }
-
-        public static void SetHeader(this HttpResponse resp, string name, string value)
-        {
-            var existing = resp.Headers[name].FirstOrDefault();
-            if (existing != null && value == null)
-                resp.Headers.Remove(name);
-            else
-                resp.Headers[name] = value;
-        }
-
         public static string GetAbsoluteRoot(this HttpRequest request)
         {
             return string.Concat(
@@ -139,7 +131,7 @@ namespace BTCPayServer
 
         public static string GetAbsoluteUri(this HttpRequest request, string redirectUrl)
         {
-            bool isRelative =
+            bool isRelative = 
                 (redirectUrl.Length > 0 && redirectUrl[0] == '/')
                 || !new Uri(redirectUrl, UriKind.RelativeOrAbsolute).IsAbsoluteUri;
             return isRelative ? request.GetAbsoluteRoot() + redirectUrl : redirectUrl;
@@ -171,7 +163,7 @@ namespace BTCPayServer
 
         public static void AddRange<T>(this HashSet<T> hashSet, IEnumerable<T> items)
         {
-            foreach (var item in items)
+            foreach(var item in items)
             {
                 hashSet.Add(item);
             }
@@ -187,30 +179,6 @@ namespace BTCPayServer
             NBitcoin.Extensions.TryAdd(ctx.Items, "BitpayAuth", value);
         }
 
-        public static async Task<T> WithCancellation<T>(this Task<T> task, CancellationToken cancellationToken)
-        {
-            using (var delayCTS = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken))
-            {
-                var waiting = Task.Delay(-1, delayCTS.Token);
-                var doing = task;
-                await Task.WhenAny(waiting, doing);
-                delayCTS.Cancel();
-                cancellationToken.ThrowIfCancellationRequested();
-                return await doing;
-            }
-        }
-        public static async Task WithCancellation(this Task task, CancellationToken cancellationToken)
-        {
-            using (var delayCTS = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken))
-            {
-                var waiting = Task.Delay(-1, delayCTS.Token);
-                var doing = task;
-                await Task.WhenAny(waiting, doing);
-                delayCTS.Cancel();
-                cancellationToken.ThrowIfCancellationRequested();
-            }
-        }
-
         public static (string Signature, String Id, String Authorization) GetBitpayAuth(this HttpContext ctx)
         {
             ctx.Items.TryGetValue("BitpayAuth", out object obj);

BTCPayServer/Filters/ContentSecurityPolicyAttribute.cs

@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using BTCPayServer.Security;
-using Microsoft.AspNetCore.Mvc.Filters;
-
-namespace BTCPayServer.Filters
-{
-    public interface IContentSecurityPolicy : IFilterMetadata { }
-    public class ContentSecurityPolicyAttribute : Attribute, IActionFilter, IContentSecurityPolicy
-    {
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-
-        }
-
-        public bool AutoSelf { get; set; } = true;
-        public bool UnsafeInline { get; set; } = true;
-        public bool FixWebsocket { get; set; } = true;
-        public string FontSrc { get; set; } = null;
-        public string ImgSrc { get; set; } = null;
-        public string DefaultSrc { get; set; }
-        public string StyleSrc { get; set; }
-        public string ScriptSrc { get; set; }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            if (context.IsEffectivePolicy<IContentSecurityPolicy>(this))
-            {
-                var policies = context.HttpContext.RequestServices.GetService(typeof(ContentSecurityPolicies)) as ContentSecurityPolicies;
-                if (policies == null)
-                    return;
-                if (DefaultSrc != null)
-                {
-                    policies.Add(new ConsentSecurityPolicy("default-src", DefaultSrc));
-                }
-                if (UnsafeInline)
-                {
-                    policies.Add(new ConsentSecurityPolicy("script-src", "'unsafe-inline'"));
-                }
-                if (!string.IsNullOrEmpty(FontSrc))
-                {
-                    policies.Add(new ConsentSecurityPolicy("font-src", FontSrc));
-                }
-
-                if (!string.IsNullOrEmpty(ImgSrc))
-                {
-                    policies.Add(new ConsentSecurityPolicy("img-src", ImgSrc));
-                }
-
-                if (!string.IsNullOrEmpty(StyleSrc))
-                {
-                    policies.Add(new ConsentSecurityPolicy("style-src", StyleSrc));
-                }
-
-                if (!string.IsNullOrEmpty(ScriptSrc))
-                {
-                    policies.Add(new ConsentSecurityPolicy("script-src", ScriptSrc));
-                }
-
-                if (FixWebsocket && AutoSelf) // Self does not match wss:// and ws:// :(
-                {
-                    var request = context.HttpContext.Request;
-
-                    var url = string.Concat(
-                            request.Scheme.Equals("http", StringComparison.OrdinalIgnoreCase) ? "ws" : "wss",
-                            "://",
-                            request.Host.ToUriComponent(),
-                            request.PathBase.ToUriComponent());
-                    policies.Add(new ConsentSecurityPolicy("connect-src", url));
-                }
-
-                context.HttpContext.Response.OnStarting(() =>
-                {
-                    if (!policies.HasRules)
-                        return Task.CompletedTask;
-                    if (AutoSelf)
-                    {
-                        bool hasSelf = false;
-                        foreach (var group in policies.Rules.GroupBy(p => p.Name))
-                        {
-                            hasSelf = group.Any(g => g.Value.Contains("'self'", StringComparison.OrdinalIgnoreCase));
-                            if (!hasSelf && !group.Any(g => g.Value.Contains("'none'", StringComparison.OrdinalIgnoreCase) ||
-                                               g.Value.Contains("*", StringComparison.OrdinalIgnoreCase)))
-                            {
-                                policies.Add(new ConsentSecurityPolicy(group.Key, "'self'"));
-                                hasSelf = true;
-                            }
-                            if (hasSelf)
-                            {
-                                foreach (var authorized in policies.Authorized)
-                                {
-                                    policies.Add(new ConsentSecurityPolicy(group.Key, authorized));
-                                }
-                            }
-                        }
-                    }
-                    context.HttpContext.Response.SetHeader("Content-Security-Policy", policies.ToString());
-                    return Task.CompletedTask;
-                });
-            }
-        }
-    }
-}

BTCPayServer/Filters/ReferrerPolicyAttribute.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Filters;
-
-namespace BTCPayServer.Filters
-{
-    public interface IReferrerPolicy : IFilterMetadata { }
-    public class ReferrerPolicyAttribute : Attribute, IActionFilter
-    {
-        public ReferrerPolicyAttribute(string value)
-        {
-            Value = value;
-        }
-        public string Value { get; set; }
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            if (context.IsEffectivePolicy<ReferrerPolicyAttribute>(this))
-            {
-                context.HttpContext.Response.SetHeaderOnStarting("Referrer-Policy", Value);
-            }
-        }
-    }
-}

BTCPayServer/Filters/XContentTypeOptionsAttribute.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Filters;
-
-namespace BTCPayServer.Filters
-{
-    public class XContentTypeOptionsAttribute : Attribute, IActionFilter
-    {
-        public XContentTypeOptionsAttribute(string value)
-        {
-            Value = value;
-        }
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-        }
-
-        public string Value { get; set; }
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            context.HttpContext.Response.SetHeaderOnStarting("X-Content-Type-Options", Value);
-        }
-    }
-}

BTCPayServer/Filters/XFrameOptionsAttribute.cs

@@ -23,7 +23,11 @@ namespace BTCPayServer.Filters
 
         public void OnActionExecuting(ActionExecutingContext context)
         {
-            context.HttpContext.Response.SetHeaderOnStarting("X-Frame-Options", Value);
+            var existing = context.HttpContext.Response.Headers["x-frame-options"].FirstOrDefault();
+            if (existing != null && Value == null)
+                context.HttpContext.Response.Headers.Remove("x-frame-options");
+            else
+                context.HttpContext.Response.Headers["x-frame-options"] = Value;
         }
     }
 }

BTCPayServer/Filters/XXSSProtectionAttribute.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.ViewFeatures;
-using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
-
-namespace BTCPayServer.Filters
-{
-    public class XXSSProtectionAttribute : Attribute, IActionFilter
-    {
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            context.HttpContext.Response.SetHeaderOnStarting("X-XSS-Protection", "1; mode=block");
-        }
-        
-    }
-}

BTCPayServer/HostedServices/CssThemeManager.cs

@@ -11,8 +11,6 @@ using NBXplorer.Models;
 using System.Collections.Concurrent;
 using BTCPayServer.Events;
 using BTCPayServer.Services;
-using Microsoft.AspNetCore.Mvc.Filters;
-using BTCPayServer.Security;
 
 namespace BTCPayServer.HostedServices
 {
@@ -52,33 +50,6 @@ namespace BTCPayServer.HostedServices
         }
     }
 
-    public class ContentSecurityPolicyCssThemeManager : Attribute, IActionFilter, IOrderedFilter
-    {
-        public int Order => 1001;
-
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-            
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            var manager = context.HttpContext.RequestServices.GetService(typeof(CssThemeManager)) as CssThemeManager;
-            var policies = context.HttpContext.RequestServices.GetService(typeof(ContentSecurityPolicies)) as ContentSecurityPolicies;
-            if (manager != null && policies != null)
-            {
-                if(manager.CreativeStartUri != null && Uri.TryCreate(manager.CreativeStartUri, UriKind.Absolute, out var uri))
-                {
-                    policies.Clear();
-                }
-                if (manager.BootstrapUri != null && Uri.TryCreate(manager.BootstrapUri, UriKind.Absolute, out uri))
-                {
-                    policies.Clear();
-                }
-            }
-        }
-    }
-
     public class CssThemeManagerHostedService : BaseAsyncService
     {
         private SettingsRepository _SettingsRepository;

BTCPayServer/HostedServices/InvoiceNotificationManager.cs

@@ -202,8 +202,7 @@ namespace BTCPayServer.HostedServices
                 PaymentSubtotals = dto.PaymentSubtotals,
                 PaymentTotals = dto.PaymentTotals,
                 AmountPaid = dto.AmountPaid,
-                ExchangeRates = dto.ExchangeRates,
-                
+                ExchangeRates = dto.ExchangeRates
             };
 
             // We keep backward compatibility with bitpay by passing BTC info to the notification
@@ -309,9 +308,7 @@ namespace BTCPayServer.HostedServices
         {
             leases.Add(_EventAggregator.Subscribe<InvoiceEvent>(async e =>
             {
-                var invoice = await _InvoiceRepository.GetInvoice(null, e.Invoice.Id);
-                if (invoice == null)
-                    return;
+                var invoice = await _InvoiceRepository.GetInvoice(null, e.InvoiceId);
                 List<Task> tasks = new List<Task>();
 
                 // Awaiting this later help make sure invoices should arrive in order

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -66,10 +66,10 @@ namespace BTCPayServer.HostedServices
                 context.MarkDirty();
                 await _InvoiceRepository.UnaffectAddress(invoice.Id);
 
-                context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1004, "invoice_expired"));
+                context.Events.Add(new InvoiceEvent(invoice, 1004, "invoice_expired"));
                 invoice.Status = "expired";
                 if(invoice.ExceptionStatus == "paidPartial")
-                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 2000, "invoice_expiredPaidPartial"));
+                    context.Events.Add(new InvoiceEvent(invoice, 2000, "invoice_expiredPaidPartial"));
             }
 
             var payments = invoice.GetPayments().Where(p => p.Accounted).ToArray();
@@ -84,7 +84,7 @@ namespace BTCPayServer.HostedServices
                 {
                     if (invoice.Status == "new")
                     {
-                        context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1003, "invoice_paidInFull"));
+                        context.Events.Add(new InvoiceEvent(invoice, 1003, "invoice_paidInFull"));
                         invoice.Status = "paid";
                         invoice.ExceptionStatus = accounting.Paid > accounting.TotalDue ? "paidOver" : null;
                         await _InvoiceRepository.UnaffectAddress(invoice.Id);
@@ -93,7 +93,7 @@ namespace BTCPayServer.HostedServices
                     else if (invoice.Status == "expired" && invoice.ExceptionStatus != "paidLate")
                     {
                         invoice.ExceptionStatus = "paidLate";
-                        context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1009, "invoice_paidAfterExpiration"));
+                        context.Events.Add(new InvoiceEvent(invoice, 1009, "invoice_paidAfterExpiration"));
                         context.MarkDirty();
                     }
                 }
@@ -139,14 +139,14 @@ namespace BTCPayServer.HostedServices
                    (confirmedAccounting.Paid < accounting.MinimumTotalDue))
                 {
                     await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1013, "invoice_failedToConfirm"));
+                    context.Events.Add(new InvoiceEvent(invoice, 1013, "invoice_failedToConfirm"));
                     invoice.Status = "invalid";
                     context.MarkDirty();
                 }
                 else if (confirmedAccounting.Paid >= accounting.MinimumTotalDue)
                 {
                     await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1005, "invoice_confirmed"));
+                    context.Events.Add(new InvoiceEvent(invoice, 1005, "invoice_confirmed"));
                     invoice.Status = "confirmed";
                     context.MarkDirty();
                 }
@@ -157,7 +157,7 @@ namespace BTCPayServer.HostedServices
                 var completedAccounting = paymentMethod.Calculate(p => p.GetCryptoPaymentData().PaymentCompleted(p, network));
                 if (completedAccounting.Paid >= accounting.MinimumTotalDue)
                 {
-                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1006, "invoice_completed"));
+                    context.Events.Add(new InvoiceEvent(invoice, 1006, "invoice_completed"));
                     invoice.Status = "complete";
                     context.MarkDirty();
                 }
@@ -249,13 +249,13 @@ namespace BTCPayServer.HostedServices
             {
                 if (b.Name == "invoice_created")
                 {
-                    Watch(b.Invoice.Id);
-                    await Wait(b.Invoice.Id);
+                    Watch(b.InvoiceId);
+                    await Wait(b.InvoiceId);
                 }
 
                 if (b.Name == "invoice_receivedPayment")
                 {
-                    Watch(b.Invoice.Id);
+                    Watch(b.InvoiceId);
                 }
             }));
             return Task.CompletedTask;

BTCPayServer/HostedServices/MigratorHostedService.cs

@@ -1,89 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Data;
-using BTCPayServer.Services;
-using BTCPayServer.Services.Stores;
-using BTCPayServer.Logging;
-
-namespace BTCPayServer.HostedServices
-{
-    public class MigratorHostedService : BaseAsyncService
-    {
-        private ApplicationDbContextFactory _DBContextFactory;
-        private StoreRepository _StoreRepository;
-        private BTCPayNetworkProvider _NetworkProvider;
-        private SettingsRepository _Settings;
-        public MigratorHostedService(
-            BTCPayNetworkProvider networkProvider,
-            StoreRepository storeRepository,
-            ApplicationDbContextFactory dbContextFactory,
-            SettingsRepository settingsRepository)
-        {
-            _DBContextFactory = dbContextFactory;
-            _StoreRepository = storeRepository;
-            _NetworkProvider = networkProvider;
-            _Settings = settingsRepository;
-        }
-        internal override Task[] InitializeTasks()
-        {
-            return new[]
-            {
-                Update()
-            };
-        }
-
-        private async Task Update()
-        {
-            try
-            {
-                var settings = (await _Settings.GetSettingAsync<MigrationSettings>()) ?? new MigrationSettings();
-                if (!settings.DeprecatedLightningConnectionStringCheck)
-                {
-                    await DeprecatedLightningConnectionStringCheck();
-                    settings.DeprecatedLightningConnectionStringCheck = true;
-                    await _Settings.UpdateSetting(settings);
-                }
-                if (!settings.UnreachableStoreCheck)
-                {
-                    await UnreachableStoreCheck();
-                    settings.UnreachableStoreCheck = true;
-                    await _Settings.UpdateSetting(settings);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logs.PayServer.LogError(ex, "Error on the MigratorHostedService");
-                throw;
-            }
-        }
-
-        private Task UnreachableStoreCheck()
-        {
-            return _StoreRepository.CleanUnreachableStores();
-        }
-
-        private async Task DeprecatedLightningConnectionStringCheck()
-        {
-            using (var ctx = _DBContextFactory.CreateContext())
-            {
-                foreach (var store in await ctx.Stores.ToArrayAsync())
-                {
-                    foreach (var method in store.GetSupportedPaymentMethods(_NetworkProvider).OfType<Payments.Lightning.LightningSupportedPaymentMethod>())
-                    {
-                        var lightning = method.GetLightningUrl();
-                        if (lightning.IsLegacy)
-                        {
-                            method.SetLightningUrl(lightning);
-                            store.SetSupportedPaymentMethod(method.PaymentId, method);
-                        }
-                    }
-                }
-                await ctx.SaveChangesAsync();
-            }
-        }
-    }
-}

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -39,8 +39,6 @@ using BTCPayServer.HostedServices;
 using Meziantou.AspNetCore.BundleTagHelpers;
 using System.Security.Claims;
 using BTCPayServer.Security;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using NBXplorer.DerivationStrategy;
 
 namespace BTCPayServer.Hosting
 {
@@ -94,7 +92,6 @@ namespace BTCPayServer.Hosting
                 return opts.NetworkProvider;
             });
 
-            services.TryAddSingleton<LightningConfigurationProvider>();
             services.TryAddSingleton<LanguageService>();
             services.TryAddSingleton<NBXplorerDashboard>();
             services.TryAddSingleton<StoreRepository>();
@@ -107,13 +104,7 @@ namespace BTCPayServer.Hosting
             });
 
             services.AddSingleton<CssThemeManager>();
-            services.Configure<MvcOptions>((o) => {
-                o.Filters.Add(new ContentSecurityPolicyCssThemeManager());
-                o.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(WalletId)));
-                o.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(DerivationStrategyBase)));
-            });
             services.AddSingleton<IHostedService, CssThemeManagerHostedService>();
-            services.AddSingleton<IHostedService, MigratorHostedService>();
 
             services.AddSingleton<Payments.IPaymentMethodHandler<DerivationStrategy>, Payments.Bitcoin.BitcoinLikePaymentHandler>();
             services.AddSingleton<IHostedService, Payments.Bitcoin.NBXplorerListener>();
@@ -126,6 +117,7 @@ namespace BTCPayServer.Hosting
             services.AddSingleton<IHostedService, InvoiceWatcher>();
             services.AddSingleton<IHostedService, RatesHostedService>();
             services.AddTransient<IConfigureOptions<MvcOptions>, BTCPayClaimsFilter>();
+            services.AddTransient<IConfigureOptions<MvcOptions>, BitpayClaimsFilter>();
 
             services.TryAddSingleton<ExplorerClientProvider>();
             services.TryAddSingleton<Bitpay>(o =>
@@ -145,7 +137,6 @@ namespace BTCPayServer.Hosting
             // bundling
 
             services.AddAuthorization(o => Policies.AddBTCPayPolicies(o));
-            BitpayAuthentication.AddAuthentication(services);
 
             services.AddBundles();
             services.AddTransient<BundleOptions>(provider =>

BTCPayServer/Hosting/BTCpayMiddleware.cs

@@ -100,7 +100,7 @@ namespace BTCPayServer.Hosting
                 (isJson || httpContext.Request.Query.ContainsKey("token")))
                 return true;
 
-            if (path.StartsWith("/rates", StringComparison.OrdinalIgnoreCase) &&
+            if (path.Equals("/rates", StringComparison.OrdinalIgnoreCase) &&
                 httpContext.Request.Method == "GET")
                 return true;
 

BTCPayServer/Hosting/Startup.cs

@@ -39,7 +39,6 @@ using Microsoft.AspNetCore.Mvc.Cors.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using System.Net;
 using Meziantou.AspNetCore.BundleTagHelpers;
-using BTCPayServer.Security;
 
 namespace BTCPayServer.Hosting
 {
@@ -80,19 +79,8 @@ namespace BTCPayServer.Hosting
             services.AddMvc(o =>
             {
                 o.Filters.Add(new XFrameOptionsAttribute("DENY"));
-                o.Filters.Add(new XContentTypeOptionsAttribute("nosniff"));
-                o.Filters.Add(new XXSSProtectionAttribute());
-                o.Filters.Add(new ReferrerPolicyAttribute("same-origin"));
-                //o.Filters.Add(new ContentSecurityPolicyAttribute()
-                //{
-                //    FontSrc = "'self' https://fonts.gstatic.com/",
-                //    ImgSrc = "'self' data:",
-                //    DefaultSrc = "'none'",
-                //    StyleSrc = "'self' 'unsafe-inline'",
-                //    ScriptSrc = "'self' 'unsafe-inline'"
-                //});
             });
-            services.TryAddScoped<ContentSecurityPolicies>();
+
             services.Configure<IdentityOptions>(options =>
             {
                 options.Password.RequireDigit = false;

BTCPayServer/Logging/InvoiceLog.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Logging
-{
-    public class InvoiceLog
-    {
-        public DateTimeOffset Timestamp { get; set; }
-        public string Log { get; set; }
-
-        public override string ToString()
-        {
-            return $"{Timestamp.UtcDateTime}: {Log}";
-        }
-    }
-    public class InvoiceLogs
-    {
-        List<InvoiceLog> _InvoiceLogs = new List<InvoiceLog>();
-        public void Write(string data)
-        {
-            lock (_InvoiceLogs)
-            {
-                _InvoiceLogs.Add(new InvoiceLog() { Timestamp = DateTimeOffset.UtcNow, Log = data });
-            }
-        }
-
-        public List<InvoiceLog> ToList()
-        {
-            lock (_InvoiceLogs)
-            {
-                return _InvoiceLogs.ToList();
-            }
-        }
-    }
-}

BTCPayServer/Logging/Logs.cs

@@ -15,14 +15,9 @@ namespace BTCPayServer.Logging
         }
         public static void Configure(ILoggerFactory factory)
         {
-            if (factory == null)
-                Configure(new FuncLoggerFactory(n => NullLogger.Instance));
-            else
-            {
-                Configuration = factory.CreateLogger("Configuration");
-                PayServer = factory.CreateLogger("PayServer");
-                Events = factory.CreateLogger("Events");
-            }
+            Configuration = factory.CreateLogger("Configuration");
+            PayServer = factory.CreateLogger("PayServer");
+            Events = factory.CreateLogger("Events");
         }
         public static ILogger Configuration
         {

BTCPayServer/Migrations/20180719095626_CanDeleteStores.Designer.cs

@@ -1,578 +0,0 @@
-// <auto-generated />
-using System;
-using BTCPayServer.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace BTCPayServer.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20180719095626_CanDeleteStores")]
-    partial class CanDeleteStores
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.0-rtm-30799");
-
-            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
-                {
-                    b.Property<string>("Address")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset?>("CreatedTime");
-
-                    b.Property<string>("InvoiceDataId");
-
-                    b.HasKey("Address");
-
-                    b.HasIndex("InvoiceDataId");
-
-                    b.ToTable("AddressInvoices");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(50);
-
-                    b.Property<string>("StoreId")
-                        .HasMaxLength(50);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("StoreId");
-
-                    b.ToTable("ApiKeys");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("AppType");
-
-                    b.Property<DateTimeOffset>("Created");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("Settings");
-
-                    b.Property<string>("StoreDataId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("StoreDataId");
-
-                    b.ToTable("Apps");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
-                {
-                    b.Property<string>("InvoiceDataId");
-
-                    b.Property<string>("Address");
-
-                    b.Property<DateTimeOffset>("Assigned");
-
-                    b.Property<string>("CryptoCode");
-
-                    b.Property<DateTimeOffset?>("UnAssigned");
-
-                    b.HasKey("InvoiceDataId", "Address");
-
-                    b.ToTable("HistoricalAddressInvoices");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<byte[]>("Blob");
-
-                    b.Property<DateTimeOffset>("Created");
-
-                    b.Property<string>("CustomerEmail");
-
-                    b.Property<string>("ExceptionStatus");
-
-                    b.Property<string>("ItemCode");
-
-                    b.Property<string>("OrderId");
-
-                    b.Property<string>("Status");
-
-                    b.Property<string>("StoreDataId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("StoreDataId");
-
-                    b.ToTable("Invoices");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
-                {
-                    b.Property<string>("InvoiceDataId");
-
-                    b.Property<string>("UniqueId");
-
-                    b.Property<string>("Message");
-
-                    b.Property<DateTimeOffset>("Timestamp");
-
-                    b.HasKey("InvoiceDataId", "UniqueId");
-
-                    b.ToTable("InvoiceEvents");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Facade");
-
-                    b.Property<string>("Label");
-
-                    b.Property<DateTimeOffset>("PairingTime");
-
-                    b.Property<string>("SIN");
-
-                    b.Property<string>("StoreDataId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("SIN");
-
-                    b.HasIndex("StoreDataId");
-
-                    b.ToTable("PairedSINData");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PairingCodeData", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTime>("DateCreated");
-
-                    b.Property<DateTimeOffset>("Expiration");
-
-                    b.Property<string>("Facade");
-
-                    b.Property<string>("Label");
-
-                    b.Property<string>("SIN");
-
-                    b.Property<string>("StoreDataId");
-
-                    b.Property<string>("TokenValue");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("PairingCodes");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Accounted");
-
-                    b.Property<byte[]>("Blob");
-
-                    b.Property<string>("InvoiceDataId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InvoiceDataId");
-
-                    b.ToTable("Payments");
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
-                {
-                    b.Property<string>("Id");
-
-                    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")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                        .WithMany("APIKeys")
-                        .HasForeignKey("StoreId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                        .WithMany("Apps")
-                        .HasForeignKey("StoreDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("HistoricalAddressInvoices")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                        .WithMany("Invoices")
-                        .HasForeignKey("StoreDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("Events")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                        .WithMany("PairedSINs")
-                        .HasForeignKey("StoreDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("Payments")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("PendingInvoices")
-                        .HasForeignKey("Id")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("RefundAddresses")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            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/20180719095626_CanDeleteStores.cs

@@ -1,172 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace BTCPayServer.Migrations
-{
-    public partial class CanDeleteStores : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            if (this.SupportDropForeignKey(migrationBuilder.ActiveProvider))
-            {
-                migrationBuilder.DropForeignKey(
-                name: "FK_AddressInvoices_Invoices_InvoiceDataId",
-                table: "AddressInvoices");
-
-                migrationBuilder.DropForeignKey(
-                    name: "FK_Apps_Stores_StoreDataId",
-                    table: "Apps");
-
-                migrationBuilder.DropForeignKey(
-                    name: "FK_Invoices_Stores_StoreDataId",
-                    table: "Invoices");
-
-                migrationBuilder.DropForeignKey(
-                    name: "FK_Payments_Invoices_InvoiceDataId",
-                    table: "Payments");
-
-                migrationBuilder.DropForeignKey(
-                    name: "FK_RefundAddresses_Invoices_InvoiceDataId",
-                    table: "RefundAddresses");
-
-                migrationBuilder.AddForeignKey(
-                    name: "FK_AddressInvoices_Invoices_InvoiceDataId",
-                    table: "AddressInvoices",
-                    column: "InvoiceDataId",
-                    principalTable: "Invoices",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-
-                migrationBuilder.AddForeignKey(
-                    name: "FK_ApiKeys_Stores_StoreId",
-                    table: "ApiKeys",
-                    column: "StoreId",
-                    principalTable: "Stores",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-
-                migrationBuilder.AddForeignKey(
-                    name: "FK_Apps_Stores_StoreDataId",
-                    table: "Apps",
-                    column: "StoreDataId",
-                    principalTable: "Stores",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-
-                migrationBuilder.AddForeignKey(
-                    name: "FK_Invoices_Stores_StoreDataId",
-                    table: "Invoices",
-                    column: "StoreDataId",
-                    principalTable: "Stores",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-
-                migrationBuilder.AddForeignKey(
-                    name: "FK_PairedSINData_Stores_StoreDataId",
-                    table: "PairedSINData",
-                    column: "StoreDataId",
-                    principalTable: "Stores",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-
-                migrationBuilder.AddForeignKey(
-                    name: "FK_Payments_Invoices_InvoiceDataId",
-                    table: "Payments",
-                    column: "InvoiceDataId",
-                    principalTable: "Invoices",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-
-                migrationBuilder.AddForeignKey(
-                    name: "FK_PendingInvoices_Invoices_Id",
-                    table: "PendingInvoices",
-                    column: "Id",
-                    principalTable: "Invoices",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-
-                migrationBuilder.AddForeignKey(
-                    name: "FK_RefundAddresses_Invoices_InvoiceDataId",
-                    table: "RefundAddresses",
-                    column: "InvoiceDataId",
-                    principalTable: "Invoices",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-            }
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_AddressInvoices_Invoices_InvoiceDataId",
-                table: "AddressInvoices");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_ApiKeys_Stores_StoreId",
-                table: "ApiKeys");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_Apps_Stores_StoreDataId",
-                table: "Apps");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_Invoices_Stores_StoreDataId",
-                table: "Invoices");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_PairedSINData_Stores_StoreDataId",
-                table: "PairedSINData");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_Payments_Invoices_InvoiceDataId",
-                table: "Payments");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_PendingInvoices_Invoices_Id",
-                table: "PendingInvoices");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_RefundAddresses_Invoices_InvoiceDataId",
-                table: "RefundAddresses");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_AddressInvoices_Invoices_InvoiceDataId",
-                table: "AddressInvoices",
-                column: "InvoiceDataId",
-                principalTable: "Invoices",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Apps_Stores_StoreDataId",
-                table: "Apps",
-                column: "StoreDataId",
-                principalTable: "Stores",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Invoices_Stores_StoreDataId",
-                table: "Invoices",
-                column: "StoreDataId",
-                principalTable: "Stores",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Payments_Invoices_InvoiceDataId",
-                table: "Payments",
-                column: "InvoiceDataId",
-                principalTable: "Invoices",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_RefundAddresses_Invoices_InvoiceDataId",
-                table: "RefundAddresses",
-                column: "InvoiceDataId",
-                principalTable: "Invoices",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-        }
-    }
-}

BTCPayServer/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -1,9 +1,13 @@
 // <auto-generated />
-using System;
 using BTCPayServer.Data;
+using BTCPayServer.Services.Invoices;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
+using System;
 
 namespace BTCPayServer.Migrations
 {
@@ -14,7 +18,7 @@ namespace BTCPayServer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.0-rtm-30799");
+                .HasAnnotation("ProductVersion", "2.0.2-rtm-10011");
 
             modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
                 {
@@ -198,7 +202,8 @@ namespace BTCPayServer.Migrations
 
             modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
                 {
-                    b.Property<string>("Id");
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
 
                     b.HasKey("Id");
 
@@ -437,29 +442,19 @@ namespace BTCPayServer.Migrations
                 {
                     b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
                         .WithMany("AddressInvoices")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                        .WithMany("APIKeys")
-                        .HasForeignKey("StoreId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .HasForeignKey("InvoiceDataId");
                 });
 
             modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
                         .WithMany("Apps")
-                        .HasForeignKey("StoreDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .HasForeignKey("StoreDataId");
                 });
 
             modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
                 {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                    b.HasOne("BTCPayServer.Data.InvoiceData")
                         .WithMany("HistoricalAddressInvoices")
                         .HasForeignKey("InvoiceDataId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -468,49 +463,30 @@ namespace BTCPayServer.Migrations
             modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                        .WithMany("Invoices")
-                        .HasForeignKey("StoreDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .WithMany()
+                        .HasForeignKey("StoreDataId");
                 });
 
             modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
                 {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                    b.HasOne("BTCPayServer.Data.InvoiceData")
                         .WithMany("Events")
                         .HasForeignKey("InvoiceDataId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
-                        .WithMany("PairedSINs")
-                        .HasForeignKey("StoreDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
                         .WithMany("Payments")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("PendingInvoices")
-                        .HasForeignKey("Id")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .HasForeignKey("InvoiceDataId");
                 });
 
             modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
                         .WithMany("RefundAddresses")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .HasForeignKey("InvoiceDataId");
                 });
 
             modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>

BTCPayServer/ModelBinders/DerivationSchemeModelBinder.cs

@@ -1,58 +0,0 @@
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using NBitcoin;
-using System.Reflection;
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Internal;
-using NBXplorer.DerivationStrategy;
-
-namespace BTCPayServer.ModelBinders
-{
-    public class DerivationSchemeModelBinder : IModelBinder
-    {
-        public DerivationSchemeModelBinder()
-        {
-
-        }
-
-        #region IModelBinder Members
-
-        public Task BindModelAsync(ModelBindingContext bindingContext)
-        {
-            if (!typeof(DerivationStrategyBase).GetTypeInfo().IsAssignableFrom(bindingContext.ModelType))
-            {
-                return Task.CompletedTask;
-            }
-
-            ValueProviderResult val = bindingContext.ValueProvider.GetValue(
-                bindingContext.ModelName);
-            if (val == null)
-            {
-                return Task.CompletedTask;
-            }
-
-            string key = val.FirstValue as string;
-            if (key == null)
-            {
-                return Task.CompletedTask;
-            }
-
-            var networkProvider = (BTCPayNetworkProvider)bindingContext.HttpContext.RequestServices.GetService(typeof(BTCPayNetworkProvider));
-            var cryptoCode = bindingContext.ValueProvider.GetValue("cryptoCode").FirstValue;
-            var network = networkProvider.GetNetwork(cryptoCode ?? "BTC");
-            try
-            {
-                var data = new DerivationStrategyFactory(network.NBitcoinNetwork).Parse(key);
-                if (!bindingContext.ModelType.IsInstanceOfType(data))
-                {
-                    throw new FormatException("Invalid destination type");
-                }
-                bindingContext.Result = ModelBindingResult.Success(data);
-            }
-            catch { throw new FormatException("Invalid derivation scheme"); }
-            return Task.CompletedTask;
-        }
-
-        #endregion
-    }
-}

BTCPayServer/ModelBinders/WalletIdModelBinder.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-
-namespace BTCPayServer.ModelBinders
-{
-    public class WalletIdModelBinder : IModelBinder
-    {
-        public Task BindModelAsync(ModelBindingContext bindingContext)
-        {
-            if (!typeof(WalletId).GetTypeInfo().IsAssignableFrom(bindingContext.ModelType))
-            {
-                return Task.CompletedTask;
-            }
-
-            ValueProviderResult val = bindingContext.ValueProvider.GetValue(
-                bindingContext.ModelName);
-            if (val == null)
-            {
-                return Task.CompletedTask;
-            }
-
-            string key = val.FirstValue as string;
-            if (key == null)
-            {
-                return Task.CompletedTask;
-            }
-
-            if(WalletId.TryParse(key, out var walletId))
-            {
-                bindingContext.Result = ModelBindingResult.Success(walletId);
-            }
-            return Task.CompletedTask;
-        }
-    }
-}

BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs

@@ -20,9 +20,5 @@ namespace BTCPayServer.Models.AppViewModels
 
         [Display(Name = "User can input custom amount")]
         public bool ShowCustomAmount { get; set; }
-        public string Example1 { get; internal set; }
-        public string Example2 { get; internal set; }
-        public string ExampleCallback { get; internal set; }
-        public string InvoiceUrl { get; internal set; }
     }
 }

BTCPayServer/Models/InvoiceResponse.cs

@@ -235,7 +235,7 @@ namespace BTCPayServer.Models
         public long AmountPaid { get; set; }
 
         [JsonProperty("minerFees")]
-        public Dictionary<string, NBitpayClient.MinerFeeInfo> MinerFees { get; set; }
+        public long MinerFees { get; set; }
 
         [JsonProperty("exchangeRates")]
         public Dictionary<string, Dictionary<string, decimal>> ExchangeRates { get; set; }

BTCPayServer/Models/InvoicingModels/InvoicesModel.cs

@@ -33,7 +33,10 @@ namespace BTCPayServer.Models.InvoicingModels
 
     public class InvoiceModel
     {
-        public DateTimeOffset Date { get; set; }
+        public string Date
+        {
+            get; set;
+        }
 
         public string OrderId { get; set; }
         public string RedirectUrl { get; set; }

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -12,9 +12,6 @@ namespace BTCPayServer.Models.InvoicingModels
             public string PaymentMethodId { get; set; }
             public string CryptoImage { get; set; }
             public string Link { get; set; }
-            public string PaymentMethodName { get; set; }
-            public bool IsLightning { get; set; }
-            public string CryptoCode { get; set; }
         }
         public string HtmlTitle { get; set; }
         public string CustomCSSLink { get; set; }
@@ -33,7 +30,8 @@ namespace BTCPayServer.Models.InvoicingModels
         public string Status { get; set; }
         public string MerchantRefLink { get; set; }
         public int MaxTimeSeconds { get; set; }
-        
+
+        // These properties are not used in client side code
         public string StoreName { get; set; }
         public string ItemDesc { get; set; }
         public string TimeLeft { get; set; }
@@ -47,13 +45,12 @@ namespace BTCPayServer.Models.InvoicingModels
         public string StoreEmail { get; set; }
 
         public string OrderId { get; set; }
+        public string CryptoImage { get; set; }
         public decimal NetworkFee { get; set; }
         public bool IsMultiCurrency { get; set; }
-        public int MaxTimeMinutes { get; set; }
-        public string PaymentType { get; set; }
-        public string PaymentMethodId { get; set; }
-        public string PaymentMethodName { get; set; }
-        public string CryptoImage { get; set; }
+        public int MaxTimeMinutes { get; internal set; }
+        public string PaymentType { get; internal set; }
+        public string PaymentMethodId { get; internal set; }
 
         public bool AllowCoinConversion { get; set; }
         public string PeerInfo { get; set; }

BTCPayServer/Models/ServerViewModels/LNDGRPCServicesViewModel.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Models.ServerViewModels
-{
-    public class LNDGRPCServicesViewModel
-    {
-        public string Host { get; set; }
-        public bool SSL { get; set; }
-        public string Macaroon { get; set; }
-        public string CertificateThumbprint { get; set; }
-        public string QRCode { get; set; }
-        public string QRCodeLink { get; set; }
-    }
-}

BTCPayServer/Models/ServerViewModels/MaintenanceViewModel.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
-using Renci.SshNet;
-
-namespace BTCPayServer.Models.ServerViewModels
-{
-    public class MaintenanceViewModel
-    {
-        [Required]
-        public string UserName { get; set; }
-        [Required]
-        [DataType(DataType.Password)]
-        public string Password { get; set; }
-        [Display(Name = "Change domain")]
-        public string DNSDomain { get; set; }
-        public SshClient CreateSSHClient(string host)
-        {
-            return new SshClient(host, UserName, Password);
-        }
-    }
-}

BTCPayServer/Models/ServerViewModels/ServicesViewModel.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Models.ServerViewModels
-{
-    public class ServicesViewModel
-    {
-        public class LNDServiceViewModel
-        {
-            public string Crypto { get; set; }
-            public string Type { get; set; }
-            public int Index { get; set; }
-        }
-        public List<LNDServiceViewModel> LNDServices { get; set; } = new List<LNDServiceViewModel>();
-    }
-}

BTCPayServer/Models/StoreViewModels/LightningNodeViewModel.cs

@@ -9,8 +9,8 @@ namespace BTCPayServer.Models.StoreViewModels
 {
     public class LightningNodeViewModel
     {
-        [Display(Name = "Connection string")]
-        public string ConnectionString
+        [Display(Name = "Lightning charge url")]
+        public string Url
         {
             get;
             set;

BTCPayServer/Models/StoreViewModels/RatesViewModel.cs

@@ -44,7 +44,7 @@ namespace BTCPayServer.Models.StoreViewModels
         public string ScriptTest { get; set; }
         public CoinAverageExchange[] AvailableExchanges { get; set; }
 
-        [Display(Name = "Multiply the rate by... (Setting to 1.01 would apply a discount of 1% to the purchase)")]
+        [Display(Name = "Multiply the rate by ...")]
         [Range(0.01, 10.0)]
         public double RateMultiplier
         {

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -18,7 +18,6 @@ namespace BTCPayServer.Models.StoreViewModels
         {
             public string Crypto { get; set; }
             public string Value { get; set; }
-            public WalletId WalletId { get; set; }
         }
 
         public StoreViewModel()
@@ -26,7 +25,6 @@ namespace BTCPayServer.Models.StoreViewModels
 
         }
 
-        public bool CanDelete { get; set; }
         public string Id { get; set; }
         [Display(Name = "Store Name")]
         [Required]

BTCPayServer/Models/StoreViewModels/StoresViewModel.cs

@@ -34,6 +34,10 @@ namespace BTCPayServer.Models.StoreViewModels
                 get;
                 set;
             }
+            public string[] Balances
+            {
+                get; set;
+            }
         }
     }
 }

BTCPayServer/Models/StoreViewModels/WalletModel.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace BTCPayServer.Models.WalletViewModels
+namespace BTCPayServer.Models.StoreViewModels
 {
     public class WalletModel
     {
@@ -15,9 +15,5 @@ namespace BTCPayServer.Models.WalletViewModels
             get;
             set;
         }
-        public decimal? Rate { get; set; }
-        public int Divisibility { get; set; }
-        public string Fiat { get; set; }
-        public string RateError { get; set; }
     }
 }

BTCPayServer/Models/TokenRequest.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using NBitcoin;
-using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Models
 {
@@ -45,9 +44,6 @@ namespace BTCPayServer.Models
 
     public class PairingCodeResponse
     {
-        [JsonProperty(PropertyName = "policies")]
-        public JArray Policies { get; set; }
-
         [JsonProperty(PropertyName = "pairingCode")]
         public string PairingCode
         {

BTCPayServer/Models/WalletViewModels/ListTransactionsViewModel.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Models.WalletViewModels
-{
-    public class ListTransactionsViewModel
-    {
-        public class TransactionViewModel
-        {
-            public DateTimeOffset Timestamp { get; set; }
-            public string Id { get; set; }
-            public string Link { get; set; }
-            public bool Positive { get; set; }
-            public string Balance { get; set; }
-        }
-        public List<TransactionViewModel> Transactions { get; set; } = new List<TransactionViewModel>();
-    }
-}

BTCPayServer/Models/WalletViewModels/ListWalletsViewModel.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Models.WalletViewModels
-{
-    public class ListWalletsViewModel
-    {
-        public class WalletViewModel
-        {
-            public string StoreName { get; set; }
-            public string StoreId { get; set; }
-            public string CryptoCode { get; set; }
-            public string Balance { get; set; }
-            public bool IsOwner { get; set; }
-            public WalletId Id { get; set; }
-        }
-
-        public List<WalletViewModel> Wallets { get; set; } = new List<WalletViewModel>();
-    }
-}

BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs

@@ -161,7 +161,7 @@ namespace BTCPayServer.Payments.Bitcoin
                                             {
                                                 var payment = await _InvoiceRepository.AddPayment(invoice.Id, DateTimeOffset.UtcNow, paymentData, network.CryptoCode);
                                                 if(payment != null)
-                                                    await ReceivedPayment(wallet, invoice, payment, evt.DerivationStrategy);
+                                                    await ReceivedPayment(wallet, invoice.Id, payment, evt.DerivationStrategy);
                                             }
                                             else
                                             {
@@ -207,8 +207,6 @@ namespace BTCPayServer.Payments.Bitcoin
         async Task<InvoiceEntity> UpdatePaymentStates(BTCPayWallet wallet, string invoiceId)
         {
             var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId, false);
-            if (invoice == null)
-                return null;
             List<PaymentEntity> updatedPaymentEntities = new List<PaymentEntity>();
             var transactions = await wallet.GetTransactions(GetAllBitcoinPaymentData(invoice)
                     .Select(p => p.Outpoint.Hash)
@@ -317,8 +315,6 @@ namespace BTCPayServer.Payments.Bitcoin
             foreach (var invoiceId in invoices)
             {
                 var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId, true);
-                if (invoice == null)
-                    continue;
                 var alreadyAccounted = GetAllBitcoinPaymentData(invoice).Select(p => p.Outpoint).ToHashSet();
                 var strategy = GetDerivationStrategy(invoice, network);
                 if (strategy == null)
@@ -336,12 +332,8 @@ namespace BTCPayServer.Payments.Bitcoin
                     var payment = await _InvoiceRepository.AddPayment(invoice.Id, coin.Timestamp, paymentData, network.CryptoCode).ConfigureAwait(false);
                     alreadyAccounted.Add(coin.Coin.Outpoint);
                     if (payment != null)
-                    {
-                        invoice = await ReceivedPayment(wallet, invoice, payment, strategy);
-                        if(invoice == null)
-                            continue;
-                        totalPayment++;
-                    }
+                        invoice = await ReceivedPayment(wallet, invoice.Id, payment, strategy);
+                    totalPayment++;
                 }
             }
             return totalPayment;
@@ -354,12 +346,10 @@ namespace BTCPayServer.Payments.Bitcoin
                           .FirstOrDefault();
         }
 
-        private async Task<InvoiceEntity> ReceivedPayment(BTCPayWallet wallet, InvoiceEntity invoice, PaymentEntity payment, DerivationStrategyBase strategy)
+        private async Task<InvoiceEntity> ReceivedPayment(BTCPayWallet wallet, string invoiceId, PaymentEntity payment, DerivationStrategyBase strategy)
         {
             var paymentData = (BitcoinLikePaymentData)payment.GetCryptoPaymentData();
-            invoice = (await UpdatePaymentStates(wallet, invoice.Id));
-            if (invoice == null)
-                return null;
+            var invoice = (await UpdatePaymentStates(wallet, invoiceId));
             var paymentMethod = invoice.GetPaymentMethod(wallet.Network, PaymentTypes.BTCLike, _ExplorerClients.NetworkProviders);
             if (paymentMethod != null &&
                 paymentMethod.GetPaymentMethodDetails() is BitcoinLikeOnChainPaymentMethod btc &&
@@ -368,13 +358,13 @@ namespace BTCPayServer.Payments.Bitcoin
             {
                 var address = await wallet.ReserveAddressAsync(strategy);
                 btc.DepositAddress = address.ToString();
-                await _InvoiceRepository.NewAddress(invoice.Id, btc, wallet.Network);
-                _Aggregator.Publish(new InvoiceNewAddressEvent(invoice.Id, address.ToString(), wallet.Network));
+                await _InvoiceRepository.NewAddress(invoiceId, btc, wallet.Network);
+                _Aggregator.Publish(new InvoiceNewAddressEvent(invoiceId, address.ToString(), wallet.Network));
                 paymentMethod.SetPaymentMethodDetails(btc);
                 invoice.SetPaymentMethod(paymentMethod);
             }
             wallet.InvalidateCache(strategy);
-            _Aggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1002, "invoice_receivedPayment"));
+            _Aggregator.Publish(new InvoiceEvent(invoiceId, 1002, "invoice_receivedPayment"));
             return invoice;
         }
         public Task StopAsync(CancellationToken cancellationToken)

BTCPayServer/Payments/Lightning/LightningClientFactory.cs

@@ -4,8 +4,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Payments.Lightning.Charge;
 using BTCPayServer.Payments.Lightning.CLightning;
-using NBitcoin;
-using BTCPayServer.Payments.Lightning.Lnd;
 
 namespace BTCPayServer.Payments.Lightning
 {
@@ -14,38 +12,16 @@ namespace BTCPayServer.Payments.Lightning
         public ILightningInvoiceClient CreateClient(LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
         {
             var uri = supportedPaymentMethod.GetLightningUrl();
-            return CreateClient(uri, network.NBitcoinNetwork);
-        }
-
-        public static ILightningInvoiceClient CreateClient(LightningConnectionString connString, Network network)
-        {
-            if (connString.ConnectionType == LightningConnectionType.Charge)
+            if (uri.ConnectionType == LightningConnectionType.Charge)
             {
-                return new ChargeClient(connString.ToUri(true), network);
+                return new ChargeClient(uri.ToUri(true), network.NBitcoinNetwork);
             }
-            else if (connString.ConnectionType == LightningConnectionType.CLightning)
+            else if (uri.ConnectionType == LightningConnectionType.CLightning)
             {
-                return new CLightningRPCClient(connString.ToUri(false), network);
-            }
-            else if (connString.ConnectionType == LightningConnectionType.LndREST)
-            {
-                return new LndInvoiceClient(new LndSwaggerClient(new LndRestSettings(connString.BaseUri)
-                {
-                    Macaroon = connString.Macaroon,
-                    MacaroonFilePath = connString.MacaroonFilePath,
-                    CertificateThumbprint = connString.CertificateThumbprint,
-                    AllowInsecure = connString.AllowInsecure,
-                }));
+                return new CLightningRPCClient(uri.ToUri(false), network.NBitcoinNetwork);
             }
             else
-                throw new NotSupportedException($"Unsupported connection string for lightning server ({connString.ConnectionType})");
-        }
-
-        public static ILightningInvoiceClient CreateClient(string connectionString, Network network)
-        {
-            if (!Payments.Lightning.LightningConnectionString.TryParse(connectionString, false, out var conn, out string error))
-                throw new FormatException($"Invalid format ({error})");
-            return Payments.Lightning.LightningClientFactory.CreateClient(conn, network);
+                throw new NotSupportedException($"Unsupported connection string for lightning server ({uri.ConnectionType})");
         }
     }
 }

BTCPayServer/Payments/Lightning/LightningConnectionString.cs

@@ -1,298 +1,25 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Extensions.Primitives;
-using NBitcoin.DataEncoders;
 
 namespace BTCPayServer.Payments.Lightning
 {
     public enum LightningConnectionType
     {
         Charge,
-        CLightning,
-        LndREST,
-        LndGRPC
+        CLightning
     }
     public class LightningConnectionString
     {
-        static Dictionary<string, LightningConnectionType> typeMapping;
-        static Dictionary<LightningConnectionType, string> typeMappingReverse;
-        static LightningConnectionString()
+        public static bool TryParse(string str, out LightningConnectionString connectionString)
         {
-            typeMapping = new Dictionary<string, LightningConnectionType>();
-            typeMapping.Add("clightning", LightningConnectionType.CLightning);
-            typeMapping.Add("charge", LightningConnectionType.Charge);
-            typeMapping.Add("lnd-rest", LightningConnectionType.LndREST);
-            typeMapping.Add("lnd-grpc", LightningConnectionType.LndGRPC);
-            typeMappingReverse = new Dictionary<LightningConnectionType, string>();
-            foreach (var kv in typeMapping)
-            {
-                typeMappingReverse.Add(kv.Value, kv.Key);
-            }
+            return TryParse(str, out connectionString, out var error);
         }
-        public static bool TryParse(string str, bool supportLegacy, out LightningConnectionString connectionString)
-        {
-            return TryParse(str, supportLegacy, out connectionString, out var error);
-        }
-        public static bool TryParse(string str, bool supportLegacy, out LightningConnectionString connectionString, out string error)
+        public static bool TryParse(string str, out LightningConnectionString connectionString, out string error)
         {
             if (str == null)
                 throw new ArgumentNullException(nameof(str));
-
-            if (supportLegacy)
-            {
-                var parsed = TryParseLegacy(str, out connectionString, out error);
-                if (!parsed)
-                {
-                    parsed = TryParseNewFormat(str, out connectionString, out error);
-                }
-                return parsed;
-            }
-            else
-            {
-                return TryParseNewFormat(str, out connectionString, out error);
-            }
-        }
-
-        private static bool TryParseNewFormat(string str, out LightningConnectionString connectionString, out string error)
-        {
-            connectionString = null;
-            error = null;
-            var parts = str.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
-            Dictionary<string, string> keyValues = new Dictionary<string, string>();
-            foreach (var part in parts.Select(p => p.Trim()))
-            {
-                var idx = part.IndexOf('=', StringComparison.OrdinalIgnoreCase);
-                if (idx == -1)
-                {
-                    error = "The format of the connectionString should a list of key=value delimited by semicolon";
-                    return false;
-                }
-                var key = part.Substring(0, idx).Trim().ToLowerInvariant();
-                var value = part.Substring(idx + 1).Trim();
-                if (keyValues.ContainsKey(key))
-                {
-                    error = $"Duplicate key {key}";
-                    return false;
-                }
-                keyValues.Add(key, value);
-            }
-
-            var possibleTypes = String.Join(", ", typeMapping.Select(k => k.Key).ToArray());
-
-            LightningConnectionString result = new LightningConnectionString();
-            var type = Take(keyValues, "type");
-            if (type == null)
-            {
-                error = $"The key 'type' is mandatory, possible values are {possibleTypes}";
-                return false;
-            }
-
-            if (!typeMapping.TryGetValue(type.ToLowerInvariant(), out var connectionType))
-            {
-                error = $"The key 'type' is invalid, possible values are {possibleTypes}";
-                return false;
-            }
-
-            result.ConnectionType = connectionType;
-
-            switch (connectionType)
-            {
-                case LightningConnectionType.Charge:
-                    {
-                        var server = Take(keyValues, "server");
-                        if (server == null)
-                        {
-                            error = $"The key 'server' is mandatory for charge connection strings";
-                            return false;
-                        }
-
-                        if (!Uri.TryCreate(server, UriKind.Absolute, out var uri)
-                            || (uri.Scheme != "http" && uri.Scheme != "https"))
-                        {
-                            error = $"The key 'server' should be an URI starting by http:// or https://";
-                            return false;
-                        }
-
-                        parts = uri.UserInfo.Split(':');
-                        if (!string.IsNullOrEmpty(uri.UserInfo) && parts.Length == 2)
-                        {
-                            result.Username = parts[0];
-                            result.Password = parts[1];
-                        }
-                        else
-                        {
-                            var apiToken = Take(keyValues, "api-token");
-                            if (apiToken == null)
-                            {
-                                error = "The key 'api-token' is not found";
-                                return false;
-                            }
-                            result.Username = "api-token";
-                            result.Password = apiToken;
-                        }
-                        result.BaseUri = new UriBuilder(uri) { UserName = "", Password = "" }.Uri;
-                    }
-                    break;
-                case LightningConnectionType.CLightning:
-                    {
-                        var server = Take(keyValues, "server");
-                        if (server == null)
-                        {
-                            error = $"The key 'server' is mandatory for charge connection strings";
-                            return false;
-                        }
-
-                        if (server.StartsWith("//", StringComparison.OrdinalIgnoreCase))
-                            server = "unix:" + str;
-                        else if (server.StartsWith("/", StringComparison.OrdinalIgnoreCase))
-                            server = "unix:/" + str;
-
-                        if (!Uri.TryCreate(server, UriKind.Absolute, out var uri)
-                            || (uri.Scheme != "tcp" && uri.Scheme != "unix"))
-                        {
-                            error = $"The key 'server' should be an URI starting by tcp:// or unix:// or a path to the 'lightning-rpc' unix socket";
-                            return false;
-                        }
-                        result.BaseUri = uri;
-                    }
-                    break;
-                case LightningConnectionType.LndREST:
-                case LightningConnectionType.LndGRPC:
-                    {
-                        var server = Take(keyValues, "server");
-                        if (server == null)
-                        {
-                            error = $"The key 'server' is mandatory for lnd connection strings";
-                            return false;
-                        }
-                        if (!Uri.TryCreate(server, UriKind.Absolute, out var uri)
-                            || (uri.Scheme != "http" && uri.Scheme != "https"))
-                        {
-                            error = $"The key 'server' should be an URI starting by http:// or https://";
-                            return false;
-                        }
-                        parts = uri.UserInfo.Split(':');
-                        if (!string.IsNullOrEmpty(uri.UserInfo) && parts.Length == 2)
-                        {
-                            result.Username = parts[0];
-                            result.Password = parts[1];
-                        }
-                        result.BaseUri = new UriBuilder(uri) { UserName = "", Password = "" }.Uri;
-
-                        var macaroon = Take(keyValues, "macaroon");
-                        if (macaroon != null)
-                        {
-                            try
-                            {
-                                result.Macaroon = Encoder.DecodeData(macaroon);
-                            }
-                            catch
-                            {
-                                error = $"The key 'macaroon' format should be in hex";
-                                return false;
-                            }
-                        }
-
-                        var macaroonFilePath = Take(keyValues, "macaroonfilepath");
-                        if (macaroonFilePath != null)
-                        {
-                            if (macaroon != null)
-                            {
-                                error = $"The key 'macaroon' is already specified";
-                                return false;
-                            }
-                            if (!macaroonFilePath.EndsWith(".macaroon", StringComparison.OrdinalIgnoreCase))
-                            {
-                                error = $"The key 'macaroonfilepath' should point to a .macaroon file";
-                                return false;
-                            }
-                            result.MacaroonFilePath = macaroonFilePath;
-                        }
-
-                        string securitySet = null;
-                        var certthumbprint = Take(keyValues, "certthumbprint");
-                        if (certthumbprint != null)
-                        {
-                            try
-                            {
-                                var bytes = Encoders.Hex.DecodeData(certthumbprint.Replace(":", string.Empty, StringComparison.OrdinalIgnoreCase));
-                                if (bytes.Length != 32)
-                                {
-                                    error = $"The key 'certthumbprint' has invalid length: it should be the SHA256 of the PEM format of the certificate (32 bytes)";
-                                    return false;
-                                }
-                                result.CertificateThumbprint = bytes;
-                            }
-                            catch
-                            {
-                                error = $"The key 'certthumbprint' has invalid format: it should be the SHA256 of the PEM format of the certificate";
-                                return false;
-                            }
-                            securitySet = "certthumbprint";
-                        }
-
-                        var allowinsecureStr = Take(keyValues, "allowinsecure");
-
-                        if (allowinsecureStr != null)
-                        {
-                            var allowedValues = new[] { "true", "false" };
-                            if (!allowedValues.Any(v => v.Equals(allowinsecureStr, StringComparison.OrdinalIgnoreCase)))
-                            {
-                                error = $"The key 'allowinsecure' should be true or false";
-                                return false;
-                            }
-
-                            bool allowInsecure = allowinsecureStr.Equals("true", StringComparison.OrdinalIgnoreCase);
-                            if (securitySet != null && allowInsecure)
-                            {
-                                error = $"The key 'allowinsecure' conflict with '{securitySet}'";
-                                return false;
-                            }
-                            result.AllowInsecure = allowInsecure;
-                        }
-
-                        if (!result.AllowInsecure && result.BaseUri.Scheme == "http")
-                        {
-                            error = $"The key 'allowinsecure' is false, but server's Uri is not using https";
-                            return false;
-                        }
-                    }
-                    break;
-                default:
-                    throw new NotSupportedException(connectionType.ToString());
-            }
-
-            if (keyValues.Count != 0)
-            {
-                error = $"Unknown keys ({String.Join(", ", keyValues.Select(k => k.Key).ToArray())})";
-                return false;
-            }
-
-            connectionString = result;
-            return true;
-        }
-
-        public LightningConnectionString Clone()
-        {
-            LightningConnectionString.TryParse(this.ToString(), false, out var result);
-            return result;
-        }
-
-        private static string Take(Dictionary<string, string> keyValues, string key)
-        {
-            if (keyValues.TryGetValue(key, out var v))
-                keyValues.Remove(key);
-            return v;
-        }
-
-        private static bool TryParseLegacy(string str, out LightningConnectionString connectionString, out string error)
-        {
             if (str.StartsWith('/'))
                 str = "unix:" + str;
             var result = new LightningConnectionString();
@@ -300,7 +27,7 @@ namespace BTCPayServer.Payments.Lightning
             error = null;
 
             Uri uri;
-            if (!Uri.TryCreate(str, UriKind.Absolute, out uri))
+            if (!System.Uri.TryCreate(str, UriKind.Absolute, out uri))
             {
                 error = "Invalid URL";
                 return false;
@@ -313,6 +40,7 @@ namespace BTCPayServer.Payments.Lightning
                 error = $"The url support the following protocols {protocols}";
                 return false;
             }
+
             if (uri.Scheme == "unix")
             {
                 str = uri.AbsoluteUri.Substring("unix:".Length);
@@ -321,12 +49,8 @@ namespace BTCPayServer.Payments.Lightning
                     str = str.Substring(1);
                 }
                 uri = new Uri("unix://" + str, UriKind.Absolute);
-                result.ConnectionType = LightningConnectionType.CLightning;
             }
 
-            if (uri.Scheme == "tcp")
-                result.ConnectionType = LightningConnectionType.CLightning;
-
             if (uri.Scheme == "http" || uri.Scheme == "https")
             {
                 var parts = uri.UserInfo.Split(':');
@@ -337,7 +61,6 @@ namespace BTCPayServer.Payments.Lightning
                 }
                 result.Username = parts[0];
                 result.Password = parts[1];
-                result.ConnectionType = LightningConnectionType.Charge;
             }
             else if (!string.IsNullOrEmpty(uri.UserInfo))
             {
@@ -345,7 +68,6 @@ namespace BTCPayServer.Payments.Lightning
                 return false;
             }
             result.BaseUri = new UriBuilder(uri) { UserName = "", Password = "" }.Uri;
-            result.IsLegacy = true;
             connectionString = result;
             return true;
         }
@@ -358,17 +80,15 @@ namespace BTCPayServer.Payments.Lightning
         public string Username { get; set; }
         public string Password { get; set; }
         public Uri BaseUri { get; set; }
-        public bool IsLegacy { get; private set; }
 
         public LightningConnectionType ConnectionType
         {
-            get;
-            set;
+            get
+            {
+                return BaseUri.Scheme == "http" || BaseUri.Scheme == "https" ? LightningConnectionType.Charge 
+                    : LightningConnectionType.CLightning;
+            }
         }
-        public byte[] Macaroon { get; set; }
-        public string MacaroonFilePath { get; set; }
-        public byte[] CertificateThumbprint { get; set; }
-        public bool AllowInsecure { get; set; }
 
         public Uri ToUri(bool withCredentials)
         {
@@ -381,58 +101,10 @@ namespace BTCPayServer.Payments.Lightning
                 return BaseUri;
             }
         }
-        static NBitcoin.DataEncoders.DataEncoder Encoder = NBitcoin.DataEncoders.Encoders.Hex;
+
         public override string ToString()
         {
-            var type = typeMappingReverse[ConnectionType];
-            StringBuilder builder = new StringBuilder();
-            builder.Append($"type={type}");
-            switch (ConnectionType)
-            {
-                case LightningConnectionType.Charge:
-                    if (Username == null || Username == "api-token")
-                    {
-                        builder.Append($";server={BaseUri};api-token={Password}");
-                    }
-                    else
-                    {
-                        builder.Append($";server={ToUri(true)}");
-                    }
-                    break;
-                case LightningConnectionType.CLightning:
-                    builder.Append($";server={BaseUri}");
-                    break;
-                case LightningConnectionType.LndREST:
-                case LightningConnectionType.LndGRPC:
-                    if (Username == null)
-                    {
-                        builder.Append($";server={BaseUri}");
-                    }
-                    else
-                    {
-                        builder.Append($";server={ToUri(true)}");
-                    }
-                    if (Macaroon != null)
-                    {
-                        builder.Append($";macaroon={Encoder.EncodeData(Macaroon)}");
-                    }
-                    if (MacaroonFilePath != null)
-                    {
-                        builder.Append($";macaroonfilepath={MacaroonFilePath}");
-                    }
-                    if (CertificateThumbprint != null)
-                    {
-                        builder.Append($";certthumbprint={Encoders.Hex.EncodeData(CertificateThumbprint)}");
-                    }
-                    if (AllowInsecure)
-                    {
-                        builder.Append($";allowinsecure=true");
-                    }
-                    break;
-                default:
-                    throw new NotSupportedException(type);
-            }
-            return builder.ToString();
+            return ToUri(true).AbsoluteUri;
         }
     }
 }

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -15,8 +15,6 @@ namespace BTCPayServer.Payments.Lightning
 {
     public class LightningLikePaymentHandler : PaymentMethodHandlerBase<LightningSupportedPaymentMethod>
     {
-        public static int LIGHTNING_TIMEOUT = 5000;
-
         NBXplorerDashboard _Dashboard;
         LightningClientFactory _LightningClientFactory;
         public LightningLikePaymentHandler(
@@ -43,7 +41,7 @@ namespace BTCPayServer.Payments.Lightning
             description = description.Replace("{StoreName}", store.StoreName ?? "", StringComparison.OrdinalIgnoreCase)
                                      .Replace("{ItemDescription}", invoice.ProductInformation.ItemDesc ?? "", StringComparison.OrdinalIgnoreCase)
                                      .Replace("{OrderId}", invoice.OrderId ?? "", StringComparison.OrdinalIgnoreCase);
-            using (var cts = new CancellationTokenSource(LIGHTNING_TIMEOUT))
+            using (var cts = new CancellationTokenSource(5000))
             {
                 try
                 {
@@ -72,7 +70,7 @@ namespace BTCPayServer.Payments.Lightning
             if (!_Dashboard.IsFullySynched(network.CryptoCode, out var summary))
                 throw new PaymentMethodUnavailableException($"Full node not available");
 
-            using (var cts = new CancellationTokenSource(LIGHTNING_TIMEOUT))
+            using (var cts = new CancellationTokenSource(5000))
             {
                 var client = _LightningClientFactory.CreateClient(supportedPaymentMethod, network);
                 LightningNodeInformation info = null;
@@ -123,7 +121,7 @@ namespace BTCPayServer.Payments.Lightning
 
                 using (var tcp = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp))
                 {
-                    await tcp.ConnectAsync(new IPEndPoint(address, nodeInfo.Port)).WithCancellation(cancellation);
+                    await WithTimeout(tcp.ConnectAsync(new IPEndPoint(address, nodeInfo.Port)), cancellation);
                 }
             }
             catch (Exception ex)
@@ -131,5 +129,15 @@ namespace BTCPayServer.Payments.Lightning
                 throw new PaymentMethodUnavailableException($"Error while connecting to the lightning node via {nodeInfo.Host}:{nodeInfo.Port} ({ex.Message})");
             }
         }
+
+        static Task WithTimeout(Task task, CancellationToken token)
+        {
+            TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+            var registration = token.Register(() => { try { tcs.TrySetResult(true); } catch { } });
+#pragma warning disable CA2008 // Do not create tasks without passing a TaskScheduler
+            var timeoutTask = tcs.Task;
+#pragma warning restore CA2008 // Do not create tasks without passing a TaskScheduler
+            return Task.WhenAny(task, timeoutTask).Unwrap().ContinueWith(t => registration.Dispose(), TaskScheduler.Default);
+        }
     }
 }

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -46,7 +46,7 @@ namespace BTCPayServer.Payments.Lightning
             {
                 if (inv.Name == "invoice_created")
                 {
-                    await EnsureListening(inv.Invoice.Id, false);
+                    await EnsureListening(inv.InvoiceId, false);
                 }
             }));
 
@@ -143,12 +143,11 @@ namespace BTCPayServer.Payments.Lightning
         CancellationTokenSource _Cts = new CancellationTokenSource();
         private async Task Listen(LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
         {
-            ILightningListenInvoiceSession session = null;
             try
             {
                 Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Start listening {supportedPaymentMethod.GetLightningUrl().BaseUri}");
-                var lightningClient = _LightningClientFactory.CreateClient(supportedPaymentMethod, network);
-                session = await lightningClient.Listen(_Cts.Token);
+                var charge = _LightningClientFactory.CreateClient(supportedPaymentMethod, network);
+                var session = await charge.Listen(_Cts.Token);
                 while (true)
                 {
                     var notification = await session.WaitInvoice(_Cts.Token);
@@ -180,10 +179,6 @@ namespace BTCPayServer.Payments.Lightning
                 Logs.PayServer.LogError(ex, $"{supportedPaymentMethod.CryptoCode} (Lightning): Error while contacting {supportedPaymentMethod.GetLightningUrl().BaseUri}");
                 DoneListening(supportedPaymentMethod.GetLightningUrl());
             }
-            finally
-            {
-                session?.Dispose();
-            }
             Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Stop listening {supportedPaymentMethod.GetLightningUrl().BaseUri}");
         }
 
@@ -194,12 +189,8 @@ namespace BTCPayServer.Payments.Lightning
                 BOLT11 = notification.BOLT11,
                 Amount = notification.Amount
             }, network.CryptoCode, accounted: true);
-            if (payment != null)
-            {
-                var invoice = await _InvoiceRepository.GetInvoice(null, listenedInvoice.InvoiceId);
-                if(invoice != null)
-                    _Aggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1002, "invoice_receivedPayment"));
-            }
+            if(payment != null)
+                _Aggregator.Publish(new InvoiceEvent(listenedInvoice.InvoiceId, 1002, "invoice_receivedPayment"));
         }
 
         List<Task> _ListeningLightning = new List<Task>();

BTCPayServer/Payments/Lightning/LightningSupportedPaymentMethod.cs

@@ -8,41 +8,18 @@ namespace BTCPayServer.Payments.Lightning
     public class LightningSupportedPaymentMethod : ISupportedPaymentMethod
     {
         public string CryptoCode { get; set; }
-
-        [Obsolete("Use Get/SetLightningUrl")]
-        public string Username { get; set; }
-        [Obsolete("Use Get/SetLightningUrl")]
-        public string Password { get; set; }
-
-        // This property MUST be after CryptoCode or else JSON serialization fails
-        public PaymentMethodId PaymentId => new PaymentMethodId(CryptoCode, PaymentTypes.LightningLike);
-
         [Obsolete("Use Get/SetLightningUrl")]
         public string LightningChargeUrl { get; set; }
 
-        [Obsolete("Use Get/SetLightningUrl")]
-        public string LightningConnectionString { get; set; }
-
         public LightningConnectionString GetLightningUrl()
         {
 #pragma warning disable CS0618 // Type or member is obsolete
-            if (!string.IsNullOrEmpty(LightningConnectionString))
+            var fullUri = new UriBuilder(LightningChargeUrl) { UserName = Username, Password = Password }.Uri.AbsoluteUri;
+            if(!LightningConnectionString.TryParse(fullUri, out var connectionString, out var error))
             {
-                if (!BTCPayServer.Payments.Lightning.LightningConnectionString.TryParse(LightningConnectionString, false, out var connectionString, out var error))
-                {
-                    throw new FormatException(error);
-                }
-                return connectionString;
-            }
-            else
-            {
-                var fullUri = new UriBuilder(LightningChargeUrl) { UserName = Username, Password = Password }.Uri.AbsoluteUri;
-                if (!BTCPayServer.Payments.Lightning.LightningConnectionString.TryParse(fullUri, true, out var connectionString, out var error))
-                {
-                    throw new FormatException(error);
-                }
-                return connectionString;
+                throw new FormatException(error);
             }
+            return connectionString;
 #pragma warning restore CS0618 // Type or member is obsolete
         }
 
@@ -52,11 +29,16 @@ namespace BTCPayServer.Payments.Lightning
                 throw new ArgumentNullException(nameof(connectionString));
 
 #pragma warning disable CS0618 // Type or member is obsolete
-            LightningConnectionString = connectionString.ToString();
-            Username = null;
-            Password = null;
-            LightningChargeUrl = null;
+            Username = connectionString.Username;
+            Password = connectionString.Password;
+            LightningChargeUrl = connectionString.BaseUri.AbsoluteUri;
 #pragma warning restore CS0618 // Type or member is obsolete
         }
+
+        [Obsolete("Use Get/SetLightningUrl")]
+        public string Username { get; set; }
+        [Obsolete("Use Get/SetLightningUrl")]
+        public string Password { get; set; }
+        public PaymentMethodId PaymentId => new PaymentMethodId(CryptoCode, PaymentTypes.LightningLike);
     }
 }

BTCPayServer/Payments/Lightning/Lnd/LndAuthentication.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using NBitcoin.DataEncoders;
-
-namespace BTCPayServer.Payments.Lightning.Lnd
-{
-    public abstract class LndAuthentication
-    {
-        public class FixedMacaroonAuthentication : LndAuthentication
-        {
-            public FixedMacaroonAuthentication(byte[] macaroon)
-            {
-                if (macaroon == null)
-                    throw new ArgumentNullException(nameof(macaroon));
-                Macaroon = macaroon;
-            }
-            public byte[] Macaroon { get; set; }
-            public override void AddAuthentication(HttpRequestMessage httpRequest)
-            {
-                httpRequest.Headers.Add("Grpc-Metadata-macaroon", Encoders.Hex.EncodeData(Macaroon));
-            }
-        }
-        public class NullAuthentication : LndAuthentication
-        {
-            public static NullAuthentication Instance { get; } = new NullAuthentication();
-
-            private NullAuthentication()
-            {
-
-            }
-            public override void AddAuthentication(HttpRequestMessage httpRequest)
-            {
-            }
-        }
-
-        public class MacaroonFileAuthentication : LndAuthentication
-        {
-            public MacaroonFileAuthentication(string filePath)
-            {
-                if (filePath == null)
-                    throw new ArgumentNullException(nameof(filePath));
-                // Because this dump the whole file, let's make sure it is indeed the macaroon
-                if (!filePath.EndsWith(".macaroon", StringComparison.OrdinalIgnoreCase))
-                    throw new ArgumentException(message: "filePath is not a macaroon file", paramName: nameof(filePath));
-                FilePath = filePath;
-            }
-            public string FilePath { get; set; }
-            public override void AddAuthentication(HttpRequestMessage httpRequest)
-            {
-                try
-                {
-                    var bytes = File.ReadAllBytes(FilePath);
-                    httpRequest.Headers.Add("Grpc-Metadata-macaroon", Encoders.Hex.EncodeData(bytes));
-                }
-                catch
-                {
-                }
-            }
-        }
-
-        public abstract void AddAuthentication(HttpRequestMessage httpRequest);
-    }
-}

BTCPayServer/Payments/Lightning/Lnd/LndInvoiceClient.cs

@@ -1,279 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Net.Security;
-using System.Runtime.ExceptionServices;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using NBitcoin;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Payments.Lightning.Lnd
-{
-    public class LndInvoiceClient : ILightningInvoiceClient
-    {
-        class LndInvoiceClientSession : ILightningListenInvoiceSession
-        {
-            private LndSwaggerClient _Parent;
-            Channel<LightningInvoice> _Invoices = Channel.CreateBounded<LightningInvoice>(50);
-            CancellationTokenSource _Cts = new CancellationTokenSource();
-
-
-            HttpClient _Client;
-            HttpResponseMessage _Response;
-            Stream _Body;
-            StreamReader _Reader;
-            Task _ListenLoop;
-
-            public LndInvoiceClientSession(LndSwaggerClient parent)
-            {
-                _Parent = parent;
-            }
-
-            public Task StartListening()
-            {
-                try
-                {
-                    _Client = _Parent.CreateHttpClient();
-                    _Client.Timeout = TimeSpan.FromMilliseconds(Timeout.Infinite);
-                    var request = new HttpRequestMessage(HttpMethod.Get, _Parent.BaseUrl.WithTrailingSlash() + "v1/invoices/subscribe");
-                    _Parent._Authentication.AddAuthentication(request);
-                    _ListenLoop = ListenLoop(request);
-                }
-                catch
-                {
-                    Dispose();
-                }
-                return Task.CompletedTask;
-            }
-
-            private async Task ListenLoop(HttpRequestMessage request)
-            {
-                try
-                {
-                    _Response = await _Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, _Cts.Token);
-                    _Body = await _Response.Content.ReadAsStreamAsync();
-                    _Reader = new StreamReader(_Body);
-                    while (!_Cts.IsCancellationRequested)
-                    {
-                        string line = await _Reader.ReadLineAsync().WithCancellation(_Cts.Token);
-                        if (line != null)
-                        {
-                            if (line.StartsWith("{\"result\":", StringComparison.OrdinalIgnoreCase))
-                            {
-                                var invoiceString = JObject.Parse(line)["result"].ToString();
-                                LnrpcInvoice parsedInvoice = _Parent.Deserialize<LnrpcInvoice>(invoiceString);
-                                await _Invoices.Writer.WriteAsync(ConvertLndInvoice(parsedInvoice), _Cts.Token);
-                            }
-                            else if (line.StartsWith("{\"error\":", StringComparison.OrdinalIgnoreCase))
-                            {
-                                var errorString = JObject.Parse(line)["error"].ToString();
-                                var error = _Parent.Deserialize<LndError>(errorString);
-                                throw new LndException(error);
-                            }
-                            else
-                            {
-                                throw new LndException("Unknown result from LND: " + line);
-                            }
-                        }
-                    }
-                }
-                catch when (_Cts.IsCancellationRequested)
-                {
-
-                }
-                catch (Exception ex)
-                {
-                    _Invoices.Writer.TryComplete(ex);
-                }
-                finally
-                {
-                    Dispose(false);
-                }
-            }
-            public async Task<LightningInvoice> WaitInvoice(CancellationToken cancellation)
-            {
-                try
-                {
-                    return await _Invoices.Reader.ReadAsync(cancellation);
-                }
-                catch (ChannelClosedException ex) when (ex.InnerException == null)
-                {
-                    throw new TaskCanceledException();
-                }
-                catch (ChannelClosedException ex)
-                {
-                    ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
-                    throw;
-                }
-            }
-
-            public void Dispose()
-            {
-                Dispose(true);
-            }
-            void Dispose(bool waitLoop)
-            {
-                if (_Cts.IsCancellationRequested)
-                    return;
-                _Cts.Cancel();
-                _Reader?.Dispose();
-                _Reader = null;
-                _Body?.Dispose();
-                _Body = null;
-                _Response?.Dispose();
-                _Response = null;
-                _Client?.Dispose();
-                _Client = null;
-                if (waitLoop)
-                    _ListenLoop?.Wait();
-                _Invoices.Writer.TryComplete();
-            }
-        }
-
-
-        public LndSwaggerClient _rpcClient;
-
-        public LndInvoiceClient(LndSwaggerClient swaggerClient)
-        {
-            if (swaggerClient == null)
-                throw new ArgumentNullException(nameof(swaggerClient));
-            _rpcClient = swaggerClient;
-        }
-
-        public async Task<LightningInvoice> CreateInvoice(LightMoney amount, string description, TimeSpan expiry,
-            CancellationToken cancellation = default(CancellationToken))
-        {
-            var strAmount = ConvertInv.ToString(amount.ToUnit(LightMoneyUnit.Satoshi));
-            var strExpiry = ConvertInv.ToString(Math.Round(expiry.TotalSeconds, 0));
-            // lnd requires numbers sent as strings. don't ask
-            var resp = await _rpcClient.AddInvoiceAsync(new LnrpcInvoice
-            {
-                Value = strAmount,
-                Memo = description,
-                Expiry = strExpiry
-            });
-
-            var invoice = new LightningInvoice
-            {
-                Id = BitString(resp.R_hash),
-                Amount = amount,
-                BOLT11 = resp.Payment_request,
-                Status = "unpaid"
-            };
-            return invoice;
-        }
-
-        public async Task<LightningNodeInformation> GetInfo(CancellationToken cancellation = default(CancellationToken))
-        {
-            var resp = await _rpcClient.GetInfoAsync(cancellation);
-
-            var nodeInfo = new LightningNodeInformation
-            {
-                BlockHeight = (int?)resp.Block_height ?? 0,
-                NodeId = resp.Identity_pubkey
-            };
-
-            try
-            {
-                var node = await _rpcClient.GetNodeInfoAsync(resp.Identity_pubkey, cancellation);
-                if (node.Node.Addresses == null || node.Node.Addresses.Count == 0)
-                    throw new Exception("Lnd External IP not set, make sure you use --externalip=$EXTERNALIP parameter on lnd");
-
-                var firstNodeInfo = node.Node.Addresses.First();
-                var externalHostPort = firstNodeInfo.Addr.Split(':');
-
-                nodeInfo.Address = externalHostPort[0];
-                nodeInfo.P2PPort = ConvertInv.ToInt32(externalHostPort[1]);
-
-                return nodeInfo;
-            }
-            catch (SwaggerException ex) when (!string.IsNullOrEmpty(ex.Response))
-            {
-                throw new Exception("LND threw an error: " + ex.Response);
-            }
-        }
-
-        public async Task<LightningInvoice> GetInvoice(string invoiceId, CancellationToken cancellation = default(CancellationToken))
-        {
-            var resp = await _rpcClient.LookupInvoiceAsync(invoiceId, null, cancellation);
-            return ConvertLndInvoice(resp);
-        }
-
-        public async Task<ILightningListenInvoiceSession> Listen(CancellationToken cancellation = default(CancellationToken))
-        {
-            var session = new LndInvoiceClientSession(this._rpcClient);
-            await session.StartListening();
-            return session;
-        }
-
-        internal static LightningInvoice ConvertLndInvoice(LnrpcInvoice resp)
-        {
-            var invoice = new LightningInvoice
-            {
-                // TODO: Verify id corresponds to R_hash
-                Id = BitString(resp.R_hash),
-                Amount = new LightMoney(ConvertInv.ToInt64(resp.Value), LightMoneyUnit.Satoshi),
-                BOLT11 = resp.Payment_request,
-                Status = "unpaid"
-            };
-
-            if (resp.Settle_date != null)
-            {
-                invoice.PaidAt = DateTimeOffset.FromUnixTimeSeconds(ConvertInv.ToInt64(resp.Settle_date));
-                invoice.Status = "paid";
-            }
-            else
-            {
-                var invoiceExpiry = ConvertInv.ToInt64(resp.Creation_date) + ConvertInv.ToInt64(resp.Expiry);
-                if (DateTimeOffset.FromUnixTimeSeconds(invoiceExpiry) > DateTimeOffset.UtcNow)
-                {
-                    invoice.Status = "expired";
-                }
-            }
-            return invoice;
-        }
-
-
-        // utility static methods... maybe move to separate class
-        private static string BitString(byte[] bytes)
-        {
-            return BitConverter.ToString(bytes)
-                .Replace("-", "", StringComparison.InvariantCulture)
-                .ToLower(CultureInfo.InvariantCulture);
-        }
-
-        // Invariant culture conversion
-        public static class ConvertInv
-        {
-            public static int ToInt32(string str)
-            {
-                return Convert.ToInt32(str, CultureInfo.InvariantCulture.NumberFormat);
-            }
-
-            public static long ToInt64(string str)
-            {
-                return Convert.ToInt64(str, CultureInfo.InvariantCulture.NumberFormat);
-            }
-
-            public static string ToString(decimal d)
-            {
-                return d.ToString(CultureInfo.InvariantCulture);
-            }
-
-            public static string ToString(double d)
-            {
-                return d.ToString(CultureInfo.InvariantCulture);
-            }
-        }
-    }
-}

BTCPayServer/Payments/Lightning/Lnd/LndRestSettings.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Payments.Lightning.Lnd
-{
-    public class LndRestSettings
-    {
-        public LndRestSettings()
-        {
-
-        }
-        public LndRestSettings(Uri uri)
-        {
-            Uri = uri;
-        }
-        public Uri Uri { get; set; }
-        /// <summary>
-        /// The SHA256 of the PEM certificate
-        /// </summary>
-        public byte[] CertificateThumbprint { get; set; }
-        public byte[] Macaroon { get; set; }
-        public bool AllowInsecure { get; set; }
-        public string MacaroonFilePath { get; set; }
-
-        public LndAuthentication CreateLndAuthentication()
-        {
-            if (Macaroon != null)
-                return new LndAuthentication.FixedMacaroonAuthentication(Macaroon);
-            if (!string.IsNullOrEmpty(MacaroonFilePath))
-                return new LndAuthentication.MacaroonFileAuthentication(MacaroonFilePath);
-            return LndAuthentication.NullAuthentication.Instance;
-        }
-    }
-}

BTCPayServer/Payments/Lightning/Lnd/LndSwaggerClient.partial.cs

@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Security;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using NBitcoin.DataEncoders;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Payments.Lightning.Lnd
-{
-    public class LndException : Exception
-    {
-        public LndException(string message) : base(message)
-        {
-
-        }
-        public LndException(LndError error) : base(error.Message)
-        {
-            if (error == null)
-                throw new ArgumentNullException(nameof(error));
-            _Error = error;
-        }
-
-
-        private readonly LndError _Error;
-        public LndError Error
-        {
-            get
-            {
-                return _Error;
-            }
-        }
-    }
-    // {"grpc_code":2,"http_code":500,"message":"rpc error: code = Unknown desc = expected 1 macaroon, got 0","http_status":"Internal Server Error"}
-    public class LndError
-    {
-        [JsonProperty("grpc_code")]
-        public int GRPCCode { get; set; }
-        [JsonProperty("http_code")]
-        public int HttpCode { get; set; }
-        [JsonProperty("message")]
-        public string Message { get; set; }
-        [JsonProperty("http_status")]
-        public string HttpStatus { get; set; }
-    }
-    public partial class LndSwaggerClient
-    {
-        public LndSwaggerClient(LndRestSettings settings)
-        {
-            if (settings == null)
-                throw new ArgumentNullException(nameof(settings));
-            _LndSettings = settings;
-            _Authentication = settings.CreateLndAuthentication();
-            BaseUrl = settings.Uri.AbsoluteUri.TrimEnd('/');
-            _httpClient = CreateHttpClient(settings);
-            _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(() =>
-            {
-                var json = new Newtonsoft.Json.JsonSerializerSettings();
-                UpdateJsonSerializerSettings(json);
-                return json;
-            });
-        }
-        LndRestSettings _LndSettings;
-        internal LndAuthentication _Authentication;
-
-        partial void PrepareRequest(HttpClient client, HttpRequestMessage request, string url)
-        {
-            _Authentication.AddAuthentication(request);
-        }
-
-        internal static HttpClient CreateHttpClient(LndRestSettings settings)
-        {
-            var handler = new HttpClientHandler
-            {
-                SslProtocols = SslProtocols.Tls12
-            };
-
-            var expectedThumbprint = settings.CertificateThumbprint?.ToArray();
-            if (expectedThumbprint != null)
-            {
-                handler.ServerCertificateCustomValidationCallback = (request, cert, chain, errors) =>
-                {
-                    var actualCert = chain.ChainElements[chain.ChainElements.Count - 1].Certificate;
-                    var hash = actualCert.GetCertHash(System.Security.Cryptography.HashAlgorithmName.SHA256);
-                    return hash.SequenceEqual(expectedThumbprint);
-                };
-            }
-
-            if (settings.AllowInsecure)
-            {
-                handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
-            }
-            else
-            {
-                if (settings.Uri.Scheme == "http")
-                    throw new InvalidOperationException("AllowInsecure is set to false, but the URI is not using https");
-            }
-            return new HttpClient(handler);
-        }
-
-        internal HttpClient CreateHttpClient()
-        {
-            return LndSwaggerClient.CreateHttpClient(_LndSettings);
-        }
-
-        internal T Deserialize<T>(string str)
-        {
-            return JsonConvert.DeserializeObject<T>(str, _settings.Value);
-        }
-    }
-}