bump

Handling unlikely state transition from paid to invalid

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -1,14 +1,15 @@
-<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.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -129,19 +129,19 @@ namespace BTCPayServer.Tests
             {
                 Exchange = "coinaverage",
                 CurrencyPair = CurrencyPair.Parse("BTC_USD"),
-                Value = 5000m
+                BidAsk = new BidAsk(5000m)
             });
             coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
             {
                 Exchange = "coinaverage",
                 CurrencyPair = CurrencyPair.Parse("BTC_CAD"),
-                Value = 4500m
+                BidAsk = new BidAsk(4500m)
             });
             coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
             {
                 Exchange = "coinaverage",
                 CurrencyPair = CurrencyPair.Parse("LTC_USD"),
-                Value = 500m
+                BidAsk = new BidAsk(500m)
             });
             rateProvider.DirectProviders.Add("coinaverage", coinAverageMock);
         }

BTCPayServer.Tests/ChargeTester.cs

@@ -1,6 +1,7 @@
 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;
@@ -15,7 +16,7 @@ namespace BTCPayServer.Tests
         {
             this._Parent = serverTester;
             var url = serverTester.GetEnvironment(environmentName, defaultValue);
-            Client = new ChargeClient(new Uri(url), network);
+            Client = (ChargeClient)LightningClientFactory.CreateClient(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-rc1-sdk-alpine3.7
+FROM microsoft/dotnet:2.1.300-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

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,226 @@
+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;
+
+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();
+            var payResponse = await CustomerLnd.SendPaymentSyncAsync(new LnrpcSendRequest
+            {
+                Payment_request = merchantInvoice.BOLT11
+            });
+
+            var invoice = await InvoiceClient.GetInvoice(merchantInvoice.Id);
+
+            Assert.True(invoice.PaidAt.HasValue);
+        }
+
+
+        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,6 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using BTCPayServer.Rating;
 using Xunit;
+using System.Globalization;
 
 namespace BTCPayServer.Tests
 {
@@ -35,9 +36,9 @@ namespace BTCPayServer.Tests
                 rules.ToString());
             var tests = new[]
             {
+                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * gdax(BTC_USD) * 1.1"),
                 (Pair: "BTC_USD", Expected: "gdax(BTC_USD)"),
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)"),
-                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * gdax(BTC_USD) * 1.1"),
                 (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02"),
             };
@@ -81,9 +82,9 @@ namespace BTCPayServer.Tests
 
             var tests2 = new[]
             {
+                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * gdax(BTC_USD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),gdax(BTC_USD)"),
                 (Pair: "BTC_USD", Expected: "gdax(BTC_USD)", ExpectedExchangeRates: "gdax(BTC_USD)"),
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)", ExpectedExchangeRates: "coinbase(BTC_CAD)"),
-                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * gdax(BTC_USD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),gdax(BTC_USD)"),
                 (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),coinbase(BTC_CAD)"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02", ExpectedExchangeRates: "coinaverage(LTC_CAD)"),
             };
@@ -94,12 +95,12 @@ 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"), 5000);
+            rule2.ExchangeRates.SetRate("bittrex", CurrencyPair.Parse("DOGE_BTC"), new BidAsk(5000m));
             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"), 2000.4m);
+            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(2000.4m));
             rule2.Reevaluate();
             Assert.False(rule2.HasError);
             Assert.Equal("5000 * 2000.4 * 1.1", rule2.ToString(true));
@@ -116,7 +117,7 @@ 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"), 1000m);
+            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(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.Value.Value);
@@ -124,11 +125,55 @@ namespace BTCPayServer.Tests
             // 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"), 1000m);
+            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(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.Value.Value);
+            Assert.Equal((1.0m / (2000m * (-3m + 1000m + 50m - 5m))) * 1.1m, rule2.Value.Value);
             ////////
+
+            // Make sure kraken is not converted to CurrencyPair
+            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(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.Value.Value);
+            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.Value.Value);
+
+            // 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,6 +20,8 @@ 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
 {
@@ -47,10 +49,12 @@ 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 = 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);
+            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);
 
-            MerchantCharge = new ChargeTester(this, "TEST_MERCHANTCHARGE", "http://api-token:foiewnccewuify@127.0.0.1:54938/", "merchant_lightningd", btc);
+            MerchantCharge = new ChargeTester(this, "TEST_MERCHANTCHARGE", "type=charge;server=https://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);
 
             PayTester = new BTCPayServerTester(Path.Combine(_Directory, "pay"))
             {
@@ -78,41 +82,52 @@ namespace BTCPayServer.Tests
         /// <summary>
         /// Connect a customer LN node to the merchant LN node
         /// </summary>
-        public void PrepareLightning()
+        public void PrepareLightning(LightningConnectionType lndBackend)
         {
-            PrepareLightningAsync().GetAwaiter().GetResult();
+            ILightningInvoiceClient client = MerchantCharge.Client;
+            if (lndBackend == LightningConnectionType.LndREST)
+                client = MerchantLnd.Client;
+
+            PrepareLightningAsync(client).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>
-        public async Task PrepareLightningAsync()
+        private async Task PrepareLightningAsync(ILightningInvoiceClient client)
         {
             while (true)
             {
-                var skippedStates = new[] { "ONCHAIN", "CHANNELD_SHUTTING_DOWN", "CLOSINGD_SIGEXCHANGE", "CLOSINGD_COMPLETE", "FUNDING_SPEND_SEEN" };
-                var channel = (await CustomerLightningD.ListPeersAsync())
+                var merchantInfo = await WaitLNSynched(client, CustomerLightningD, MerchantLightningD);
+
+                var peers = await CustomerLightningD.ListPeersAsync();
+                var filteringToTargetedPeers = peers.Where(a => a.Id == merchantInfo.NodeId);
+                var channel = filteringToTargetedPeers
                             .SelectMany(p => p.Channels)
-                            .Where(c => !skippedStates.Contains(c.State ?? ""))
+                            .Where(c => !SKIPPED_STATES.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.2m));
+                        await ExplorerNode.SendToAddressAsync(address, Money.Coins(0.5m));
                         ExplorerNode.Generate(1);
-                        await WaitLNSynched();
+                        await WaitLNSynched(client, CustomerLightningD, MerchantLightningD);
                         await Task.Delay(1000);
-                        await CustomerLightningD.FundChannelAsync(clightning, Money.Satoshis(16777215));
+
+                        var merchantNodeInfo = new NodeInfo(merchantInfo.NodeId, merchantInfo.Address, merchantInfo.P2PPort);
+                        await CustomerLightningD.ConnectAsync(merchantNodeInfo);
+                        await CustomerLightningD.FundChannelAsync(merchantNodeInfo, Money.Satoshis(16777215));
                         break;
                     case "CHANNELD_AWAITING_LOCKIN":
                         ExplorerNode.Generate(1);
-                        await WaitLNSynched();
+                        await WaitLNSynched(client, CustomerLightningD, MerchantLightningD);
                         break;
                     case "CHANNELD_NORMAL":
                         return;
@@ -122,23 +137,29 @@ namespace BTCPayServer.Tests
             }
         }
 
-        private async Task<GetInfoResponse> WaitLNSynched()
+        private async Task<LightningNodeInformation> WaitLNSynched(params ILightningInvoiceClient[] clients)
         {
             while (true)
             {
-                var merchantInfo = await MerchantCharge.Client.GetInfoAsync();
                 var blockCount = await ExplorerNode.GetBlockCountAsync();
-                if (merchantInfo.BlockHeight != blockCount)
-                {
-                    await Task.Delay(1000);
-                }
-                else
-                {
-                    return merchantInfo;
-                }
+                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);
             }
         }
 
+        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();
@@ -152,8 +173,10 @@ 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)
         {
@@ -185,99 +208,6 @@ 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;

BTCPayServer.Tests/TestAccount.cs

@@ -117,7 +117,7 @@ namespace BTCPayServer.Tests
         {
             get; set;
         }
-        
+
         public void RegisterLightningNode(string cryptoCode, LightningConnectionType connectionType)
         {
             RegisterLightningNodeAsync(cryptoCode, connectionType).GetAwaiter().GetResult();
@@ -126,15 +126,24 @@ 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()
             {
-                Url = connectionType == LightningConnectionType.Charge ? parent.MerchantCharge.Client.Uri.AbsoluteUri :
-                      connectionType == LightningConnectionType.CLightning ? parent.MerchantLightningD.Address.AbsoluteUri
-                      : throw new NotSupportedException(connectionType.ToString()),
+                ConnectionString = connectionString,
                 SkipPortTest = true
             }, "save", "BTC");
             if (storeController.ModelState.ErrorCount != 0)
                 Assert.False(true, storeController.ModelState.FirstOrDefault().Value.Errors[0].ErrorMessage);
         }
-}
+    }
 }

BTCPayServer.Tests/UnitTest1.cs

@@ -36,7 +36,9 @@ using BTCPayServer.Services.Stores;
 using System.Net.Http;
 using System.Text;
 using BTCPayServer.Rating;
+using BTCPayServer.Validation;
 using ExchangeSharp;
+using System.Security.Cryptography.X509Certificates;
 
 namespace BTCPayServer.Tests
 {
@@ -48,6 +50,27 @@ namespace BTCPayServer.Tests
             Logs.LogProvider = new XUnitLogProvider(helper);
         }
 
+        [Fact]
+        public void CanHandleUriValidation()
+        {
+            var attribute = new UriAttribute();
+            Assert.True(attribute.IsValid("http://localhost"));
+            Assert.True(attribute.IsValid("http://localhost:1234"));
+            Assert.True(attribute.IsValid("https://localhost"));
+            Assert.True(attribute.IsValid("https://127.0.0.1"));
+            Assert.True(attribute.IsValid("http://127.0.0.1"));
+            Assert.True(attribute.IsValid("http://127.0.0.1:1234"));
+            Assert.True(attribute.IsValid("http://gozo.com"));
+            Assert.True(attribute.IsValid("https://gozo.com"));
+            Assert.True(attribute.IsValid("https://gozo.com:1234"));
+            Assert.True(attribute.IsValid("https://gozo.com:1234/test.css"));
+            Assert.True(attribute.IsValid("https://gozo.com:1234/test.png"));
+            Assert.False(attribute.IsValid("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud e"));
+            Assert.False(attribute.IsValid(2));
+            Assert.False(attribute.IsValid("http://"));
+            Assert.False(attribute.IsValid("httpdsadsa.com"));
+        }
+
         [Fact]
         public void CanCalculateCryptoDue2()
         {
@@ -265,7 +288,7 @@ namespace BTCPayServer.Tests
                 var user = tester.NewAccount();
                 user.GrantAccess();
                 user.RegisterDerivationScheme("BTC");
-                
+
                 // Set tolerance to 50%
                 var stores = user.GetController<StoresController>();
                 var vm = Assert.IsType<StoreViewModel>(Assert.IsType<ViewResult>(stores.UpdateStore()).Model);
@@ -296,6 +319,22 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        public void RoundupCurrenciesCorrectly()
+        {
+            foreach (var test in new[]
+            {
+                (0.0005m, "$0.0005 (USD)"),
+                (0.001m, "$0.001 (USD)"),
+                (0.01m, "$0.01 (USD)"),
+                (0.1m, "$0.10 (USD)"),
+            })
+            {
+                var actual = InvoiceController.FormatCurrency(test.Item1, "USD", new CurrencyNameTable());
+                Assert.Equal(test.Item2, actual);
+            }
+        }
+
         [Fact]
         public void CanPayUsingBIP70()
         {
@@ -305,6 +344,7 @@ 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" },
@@ -370,14 +410,20 @@ namespace BTCPayServer.Tests
 
                 var testResult = storeController.AddLightningNode(user.StoreId, new LightningNodeViewModel()
                 {
-                    Url = tester.MerchantCharge.Client.Uri.AbsoluteUri
+                    ConnectionString = "type=charge;server=" + 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()
                 {
-                    Url = tester.MerchantCharge.Client.Uri.AbsoluteUri
+                    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
                 }, "save", "BTC").GetAwaiter().GetResult());
 
                 var storeVm = Assert.IsType<Models.StoreViewModels.StoreViewModel>(Assert.IsType<ViewResult>(storeController.UpdateStore()).Model);
@@ -389,106 +435,148 @@ namespace BTCPayServer.Tests
         public void CanParseLightningURL()
         {
             LightningConnectionString conn = null;
-            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", 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", 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", 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", 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.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 CanSendLightningPayment2()
-        {
-            using (var tester = ServerTester.Create())
+            Assert.True(LightningConnectionString.TryParse("/test/a", true, out conn));
+            for (int i = 0; i < 2; i++)
             {
-                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());
-                });
+                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("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", 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("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("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://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));
         }
 
         [Fact]
-        public void CanSendLightningPayment()
+        public void CanSendLightningPaymentCLightning()
         {
+            ProcessLightningPayment(LightningConnectionType.CLightning);
+        }
+
+        [Fact]
+        public void CanSendLightningPaymentCharge()
+        {
+            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", LightningConnectionType.Charge);
+                user.RegisterLightningNode("BTC", type);
                 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))
@@ -498,7 +586,10 @@ namespace BTCPayServer.Tests
 
         async Task CanSendLightningPaymentCore(ServerTester tester, TestAccount user)
         {
-            await Task.Delay(TimeSpan.FromSeconds(RandomUtils.GetUInt32() % 5));
+            // TODO: If this parameter is less than 1 second we start having concurrency problems
+            await Task.Delay(TimeSpan.FromMilliseconds(1000));
+            //
+
             var invoice = await user.BitPay.CreateInvoiceAsync(new Invoice()
             {
                 Price = 0.01m,
@@ -617,7 +708,7 @@ namespace BTCPayServer.Tests
                     ItemDesc = "Some description",
                     FullNotifications = true
                 }, Facade.Merchant);
-                
+
                 var cashCow = tester.ExplorerNode;
                 var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, cashCow.Network);
                 var firstPayment = invoice.CryptoInfo[0].TotalDue - Money.Satoshis(10);
@@ -732,8 +823,30 @@ 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());
@@ -875,6 +988,11 @@ namespace BTCPayServer.Tests
 
                 Assert.Single(invoice.CryptoInfo);
                 Assert.Equal("LTC", invoice.CryptoInfo[0].CryptoCode);
+                Assert.True(invoice.PaymentCodes.ContainsKey("LTC"));
+                Assert.True(invoice.SupportedTransactionCurrencies.ContainsKey("LTC"));
+                Assert.True(invoice.SupportedTransactionCurrencies["LTC"].Enabled);
+                Assert.True(invoice.PaymentSubtotals.ContainsKey("LTC"));
+                Assert.True(invoice.PaymentTotals.ContainsKey("LTC"));
                 var cashCow = tester.LTCExplorerNode;
                 var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, cashCow.Network);
                 var firstPayment = Money.Coins(0.1m);
@@ -1009,6 +1127,16 @@ namespace BTCPayServer.Tests
                 Assert.Single(checkout.AvailableCryptos);
                 Assert.Equal("BTC", checkout.CryptoCode);
 
+                Assert.Single(invoice.PaymentCodes);
+                Assert.Single(invoice.SupportedTransactionCurrencies);
+                Assert.Single(invoice.SupportedTransactionCurrencies);
+                Assert.Single(invoice.PaymentSubtotals);
+                Assert.Single(invoice.PaymentTotals);
+                Assert.True(invoice.PaymentCodes.ContainsKey("BTC"));
+                Assert.True(invoice.SupportedTransactionCurrencies.ContainsKey("BTC"));
+                Assert.True(invoice.SupportedTransactionCurrencies["BTC"].Enabled);
+                Assert.True(invoice.PaymentSubtotals.ContainsKey("BTC"));
+                Assert.True(invoice.PaymentTotals.ContainsKey("BTC"));
                 //////////////////////
 
                 // Retry now with LTC enabled
@@ -1057,6 +1185,18 @@ namespace BTCPayServer.Tests
                 checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, "LTC").GetAwaiter().GetResult()).Value;
                 Assert.Equal(2, checkout.AvailableCryptos.Count);
                 Assert.Equal("LTC", checkout.CryptoCode);
+
+
+                Assert.Equal(2, invoice.PaymentCodes.Count());
+                Assert.Equal(2, invoice.SupportedTransactionCurrencies.Count());
+                Assert.Equal(2, invoice.SupportedTransactionCurrencies.Count());
+                Assert.Equal(2, invoice.PaymentSubtotals.Count());
+                Assert.Equal(2, invoice.PaymentTotals.Count());
+                Assert.True(invoice.PaymentCodes.ContainsKey("LTC"));
+                Assert.True(invoice.SupportedTransactionCurrencies.ContainsKey("LTC"));
+                Assert.True(invoice.SupportedTransactionCurrencies["LTC"].Enabled);
+                Assert.True(invoice.PaymentSubtotals.ContainsKey("LTC"));
+                Assert.True(invoice.PaymentTotals.ContainsKey("LTC"));
             }
         }
 
@@ -1197,7 +1337,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, "orange").Result);
+                Assert.IsType<RedirectResult>(apps.ViewPointOfSale(appId, 0, null, null, null, null, "orange").Result);
                 var invoice = user.BitPay.GetInvoices().First();
                 Assert.Equal(10.00m, invoice.Price);
                 Assert.Equal("CAD", invoice.Currency);
@@ -1221,8 +1361,9 @@ 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.ListApps), redirectToAction.ActionName);
+                Assert.Equal(nameof(apps.UpdatePointOfSale), 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);
@@ -1260,6 +1401,8 @@ 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()
@@ -1399,10 +1542,10 @@ namespace BTCPayServer.Tests
             var quadri = new QuadrigacxRateProvider();
             var rates = quadri.GetRatesAsync().GetAwaiter().GetResult();
             Assert.NotEmpty(rates);
-            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.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.Null(rates.GetRate(QuadrigacxRateProvider.QuadrigacxName, CurrencyPair.Parse("LTC_USD")));
         }
 
@@ -1411,7 +1554,7 @@ namespace BTCPayServer.Tests
         {
             var provider = new BTCPayNetworkProvider(NetworkType.Mainnet);
             var factory = CreateBTCPayRateFactory(provider);
-            
+
             foreach (var result in factory
                 .DirectProviders
                 .Select(p => (ExpectedName: p.Key, ResultAsync: p.Value.GetRatesAsync()))
@@ -1423,11 +1566,11 @@ namespace BTCPayServer.Tests
                 Assert.NotEmpty(exchangeRates.ByExchange[result.ExpectedName]);
 
                 // This check if the currency pair is using right currency pair
-                Assert.Contains(exchangeRates.ByExchange[result.ExpectedName], 
-                        e => ( e.CurrencyPair == new CurrencyPair("BTC", "USD") ||
+                Assert.Contains(exchangeRates.ByExchange[result.ExpectedName],
+                        e => (e.CurrencyPair == new CurrencyPair("BTC", "USD") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "EUR") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "USDT"))
-                               && e.Value > 1.0m // 1BTC will always be more than 1USD
+                               && e.BidAsk.Bid > 1.0m // 1BTC will always be more than 1USD
                                );
             }
         }
@@ -1470,7 +1613,6 @@ namespace BTCPayServer.Tests
             RateRules.TryParse("X_X = coinaverage(X_X);", out var rateRules);
 
             var factory = CreateBTCPayRateFactory(provider);
-            factory.DirectProviders.Clear();
             factory.CacheSpan = TimeSpan.FromSeconds(10);
 
             var fetchedRate = factory.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();

BTCPayServer.Tests/UnitTestPeusa.cs

@@ -0,0 +1,48 @@
+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,9 +17,10 @@ services:
       TESTS_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver
       TESTS_PORT: 80
       TESTS_HOSTNAME: tests
-      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/
+      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"
       TESTS_INCONTAINER: "true"
     expose:
       - "80"
@@ -44,9 +45,25 @@ 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.6
+    image: nicolasdorier/nbxplorer:1.0.2.8
     ports:
       - "32838:32838"
     expose: 
@@ -80,8 +97,13 @@ 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
@@ -89,7 +111,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: nicolasdorier/clightning:0.0.0.14-dev
+    image: nicolasdorier/clightning:v0.6-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -112,7 +134,7 @@ services:
       - bitcoind
 
   lightning-charged:
-    image: shesek/lightning-charge:0.3.9
+    image: shesek/lightning-charge:0.3.15
     environment:
       NETWORK: regtest
       API_TOKEN: foiewnccewuify
@@ -131,7 +153,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: nicolasdorier/clightning:0.0.0.14-dev
+    image: nicolasdorier/clightning:v0.6-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -177,8 +199,59 @@ 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,6 +44,7 @@ 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; }
 
         [Obsolete("Should not be needed")]
         public bool IsBTC

BTCPayServer/BTCPayNetworkProvider.Dogecoin.cs

@@ -27,7 +27,8 @@ namespace BTCPayServer
                 },
                 CryptoImagePath = "imlegacy/dogecoin.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("3'") : new KeyPath("1'")
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("3'") : new KeyPath("1'"),
+                MinFee = Money.Coins(1m)
             });
         }
     }

BTCPayServer/BTCPayNetworkProvider.Feathercoin.cs

@@ -0,0 +1,34 @@
+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,
+                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

@@ -0,0 +1,33 @@
+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,
+                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.Monacoin.cs

@@ -0,0 +1,35 @@
+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 InitMonacoin()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("MONA");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                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,
+                UriScheme = "monacoin",
+                DefaultRateRules = new[] 
+                {
+                                "MONA_X = MONA_BTC * BTC_X",
+                                "MONA_BTC = zaif(MONA_BTC)"
+                },
+                CryptoImagePath = "imlegacy/monacoin.png",
+                LightningImagePath = "imlegacy/mona-lightning.svg",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("22'") : new KeyPath("1'")
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.Polis.cs

@@ -0,0 +1,34 @@
+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,
+                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

@@ -0,0 +1,34 @@
+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,
+                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.cs

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

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.14</Version>
+		<Version>1.0.2.40</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -37,24 +37,24 @@
     <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.2" />
     <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-rc1-final" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
     <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.7" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.20" />	  
+    <PackageReference Include="NBitcoin" Version="4.1.1.20" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.29" />	  
     <PackageReference Include="DBreeze" Version="1.87.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="NBXplorer.Client" Version="1.0.2.12" />
+    <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.14" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0" />
     <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-rc1-final" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version=" 2.1.0-rc1-final" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version=" 2.1.0" PrivateAssets="All" />
 		<PackageReference Include="YamlDotNet" Version="4.3.1" />
 	</ItemGroup>
 

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -77,11 +77,16 @@ namespace BTCPayServer.Configuration
                 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, 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/)");
+                        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;macaron=abf239...;certthumbprint=2abdf302...'");
+                    }
+                    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);
                 }

BTCPayServer/Controllers/AccessTokenController.cs

@@ -12,7 +12,8 @@ using System.Threading.Tasks;
 
 namespace BTCPayServer.Controllers
 {
-    [BitpayAPIConstraint]
+    [Authorize(AuthenticationSchemes = Security.Policies.BitpayAuthentication)]
+    [BitpayAPIConstraint(true)]
     public class AccessTokenController : Controller
     {
         TokenRepository _TokenRepository;
@@ -30,6 +31,7 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("tokens")]
+        [AllowAnonymous]
         public async Task<DataWrapper<List<PairingCodeResponse>>> Tokens([FromBody] TokenRequest request)
         {
             PairingCodeEntity pairingEntity = null;
@@ -53,7 +55,7 @@ namespace BTCPayServer.Controllers
             else
             {
                 var sin = this.User.GetSIN() ?? request.Id;
-                if (string.IsNullOrEmpty(request.Id) || !NBitpayClient.Extensions.BitIdExtensions.ValidateSIN(request.Id))
+                if (string.IsNullOrEmpty(sin) || !NBitpayClient.Extensions.BitIdExtensions.ValidateSIN(sin))
                     throw new BitpayHttpException(400, "'id' property is required, alternatively, use BitId");
 
                 pairingEntity = await _TokenRepository.GetPairingAsync(request.PairingCode);
@@ -77,6 +79,7 @@ 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,6 +17,8 @@ using YamlDotNet.RepresentationModel;
 using System.IO;
 using BTCPayServer.Services.Rates;
 using System.Globalization;
+using System.Text;
+using System.Text.Encodings.Web;
 
 namespace BTCPayServer.Controllers
 {
@@ -57,15 +59,56 @@ namespace BTCPayServer.Controllers
             var app = await GetOwnedApp(appId, AppType.PointOfSale);
             if (app == null)
                 return NotFound();
-
             var settings = app.GetSettings<PointOfSaleSettings>();
-            return View(new UpdatePointOfSaleViewModel() { Title = settings.Title, ShowCustomAmount = settings.ShowCustomAmount, Currency = settings.Currency, Template = settings.Template });
+            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);
         }
         [HttpPost]
         [Route("{appId}/settings/pos")]
         public async Task<IActionResult> UpdatePointOfSale(string appId, UpdatePointOfSaleViewModel vm)
         {
-            if (_Currencies.GetCurrencyData(vm.Currency) == null)
+            if (_Currencies.GetCurrencyData(vm.Currency, false) == null)
                 ModelState.AddModelError(nameof(vm.Currency), "Invalid currency");
             try
             {
@@ -91,7 +134,7 @@ namespace BTCPayServer.Controllers
             });
             await UpdateAppSettings(app);
             StatusMessage = "App updated";
-            return RedirectToAction(nameof(UpdatePointOfSale));
+            return RedirectToAction(nameof(ListApps));
         }
 
         [HttpGet]
@@ -102,8 +145,9 @@ namespace BTCPayServer.Controllers
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<PointOfSaleSettings>();
-            var currency = _Currencies.GetCurrencyData(settings.Currency);
+            var currency = _Currencies.GetCurrencyData(settings.Currency, false);
             double step = currency == null ? 1 : Math.Pow(10, -(currency.Divisibility));
+
             return View(new ViewPointOfSaleViewModel()
             {
                 Title = settings.Title,
@@ -163,7 +207,13 @@ namespace BTCPayServer.Controllers
         [HttpPost]
         [Route("{appId}/pos")]
         [IgnoreAntiforgeryToken]
-        public async Task<IActionResult> ViewPointOfSale(string appId, decimal amount, string choiceKey)
+        public async Task<IActionResult> ViewPointOfSale(string appId,
+                                                        decimal amount,
+                                                        string email,
+                                                        string orderId,
+                                                        string notificationUrl,
+                                                        string redirectUrl,
+                                                        string choiceKey)
         {
             var app = await GetApp(appId, AppType.PointOfSale);
             if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
@@ -173,7 +223,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 });
             }
@@ -190,16 +240,22 @@ 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,6 +113,9 @@ 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

@@ -14,5 +14,24 @@ namespace BTCPayServer.Controllers
         {
             return View("Home");
         }
+
+        public IActionResult About()
+        {
+            ViewData["Message"] = "Your application description page.";
+
+            return View();
+        }
+
+        public IActionResult Contact()
+        {
+            ViewData["Message"] = "Your contact page.";
+
+            return View();
+        }
+
+        public IActionResult Error()
+        {
+            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+        }
     }
 }

BTCPayServer/Controllers/InvoiceController.API.cs

@@ -20,7 +20,7 @@ namespace BTCPayServer.Controllers
 {
     [EnableCors("BitpayAPI")]
     [BitpayAPIConstraint]
-    [Authorize(Policies.CanUseStore.Key)]
+    [Authorize(Policies.CanUseStore.Key, AuthenticationSchemes = Policies.BitpayAuthentication)]
     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);
+            var payment = PaymentMessage.Load(Request.Body, network.NBitcoinNetwork);
             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

@@ -51,7 +51,7 @@ namespace BTCPayServer.Controllers
                 StoreLink = Url.Action(nameof(StoresController.UpdateStore), "Stores", new { storeId = store.Id }),
                 Id = invoice.Id,
                 Status = invoice.Status,
-                TransactionSpeed = invoice.SpeedPolicy == SpeedPolicy.HighSpeed ? "high" : 
+                TransactionSpeed = invoice.SpeedPolicy == SpeedPolicy.HighSpeed ? "high" :
                                    invoice.SpeedPolicy == SpeedPolicy.MediumSpeed ? "medium" :
                                    invoice.SpeedPolicy == SpeedPolicy.LowMediumSpeed ? "low-medium" :
                                    "low",
@@ -61,7 +61,7 @@ namespace BTCPayServer.Controllers
                 MonitoringDate = invoice.MonitoringExpiration,
                 OrderId = invoice.OrderId,
                 BuyerInformation = invoice.BuyerInformation,
-                Fiat = FormatCurrency((decimal)dto.Price, dto.Currency),
+                Fiat = FormatCurrency((decimal)dto.Price, dto.Currency, _CurrencyNameTable),
                 NotificationUrl = invoice.NotificationURL,
                 RedirectUrl = invoice.RedirectURL,
                 ProductInformation = invoice.ProductInformation,
@@ -85,7 +85,7 @@ namespace BTCPayServer.Controllers
                 {
                     cryptoPayment.Address = onchainMethod.DepositAddress;
                 }
-                cryptoPayment.Rate = FormatCurrency(data);
+                cryptoPayment.Rate = ExchangeRate(data);
                 cryptoPayment.PaymentUrl = cryptoInfo.PaymentUrls.BIP21;
                 model.CryptoPayments.Add(cryptoPayment);
             }
@@ -242,15 +242,16 @@ namespace BTCPayServer.Controllers
                 CustomCSSLink = storeBlob.CustomCSS?.AbsoluteUri,
                 CustomLogoLink = storeBlob.CustomLogo?.AbsoluteUri,
                 BtcAddress = paymentMethodDetails.GetPaymentDestination(),
-                OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
                 BtcDue = accounting.Due.ToString(),
+                OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
+                OrderAmountFiat = OrderAmountFromInvoice(network.CryptoCode, invoice.ProductInformation),
                 CustomerEmail = invoice.RefundMail,
                 RequiresRefundEmail = storeBlob.RequiresRefundEmail,
                 ExpirationSeconds = Math.Max(0, (int)(invoice.ExpirationTime - DateTimeOffset.UtcNow).TotalSeconds),
                 MaxTimeSeconds = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalSeconds,
                 MaxTimeMinutes = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalMinutes,
                 ItemDesc = invoice.ProductInformation.ItemDesc,
-                Rate = FormatCurrency(paymentMethod),
+                Rate = ExchangeRate(paymentMethod),
                 MerchantRefLink = invoice.RedirectURL ?? "/",
                 StoreName = store.StoreName,
                 InvoiceBitcoinUrl = paymentMethodId.PaymentType == PaymentTypes.BTCLike ? cryptoInfo.PaymentUrls.BIP21 :
@@ -288,14 +289,45 @@ namespace BTCPayServer.Controllers
             return (paymentMethodId.PaymentType == PaymentTypes.BTCLike ? Url.Content(network.CryptoImagePath) : Url.Content(network.LightningImagePath));
         }
 
-        private string FormatCurrency(PaymentMethod paymentMethod)
+        private string OrderAmountFromInvoice(string cryptoCode, ProductInformation productInformation)
+        {
+            // if invoice source currency is the same as currently display currency, no need for "order amount from invoice"
+            if (cryptoCode == productInformation.Currency)
+                return null;
+
+            return FormatCurrency(productInformation.Price, productInformation.Currency, _CurrencyNameTable);
+        }
+        private string ExchangeRate(PaymentMethod paymentMethod)
         {
             string currency = paymentMethod.ParentEntity.ProductInformation.Currency;
-            return FormatCurrency(paymentMethod.Rate, currency);
+            return FormatCurrency(paymentMethod.Rate, currency, _CurrencyNameTable);
         }
-        public string FormatCurrency(decimal price, string currency)
+
+        public static string FormatCurrency(decimal price, string currency, CurrencyNameTable currencies)
         {
-            return price.ToString("C", _CurrencyNameTable.GetCurrencyProvider(currency)) + $" ({currency})";
+            var provider = currencies.GetNumberFormatInfo(currency, true);
+            var currencyData = currencies.GetCurrencyData(currency, true);
+            var divisibility = currencyData.Divisibility;
+            while (true)
+            {
+                var rounded = decimal.Round(price, divisibility, MidpointRounding.AwayFromZero);
+                if ((Math.Abs(rounded - price) / price) < 0.001m)
+                {
+                    price = rounded;
+                    break;
+                }
+                divisibility++;
+            }
+            if (divisibility != provider.CurrencyDecimalDigits)
+            {
+                provider = (NumberFormatInfo)provider.Clone();
+                provider.CurrencyDecimalDigits = divisibility;
+            }
+            
+            if (currencyData.Crypto)
+                return price.ToString("C", provider);
+            else
+                return price.ToString("C", provider) + $" ({currency})";
         }
 
         [HttpGet]
@@ -324,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.InvoiceId, invoiceId)));
+                leases.Add(_EventAggregator.Subscribe<Events.InvoiceEvent>(async o => await NotifySocket(webSocket, o.Invoice.Id, invoiceId)));
                 while (true)
                 {
                     var message = await webSocket.ReceiveAsync(DummyBuffer, default(CancellationToken));
@@ -393,7 +425,7 @@ namespace BTCPayServer.Controllers
                 {
                     Status = invoice.Status + (invoice.ExceptionStatus == null ? string.Empty : $" ({invoice.ExceptionStatus})"),
                     ShowCheckout = invoice.Status == "new",
-                    Date = (DateTimeOffset.UtcNow - invoice.InvoiceTime).Prettify() + " ago",
+                    Date = invoice.InvoiceTime,
                     InvoiceId = invoice.Id,
                     OrderId = invoice.OrderId ?? string.Empty,
                     RedirectUrl = invoice.RedirectURL ?? string.Empty,
@@ -430,7 +462,7 @@ namespace BTCPayServer.Controllers
             var stores = await _StoreRepository.GetStoresByUserId(GetUserId());
             model.Stores = new SelectList(stores, nameof(StoreData.Id), nameof(StoreData.StoreName), model.StoreId);
             var store = stores.FirstOrDefault(s => s.Id == model.StoreId);
-            if(store == null)
+            if (store == null)
             {
                 ModelState.AddModelError(nameof(model.StoreId), "Store not found");
             }
@@ -503,8 +535,11 @@ 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(invoiceId, 1008, "invoice_markedInvalid"));
+            _EventAggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1008, "invoice_markedInvalid"));
             return RedirectToAction(nameof(ListInvoices));
         }
 

BTCPayServer/Controllers/InvoiceController.cs

@@ -109,13 +109,17 @@ 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);
 
+            await UpdateCLightningConnectionStringIfNeeded(store);
+
             foreach (var network in store.GetSupportedPaymentMethods(_NetworkProvider)
                                                .Select(c => _NetworkProvider.GetNetwork(c.PaymentId.CryptoCode))
                                                 .Where(c => c != null))
@@ -141,32 +145,26 @@ namespace BTCPayServer.Controllers
                                                     PaymentMethod: CreatePaymentMethodAsync(fetchingByCurrencyPair, o.Handler, o.SupportedPaymentMethod, o.Network, entity, store)))
                                                 .ToList();
 
-            List<string> paymentMethodErrors = new List<string>();
+            List<string> invoiceLogs = new List<string>();
             List<ISupportedPaymentMethod> supported = new List<ISupportedPaymentMethod>();
             var paymentMethods = new PaymentMethodDictionary();
 
-            foreach(var pair in fetchingByCurrencyPair)
+            foreach (var pair in fetchingByCurrencyPair)
             {
                 var rateResult = await pair.Value;
-                bool hasError = false;
-                if(rateResult.Errors.Count != 0)
+                invoiceLogs.Add($"{pair.Key}: The rating rule is {rateResult.Rule}");
+                invoiceLogs.Add($"{pair.Key}: The evaluated rating rule is {rateResult.EvaluatedRule}");
+                if (rateResult.Errors.Count != 0)
                 {
                     var allRateRuleErrors = string.Join(", ", rateResult.Errors.ToArray());
-                    paymentMethodErrors.Add($"{pair.Key}: Rate rule error ({allRateRuleErrors})");
-                    hasError = true;
+                    invoiceLogs.Add($"{pair.Key}: Rate rule error ({allRateRuleErrors})");
                 }
-                if(rateResult.ExchangeExceptions.Count != 0)
+                if (rateResult.ExchangeExceptions.Count != 0)
                 {
-                    foreach(var ex in rateResult.ExchangeExceptions)
+                    foreach (var ex in rateResult.ExchangeExceptions)
                     {
-                        paymentMethodErrors.Add($"{pair.Key}: Exception reaching exchange {ex.ExchangeName} ({ex.Exception.Message})");
+                        invoiceLogs.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}");
                 }
             }
 
@@ -182,11 +180,11 @@ namespace BTCPayServer.Controllers
                 }
                 catch (PaymentMethodUnavailableException ex)
                 {
-                    paymentMethodErrors.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Payment method unavailable ({ex.Message})");
+                    invoiceLogs.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()})");
+                    invoiceLogs.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Unexpected exception ({ex.ToString()})");
                 }
             }
 
@@ -194,7 +192,7 @@ namespace BTCPayServer.Controllers
             {
                 StringBuilder errors = new StringBuilder();
                 errors.AppendLine("No payment method available for this store");
-                foreach (var error in paymentMethodErrors)
+                foreach (var error in invoiceLogs)
                 {
                     errors.AppendLine(error);
                 }
@@ -204,13 +202,29 @@ namespace BTCPayServer.Controllers
             entity.SetSupportedPaymentMethods(supported);
             entity.SetPaymentMethods(paymentMethods);
             entity.PosData = invoice.PosData;
-            entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, paymentMethodErrors, _NetworkProvider);
+            entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, invoiceLogs, _NetworkProvider);
 
-            _EventAggregator.Publish(new Events.InvoiceEvent(entity, 1001, "invoice_created"));
+            _EventAggregator.Publish(new Events.InvoiceEvent(entity.EntityToDTO(_NetworkProvider), 1001, "invoice_created"));
             var resp = entity.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }
 
+        private async Task UpdateCLightningConnectionStringIfNeeded(StoreData store)
+        {
+            bool needUpdate = false;
+            foreach (var method in store.GetSupportedPaymentMethods(_NetworkProvider).OfType<Payments.Lightning.LightningSupportedPaymentMethod>())
+            {
+                var lightning = method.GetLightningUrl();
+                if (lightning.IsLegacy)
+                {
+                    method.SetLightningUrl(lightning);
+                    needUpdate = true;
+                }
+            }
+            if(needUpdate)
+                await _StoreRepository.UpdateStore(store);
+        }
+
         private async Task<PaymentMethod> CreatePaymentMethodAsync(Dictionary<CurrencyPair, Task<RateResult>> fetchingByCurrencyPair, IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store)
         {
             var storeBlob = store.GetStoreBlob();

BTCPayServer/Controllers/RateController.cs

@@ -89,7 +89,7 @@ namespace BTCPayServer.Controllers
                                 CryptoCode = r.Pair.Left,
                                 Code = r.Pair.Right,
                                 CurrencyPair = r.Pair.ToString(),
-                                Name = _CurrencyNameTable.GetCurrencyData(r.Pair.Right)?.Name,
+                                Name = _CurrencyNameTable.GetCurrencyData(r.Pair.Right, true).Name,
                                 Value = r.Value.Value
                             }).Where(n => n.Name != null).ToArray());
         }

BTCPayServer/Controllers/StoresController.BTCLike.cs

@@ -288,7 +288,7 @@ namespace BTCPayServer.Controllers
                     var unspentCoins = await wallet.GetUnspentCoins(strategyBase);
                     var changeAddress = await change;
                     var send = new[] { (
-                        destination: destinationAddress as IDestination, 
+                        destination: destinationAddress as IDestination,
                         amount: amountBTC,
                         substractFees: subsctractFeesValue) };
 
@@ -320,7 +320,19 @@ namespace BTCPayServer.Controllers
                             builder.SubtractFees();
                     }
                     builder.SetChange(changeAddress.Item1);
-                    builder.SendEstimatedFees(feeRateValue);
+
+                    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);
 
@@ -335,15 +347,15 @@ namespace BTCPayServer.Controllers
 
                     Dictionary<uint256, Transaction> parentTransactions = new Dictionary<uint256, Transaction>();
 
-                    if(!strategy.Segwit)
+                    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)
+                        foreach (var getTransactionAsync in getTransactionAsyncs)
                         {
                             var tx = (await getTransactionAsync.Op);
-                            if(tx == null)
+                            if (tx == null)
                                 throw new Exception($"Parent transaction {getTransactionAsync.Hash} not found");
                             parentTransactions.Add(tx.Transaction.GetHash(), tx.Transaction);
                         }
@@ -356,7 +368,7 @@ namespace BTCPayServer.Controllers
                         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 });
@@ -377,7 +389,7 @@ namespace BTCPayServer.Controllers
             { 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)

BTCPayServer/Controllers/StoresController.LightningLike.cs

@@ -26,16 +26,15 @@ namespace BTCPayServer.Controllers
                 return NotFound();
             LightningNodeViewModel vm = new LightningNodeViewModel();
             vm.CryptoCode = cryptoCode;
-            vm.InternalLightningNode = GetInternalLighningNode(cryptoCode)?.ToUri(true)?.AbsoluteUri;
+            vm.InternalLightningNode = GetInternalLighningNode(cryptoCode)?.ToString();
             SetExistingValues(store, vm);
             return View(vm);
         }
 
         private void SetExistingValues(StoreData store, LightningNodeViewModel vm)
         {
-            vm.Url = GetExistingLightningSupportedPaymentMethod(vm.CryptoCode, store)?.GetLightningUrl()?.ToString();
+            vm.ConnectionString = GetExistingLightningSupportedPaymentMethod(vm.CryptoCode, store)?.GetLightningUrl()?.ToString();
         }
-
         private LightningSupportedPaymentMethod GetExistingLightningSupportedPaymentMethod(string cryptoCode, StoreData store)
         {
             var id = new PaymentMethodId(cryptoCode, PaymentTypes.LightningLike);
@@ -65,7 +64,7 @@ namespace BTCPayServer.Controllers
             var network = vm.CryptoCode == null ? null : _ExplorerProvider.GetNetwork(vm.CryptoCode);
 
             var internalLightning = GetInternalLighningNode(network.CryptoCode);
-            vm.InternalLightningNode = internalLightning?.ToUri(true)?.AbsoluteUri;
+            vm.InternalLightningNode = internalLightning?.ToString();
             if (network == null)
             {
                 ModelState.AddModelError(nameof(vm.CryptoCode), "Invalid network");
@@ -74,33 +73,51 @@ namespace BTCPayServer.Controllers
 
             PaymentMethodId paymentMethodId = new PaymentMethodId(network.CryptoCode, PaymentTypes.LightningLike);
             Payments.Lightning.LightningSupportedPaymentMethod paymentMethod = null;
-            if (!string.IsNullOrEmpty(vm.Url))
+            if (!string.IsNullOrEmpty(vm.ConnectionString))
             {
-                if (!LightningConnectionString.TryParse(vm.Url, out var connectionString, out var error))
+                if (!LightningConnectionString.TryParse(vm.ConnectionString, false, out var connectionString, out var error))
                 {
-                    ModelState.AddModelError(nameof(vm.Url), $"Invalid URL ({error})");
+                    ModelState.AddModelError(nameof(vm.ConnectionString), $"Invalid URL ({error})");
                     return View(vm);
                 }
 
-                var internalDomain = internalLightning?.ToUri(false)?.DnsSafeHost;
-                bool isLocal = (internalDomain == "127.0.0.1" || internalDomain == "localhost");
+                var internalDomain = internalLightning.BaseUri?.DnsSafeHost;
 
                 bool isInternalNode = connectionString.ConnectionType == LightningConnectionType.CLightning ||
                                       connectionString.BaseUri.DnsSafeHost == internalDomain ||
-                                      isLocal;
+                                      (internalDomain == "127.0.0.1" || internalDomain == "localhost");
 
-                if (connectionString.BaseUri.Scheme == "http" && !isLocal)
+                if (connectionString.BaseUri.Scheme == "http")
                 {
-                    if (!isInternalNode || (isInternalNode && !CanUseInternalLightning()))
+                    if (!isInternalNode)
                     {
-                        ModelState.AddModelError(nameof(vm.Url), "The url must be HTTPS");
+                        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");
                         return View(vm);
                     }
                 }
 
                 if (isInternalNode && !CanUseInternalLightning())
                 {
-                    ModelState.AddModelError(nameof(vm.Url), "Unauthorized url");
+                    ModelState.AddModelError(nameof(vm.ConnectionString), "Unauthorized url");
                     return View(vm);
                 }
 
@@ -110,6 +127,7 @@ namespace BTCPayServer.Controllers
                 };
                 paymentMethod.SetLightningUrl(connectionString);
             }
+
             if (command == "save")
             {
                 store.SetSupportedPaymentMethod(paymentMethodId, paymentMethod);
@@ -121,7 +139,7 @@ namespace BTCPayServer.Controllers
             {
                 if (paymentMethod == null)
                 {
-                    ModelState.AddModelError(nameof(vm.Url), "Missing url parameter");
+                    ModelState.AddModelError(nameof(vm.ConnectionString), "Missing url parameter");
                     return View(vm);
                 }
                 var handler = (LightningLikePaymentHandler)_ServiceProvider.GetRequiredService<IPaymentMethodHandler<Payments.Lightning.LightningSupportedPaymentMethod>>();
@@ -135,7 +153,7 @@ namespace BTCPayServer.Controllers
                             await handler.TestConnection(info, cts.Token);
                         }
                     }
-                    vm.StatusMessage = $"Connection to the lightning node succeed ({info})";
+                    vm.StatusMessage = $"Connection to the lightning node succeeded ({info})";
                 }
                 catch (Exception ex)
                 {

BTCPayServer/Controllers/StoresController.cs

@@ -53,8 +53,7 @@ namespace BTCPayServer.Controllers
             ExplorerClientProvider explorerProvider,
             IFeeProviderFactory feeRateProvider,
             LanguageService langService,
-            IHostingEnvironment env,
-            CoinAverageSettings coinAverage)
+            IHostingEnvironment env)
         {
             _RateFactory = rateFactory;
             _Dashboard = dashboard;
@@ -72,9 +71,7 @@ namespace BTCPayServer.Controllers
             _ServiceProvider = serviceProvider;
             _BtcpayServerOptions = btcpayServerOptions;
             _BTCPayEnv = btcpayEnv;
-            _CoinAverage = coinAverage;
         }
-        CoinAverageSettings _CoinAverage;
         NBXplorerDashboard _Dashboard;
         BTCPayServerOptions _BtcpayServerOptions;
         BTCPayServerEnvironment _BTCPayEnv;
@@ -316,7 +313,7 @@ namespace BTCPayServer.Controllers
                 Action = "Continue",
                 Title = "Rate rule scripting",
                 Description = scripting ?
-                                "This action will mofify your current rate sources. Are you sure to turn on rate rules scripting? (Advanced users)"
+                                "This action will modify 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"
             });
@@ -518,7 +515,7 @@ namespace BTCPayServer.Controllers
 
         private CoinAverageExchange[] GetSupportedExchanges()
         {
-            return _CoinAverage.AvailableExchanges
+            return _RateFactory.GetSupportedExchanges()
                     .Select(c => c.Value)
                     .OrderBy(s => s.Name, StringComparer.OrdinalIgnoreCase)
                     .ToArray();

BTCPayServer/Controllers/UserStoresController.cs

@@ -121,7 +121,10 @@ namespace BTCPayServer.Controllers
             var store = await _Repo.CreateStore(GetUserId(), vm.Name);
             CreatedStoreId = store.Id;
             StatusMessage = "Store successfully created";
-            return RedirectToAction(nameof(ListStores));
+            return RedirectToAction(nameof(StoresController.UpdateStore), "Stores", new
+            {
+                storeId = store.Id
+            });
         }
 
         private static async Task<string> GetBalanceString((BTCPayWallet Wallet, DerivationStrategyBase DerivationStrategy) _)

BTCPayServer/CurrencyValue.cs

@@ -21,7 +21,7 @@ namespace BTCPayServer
                 return false;
 
             var currency = match.Groups.Last().Value.ToUpperInvariant();
-            var currencyData = _CurrencyTable.GetCurrencyData(currency);
+            var currencyData = _CurrencyTable.GetCurrencyData(currency, false);
             if (currencyData == null)
                 return false;
             v = Math.Round(v, currencyData.Divisibility);

BTCPayServer/Data/ApplicationDbContextFactory.cs

@@ -6,6 +6,11 @@ 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
 {
@@ -31,12 +36,56 @@ 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);
+                builder
+                    .UseNpgsql(_ConnectionString)
+                    .ReplaceService<IMigrationsSqlGenerator, CustomNpgsqlMigrationsSqlGenerator>();
         }
 
         public void ConfigureHangfireBuilder(IGlobalConfiguration builder)

BTCPayServer/DerivationSchemeParser.cs

@@ -72,7 +72,7 @@ namespace BTCPayServer
                 }
                 try
                 {
-                    var data = Encoders.Base58Check.DecodeData(parts[i]);
+                    var data = Network.GetBase58CheckEncoder().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(Encoders.Base58Check.EncodeData(data), Network).ToString();
+                    var derivationScheme = new BitcoinExtPubKey(Network.GetBase58CheckEncoder().EncodeData(data), Network).ToString();
                     electrumMapping.TryGetValue(prefix, out string[] labels);
                     if (labels != null)
                     {

BTCPayServer/Events/InvoiceEvent.cs

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

BTCPayServer/Extensions.cs

@@ -36,28 +36,6 @@ 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();
@@ -131,7 +109,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;
@@ -163,7 +141,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);
             }
@@ -179,6 +157,15 @@ namespace BTCPayServer
             NBitcoin.Extensions.TryAdd(ctx.Items, "BitpayAuth", value);
         }
 
+        public static async Task<T> WithCancellation<T>(this Task<T> task, CancellationToken cancellationToken)
+        {
+            var waiting = Task.Delay(-1, cancellationToken);
+            var doing = task;
+            await Task.WhenAny(waiting, doing);
+            cancellationToken.ThrowIfCancellationRequested();
+            return await doing;
+        }
+
         public static (string Signature, String Id, String Authorization) GetBitpayAuth(this HttpContext ctx)
         {
             ctx.Items.TryGetValue("BitpayAuth", out object obj);

BTCPayServer/HostedServices/InvoiceNotificationManager.cs

@@ -198,7 +198,11 @@ namespace BTCPayServer.HostedServices
                 PosData = dto.PosData,
                 Price = dto.Price,
                 Status = dto.Status,
-                BuyerFields = invoice.RefundMail == null ? null : new Newtonsoft.Json.Linq.JObject() { new JProperty("buyerEmail", invoice.RefundMail) }
+                BuyerFields = invoice.RefundMail == null ? null : new Newtonsoft.Json.Linq.JObject() { new JProperty("buyerEmail", invoice.RefundMail) },
+                PaymentSubtotals = dto.PaymentSubtotals,
+                PaymentTotals = dto.PaymentTotals,
+                AmountPaid = dto.AmountPaid,
+                ExchangeRates = dto.ExchangeRates
             };
 
             // We keep backward compatibility with bitpay by passing BTC info to the notification
@@ -304,7 +308,7 @@ namespace BTCPayServer.HostedServices
         {
             leases.Add(_EventAggregator.Subscribe<InvoiceEvent>(async e =>
             {
-                var invoice = await _InvoiceRepository.GetInvoice(null, e.InvoiceId);
+                var invoice = await _InvoiceRepository.GetInvoice(null, e.Invoice.Id);
                 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, 1004, "invoice_expired"));
+                context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1004, "invoice_expired"));
                 invoice.Status = "expired";
                 if(invoice.ExceptionStatus == "paidPartial")
-                    context.Events.Add(new InvoiceEvent(invoice, 2000, "invoice_expiredPaidPartial"));
+                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 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, 1003, "invoice_paidInFull"));
+                        context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 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, 1009, "invoice_paidAfterExpiration"));
+                        context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 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, 1013, "invoice_failedToConfirm"));
+                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 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, 1005, "invoice_confirmed"));
+                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 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, 1006, "invoice_completed"));
+                    context.Events.Add(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1006, "invoice_completed"));
                     invoice.Status = "complete";
                     context.MarkDirty();
                 }
@@ -249,13 +249,13 @@ namespace BTCPayServer.HostedServices
             {
                 if (b.Name == "invoice_created")
                 {
-                    Watch(b.InvoiceId);
-                    await Wait(b.InvoiceId);
+                    Watch(b.Invoice.Id);
+                    await Wait(b.Invoice.Id);
                 }
 
                 if (b.Name == "invoice_receivedPayment")
                 {
-                    Watch(b.InvoiceId);
+                    Watch(b.Invoice.Id);
                 }
             }));
             return Task.CompletedTask;

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -117,7 +117,6 @@ 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 =>
@@ -137,6 +136,7 @@ namespace BTCPayServer.Hosting
             // bundling
 
             services.AddAuthorization(o => Policies.AddBTCPayPolicies(o));
+            BitpayAuthentication.AddAuthentication(services);
 
             services.AddBundles();
             services.AddTransient<BundleOptions>(provider =>

BTCPayServer/Logging/Logs.cs

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

BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs

@@ -20,5 +20,9 @@ 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/ErrorViewModel.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace BTCPayServer.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}

BTCPayServer/Models/InvoiceResponse.cs

@@ -224,6 +224,29 @@ namespace BTCPayServer.Models
         {
             get; set;
         }
+
+        [JsonProperty("paymentSubtotals")]
+        public Dictionary<string, long> PaymentSubtotals { get; set; }
+
+        [JsonProperty("paymentTotals")]
+        public Dictionary<string, long> PaymentTotals { get; set; }
+
+        [JsonProperty("amountPaid", DefaultValueHandling = DefaultValueHandling.Include)]
+        public long AmountPaid { get; set; }
+
+        [JsonProperty("minerFees")]
+        public Dictionary<string, NBitpayClient.MinerFeeInfo> MinerFees { get; set; }
+
+        [JsonProperty("exchangeRates")]
+        public Dictionary<string, Dictionary<string, decimal>> ExchangeRates { get; set; }
+
+        [JsonProperty("supportedTransactionCurrencies")]
+        public Dictionary<string, NBitpayClient.InvoiceSupportedTransactionCurrency> SupportedTransactionCurrencies { get; set; }
+
+        [JsonProperty("addresses")]
+        public Dictionary<string, string> Addresses { get; set; }
+        [JsonProperty("paymentCodes")]
+        public Dictionary<string, NBitpayClient.InvoicePaymentUrls> PaymentCodes { get; set; }
     }
     public class Flags
     {
@@ -233,4 +256,5 @@ namespace BTCPayServer.Models
             get; set;
         }
     }
+
 }

BTCPayServer/Models/InvoicingModels/CreateInvoiceModel.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Validation;
 
 namespace BTCPayServer.Models.InvoicingModels
 {
@@ -52,8 +53,7 @@ namespace BTCPayServer.Models.InvoicingModels
             get; set;
         }
 
-
-        [Url]
+        [Uri]
         public string NotificationUrl
         {
             get; set;

BTCPayServer/Models/InvoicingModels/InvoicesModel.cs

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

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -37,6 +37,7 @@ namespace BTCPayServer.Models.InvoicingModels
         public string TimeLeft { get; set; }
         public string Rate { get; set; }
         public string OrderAmount { get; set; }
+        public string OrderAmountFiat { get; set; }
         public string InvoiceBitcoinUrl { get; set; }
         public string InvoiceBitcoinUrlQR { get; set; }
         public int TxCount { get; set; }

BTCPayServer/Models/StoreViewModels/CheckoutExperienceViewModel.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Services;
+using BTCPayServer.Validation;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace BTCPayServer.Models.StoreViewModels
@@ -42,10 +43,10 @@ namespace BTCPayServer.Models.StoreViewModels
         public string OnChainMinValue { get; set; }
 
         [Display(Name = "Link to a custom CSS stylesheet")]
-        [Url]
+        [Uri]
         public string CustomCSS { get; set; }
         [Display(Name = "Link to a custom logo")]
-        [Url]
+        [Uri]
         public string CustomLogo { get; set; }
 
         [Display(Name = "Custom HTML title to display on Checkout page")]

BTCPayServer/Models/StoreViewModels/LightningNodeViewModel.cs

@@ -9,8 +9,8 @@ namespace BTCPayServer.Models.StoreViewModels
 {
     public class LightningNodeViewModel
     {
-        [Display(Name = "Lightning charge url")]
-        public string Url
+        [Display(Name = "Connection string")]
+        public string ConnectionString
         {
             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 ...")]
+        [Display(Name = "Multiply the rate by... (Setting to 1.01 would apply a discount of 1% to the purchase)")]
         [Range(0.01, 10.0)]
         public double RateMultiplier
         {

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -1,6 +1,7 @@
 using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
+using BTCPayServer.Validation;
 using BTCPayServer.Validations;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using System;
@@ -34,7 +35,7 @@ namespace BTCPayServer.Models.StoreViewModels
             get; set;
         }
 
-        [Url]
+        [Uri]
         [Display(Name = "Store Website")]
         [MaxLength(500)]
         public string StoreWebsite

BTCPayServer/Models/TokenRequest.cs

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

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.Id, payment, evt.DerivationStrategy);
+                                                    await ReceivedPayment(wallet, invoice, payment, evt.DerivationStrategy);
                                             }
                                             else
                                             {
@@ -332,7 +332,7 @@ 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.Id, payment, strategy);
+                        invoice = await ReceivedPayment(wallet, invoice, payment, strategy);
                     totalPayment++;
                 }
             }
@@ -346,10 +346,10 @@ namespace BTCPayServer.Payments.Bitcoin
                           .FirstOrDefault();
         }
 
-        private async Task<InvoiceEntity> ReceivedPayment(BTCPayWallet wallet, string invoiceId, PaymentEntity payment, DerivationStrategyBase strategy)
+        private async Task<InvoiceEntity> ReceivedPayment(BTCPayWallet wallet, InvoiceEntity invoice, PaymentEntity payment, DerivationStrategyBase strategy)
         {
             var paymentData = (BitcoinLikePaymentData)payment.GetCryptoPaymentData();
-            var invoice = (await UpdatePaymentStates(wallet, invoiceId));
+            invoice = (await UpdatePaymentStates(wallet, invoice.Id));
             var paymentMethod = invoice.GetPaymentMethod(wallet.Network, PaymentTypes.BTCLike, _ExplorerClients.NetworkProviders);
             if (paymentMethod != null &&
                 paymentMethod.GetPaymentMethodDetails() is BitcoinLikeOnChainPaymentMethod btc &&
@@ -358,13 +358,13 @@ namespace BTCPayServer.Payments.Bitcoin
             {
                 var address = await wallet.ReserveAddressAsync(strategy);
                 btc.DepositAddress = address.ToString();
-                await _InvoiceRepository.NewAddress(invoiceId, btc, wallet.Network);
-                _Aggregator.Publish(new InvoiceNewAddressEvent(invoiceId, address.ToString(), wallet.Network));
+                await _InvoiceRepository.NewAddress(invoice.Id, btc, wallet.Network);
+                _Aggregator.Publish(new InvoiceNewAddressEvent(invoice.Id, address.ToString(), wallet.Network));
                 paymentMethod.SetPaymentMethodDetails(btc);
                 invoice.SetPaymentMethod(paymentMethod);
             }
             wallet.InvalidateCache(strategy);
-            _Aggregator.Publish(new InvoiceEvent(invoiceId, 1002, "invoice_receivedPayment"));
+            _Aggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1002, "invoice_receivedPayment"));
             return invoice;
         }
         public Task StopAsync(CancellationToken cancellationToken)

BTCPayServer/Payments/Lightning/Charge/ChargeClient.cs

@@ -156,7 +156,7 @@ namespace BTCPayServer.Payments.Lightning.Charge
 
         async Task<LightningInvoice> ILightningInvoiceClient.CreateInvoice(LightMoney amount, string description, TimeSpan expiry, CancellationToken cancellation)
         {
-            var invoice = await CreateInvoiceAsync(new CreateInvoiceRequest() { Amount = amount, Expiry = expiry, Description = description ?? "" });
+            var invoice = await CreateInvoiceAsync(new CreateInvoiceRequest() { Amount = amount, Expiry = expiry, Description = description ?? "" }, cancellation);
             return new LightningInvoice() { Id = invoice.Id, Amount = amount, BOLT11 = invoice.PayReq, Status = "unpaid" };
         }
 

BTCPayServer/Payments/Lightning/LightningClientFactory.cs

@@ -4,6 +4,8 @@ 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
 {
@@ -12,16 +14,38 @@ namespace BTCPayServer.Payments.Lightning
         public ILightningInvoiceClient CreateClient(LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network)
         {
             var uri = supportedPaymentMethod.GetLightningUrl();
-            if (uri.ConnectionType == LightningConnectionType.Charge)
+            return CreateClient(uri, network.NBitcoinNetwork);
+        }
+
+        public static ILightningInvoiceClient CreateClient(LightningConnectionString connString, Network network)
+        {
+            if (connString.ConnectionType == LightningConnectionType.Charge)
             {
-                return new ChargeClient(uri.ToUri(true), network.NBitcoinNetwork);
+                return new ChargeClient(connString.ToUri(true), network);
             }
-            else if (uri.ConnectionType == LightningConnectionType.CLightning)
+            else if (connString.ConnectionType == LightningConnectionType.CLightning)
             {
-                return new CLightningRPCClient(uri.ToUri(false), network.NBitcoinNetwork);
+                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,
+                }));
             }
             else
-                throw new NotSupportedException($"Unsupported connection string for lightning server ({uri.ConnectionType})");
+                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);
         }
     }
 }

BTCPayServer/Payments/Lightning/LightningConnectionString.cs

@@ -1,25 +1,288 @@
 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
+        CLightning,
+        LndREST
     }
     public class LightningConnectionString
     {
-        public static bool TryParse(string str, out LightningConnectionString connectionString)
+        static Dictionary<string, LightningConnectionType> typeMapping;
+        static Dictionary<LightningConnectionType, string> typeMappingReverse;
+        static LightningConnectionString()
         {
-            return TryParse(str, out connectionString, out var error);
+            typeMapping = new Dictionary<string, LightningConnectionType>();
+            typeMapping.Add("clightning", LightningConnectionType.CLightning);
+            typeMapping.Add("charge", LightningConnectionType.Charge);
+            typeMapping.Add("lnd-rest", LightningConnectionType.LndREST);
+            typeMappingReverse = new Dictionary<LightningConnectionType, string>();
+            foreach (var kv in typeMapping)
+            {
+                typeMappingReverse.Add(kv.Value, kv.Key);
+            }
         }
-        public static bool TryParse(string str, out LightningConnectionString connectionString, out string 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)
         {
             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:
+                    {
+                        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;
+        }
+        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();
@@ -27,7 +290,7 @@ namespace BTCPayServer.Payments.Lightning
             error = null;
 
             Uri uri;
-            if (!System.Uri.TryCreate(str, UriKind.Absolute, out uri))
+            if (!Uri.TryCreate(str, UriKind.Absolute, out uri))
             {
                 error = "Invalid URL";
                 return false;
@@ -40,7 +303,6 @@ namespace BTCPayServer.Payments.Lightning
                 error = $"The url support the following protocols {protocols}";
                 return false;
             }
-
             if (uri.Scheme == "unix")
             {
                 str = uri.AbsoluteUri.Substring("unix:".Length);
@@ -49,8 +311,12 @@ 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(':');
@@ -61,6 +327,7 @@ namespace BTCPayServer.Payments.Lightning
                 }
                 result.Username = parts[0];
                 result.Password = parts[1];
+                result.ConnectionType = LightningConnectionType.Charge;
             }
             else if (!string.IsNullOrEmpty(uri.UserInfo))
             {
@@ -68,6 +335,7 @@ namespace BTCPayServer.Payments.Lightning
                 return false;
             }
             result.BaseUri = new UriBuilder(uri) { UserName = "", Password = "" }.Uri;
+            result.IsLegacy = true;
             connectionString = result;
             return true;
         }
@@ -80,15 +348,17 @@ 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
-            {
-                return BaseUri.Scheme == "http" || BaseUri.Scheme == "https" ? LightningConnectionType.Charge 
-                    : LightningConnectionType.CLightning;
-            }
+            get;
+            private set;
         }
+        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)
         {
@@ -101,10 +371,57 @@ namespace BTCPayServer.Payments.Lightning
                 return BaseUri;
             }
         }
-
+        static NBitcoin.DataEncoders.DataEncoder Encoder = NBitcoin.DataEncoders.Encoders.Hex;
         public override string ToString()
         {
-            return ToUri(true).AbsoluteUri;
+            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:
+                    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();
         }
     }
 }

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -15,6 +15,8 @@ namespace BTCPayServer.Payments.Lightning
 {
     public class LightningLikePaymentHandler : PaymentMethodHandlerBase<LightningSupportedPaymentMethod>
     {
+        public static int LIGHTNING_TIMEOUT = 5000;
+
         NBXplorerDashboard _Dashboard;
         LightningClientFactory _LightningClientFactory;
         public LightningLikePaymentHandler(
@@ -36,17 +38,25 @@ namespace BTCPayServer.Payments.Lightning
                 expiry = TimeSpan.FromSeconds(1);
 
             LightningInvoice lightningInvoice = null;
-            try
+
+            string description = storeBlob.LightningDescriptionTemplate;
+            description = description.Replace("{StoreName}", store.StoreName ?? "", StringComparison.OrdinalIgnoreCase)
+                                     .Replace("{ItemDescription}", invoice.ProductInformation.ItemDesc ?? "", StringComparison.OrdinalIgnoreCase)
+                                     .Replace("{OrderId}", invoice.OrderId ?? "", StringComparison.OrdinalIgnoreCase);
+            using (var cts = new CancellationTokenSource(LIGHTNING_TIMEOUT))
             {
-                string description = storeBlob.LightningDescriptionTemplate;
-                description = description.Replace("{StoreName}", store.StoreName ?? "", StringComparison.OrdinalIgnoreCase)
-                                         .Replace("{ItemDescription}", invoice.ProductInformation.ItemDesc ?? "", StringComparison.OrdinalIgnoreCase)
-                                         .Replace("{OrderId}", invoice.OrderId ?? "", StringComparison.OrdinalIgnoreCase);
-                lightningInvoice = await client.CreateInvoice(new LightMoney(due, LightMoneyUnit.BTC), description, expiry);
-            }
-            catch (Exception ex)
-            {
-                throw new PaymentMethodUnavailableException($"Impossible to create lightning invoice ({ex.Message})", ex);
+                try
+                {
+                    lightningInvoice = await client.CreateInvoice(new LightMoney(due, LightMoneyUnit.BTC), description, expiry, cts.Token);
+                }
+                catch (OperationCanceledException) when (cts.IsCancellationRequested)
+                {
+                    throw new PaymentMethodUnavailableException($"The lightning node did not replied in a timely maner");
+                }
+                catch (Exception ex)
+                {
+                    throw new PaymentMethodUnavailableException($"Impossible to create lightning invoice ({ex.Message})", ex);
+                }
             }
             var nodeInfo = await test;
             return new LightningLikePaymentMethodDetails()
@@ -62,34 +72,36 @@ namespace BTCPayServer.Payments.Lightning
             if (!_Dashboard.IsFullySynched(network.CryptoCode, out var summary))
                 throw new PaymentMethodUnavailableException($"Full node not available");
 
-            var cts = new CancellationTokenSource(5000);
-            var client = _LightningClientFactory.CreateClient(supportedPaymentMethod, network);
-            LightningNodeInformation info = null;
-            try
+            using (var cts = new CancellationTokenSource(LIGHTNING_TIMEOUT))
             {
-                info = await client.GetInfo(cts.Token);
-            }
-            catch (OperationCanceledException) when (cts.IsCancellationRequested)
-            {
-                throw new PaymentMethodUnavailableException($"The lightning node did not replied in a timely maner");
-            }
-            catch (Exception ex)
-            {
-                throw new PaymentMethodUnavailableException($"Error while connecting to the API ({ex.Message})");
-            }
+                var client = _LightningClientFactory.CreateClient(supportedPaymentMethod, network);
+                LightningNodeInformation info = null;
+                try
+                {
+                    info = await client.GetInfo(cts.Token);
+                }
+                catch (OperationCanceledException) when (cts.IsCancellationRequested)
+                {
+                    throw new PaymentMethodUnavailableException($"The lightning node did not replied in a timely maner");
+                }
+                catch (Exception ex)
+                {
+                    throw new PaymentMethodUnavailableException($"Error while connecting to the API ({ex.Message})");
+                }
 
-            if (info.Address == null)
-            {
-                throw new PaymentMethodUnavailableException($"No lightning node public address has been configured");
-            }
+                if (info.Address == null)
+                {
+                    throw new PaymentMethodUnavailableException($"No lightning node public address has been configured");
+                }
 
-            var blocksGap = Math.Abs(info.BlockHeight - summary.Status.ChainHeight);
-            if (blocksGap > 10)
-            {
-                throw new PaymentMethodUnavailableException($"The lightning is not synched ({blocksGap} blocks)");
-            }
+                var blocksGap = Math.Abs(info.BlockHeight - summary.Status.ChainHeight);
+                if (blocksGap > 10)
+                {
+                    throw new PaymentMethodUnavailableException($"The lightning is not synched ({blocksGap} blocks)");
+                }
 
-            return new NodeInfo(info.NodeId, info.Address, info.P2PPort);
+                return new NodeInfo(info.NodeId, info.Address, info.P2PPort);
+            }
         }
 
         public async Task TestConnection(NodeInfo nodeInfo, CancellationToken cancellation)

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -46,7 +46,7 @@ namespace BTCPayServer.Payments.Lightning
             {
                 if (inv.Name == "invoice_created")
                 {
-                    await EnsureListening(inv.InvoiceId, false);
+                    await EnsureListening(inv.Invoice.Id, false);
                 }
             }));
 
@@ -189,8 +189,12 @@ namespace BTCPayServer.Payments.Lightning
                 BOLT11 = notification.BOLT11,
                 Amount = notification.Amount
             }, network.CryptoCode, accounted: true);
-            if(payment != null)
-                _Aggregator.Publish(new InvoiceEvent(listenedInvoice.InvoiceId, 1002, "invoice_receivedPayment"));
+            if (payment != null)
+            {
+                var invoice = await _InvoiceRepository.GetInvoice(null, listenedInvoice.InvoiceId);
+                if(invoice != null)
+                    _Aggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1002, "invoice_receivedPayment"));
+            }
         }
 
         List<Task> _ListeningLightning = new List<Task>();

BTCPayServer/Payments/Lightning/LightningSupportedPaymentMethod.cs

@@ -8,18 +8,41 @@ 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
-            var fullUri = new UriBuilder(LightningChargeUrl) { UserName = Username, Password = Password }.Uri.AbsoluteUri;
-            if(!LightningConnectionString.TryParse(fullUri, out var connectionString, out var error))
+            if (!string.IsNullOrEmpty(LightningConnectionString))
             {
-                throw new FormatException(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;
             }
-            return connectionString;
 #pragma warning restore CS0618 // Type or member is obsolete
         }
 
@@ -29,16 +52,11 @@ namespace BTCPayServer.Payments.Lightning
                 throw new ArgumentNullException(nameof(connectionString));
 
 #pragma warning disable CS0618 // Type or member is obsolete
-            Username = connectionString.Username;
-            Password = connectionString.Password;
-            LightningChargeUrl = connectionString.BaseUri.AbsoluteUri;
+            LightningConnectionString = connectionString.ToString();
+            Username = null;
+            Password = null;
+            LightningChargeUrl = null;
 #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

@@ -0,0 +1,67 @@
+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

@@ -0,0 +1,227 @@
+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.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();
+            ManualResetEventSlim _Stopped = new ManualResetEventSlim(false);
+
+            public LndInvoiceClientSession(LndSwaggerClient parent)
+            {
+                _Parent = parent;
+            }
+
+            public async void StartListening()
+            {
+                var urlBuilder = new StringBuilder();
+                urlBuilder.Append(_Parent.BaseUrl).Append("/v1/invoices/subscribe");
+                try
+                {
+                    using (var client = _Parent.CreateHttpClient())
+                    {
+                        client.Timeout = TimeSpan.FromMilliseconds(Timeout.Infinite);
+
+                        var request = new HttpRequestMessage(HttpMethod.Get, urlBuilder.ToString());
+
+                        using (var response = await client.SendAsync(
+                            request, HttpCompletionOption.ResponseHeadersRead, _Cts.Token))
+                        {
+                            using (var body = await response.Content.ReadAsStreamAsync())
+                            using (var reader = new StreamReader(body))
+                            {
+                                while (!_Cts.IsCancellationRequested)
+                                {
+                                    string line = await reader.ReadLineAsync().WithCancellation(_Cts.Token);
+                                    if (line != null && line.StartsWith("{\"result\":", StringComparison.OrdinalIgnoreCase))
+                                    {
+                                        var invoiceString = JObject.Parse(line)["result"].ToString();
+                                        LnrpcInvoice parsedInvoice = _Parent.Deserialize<LnrpcInvoice>(invoiceString);
+                                        await _Invoices.Writer.WriteAsync(ConvertLndInvoice(parsedInvoice));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                catch when (_Cts.IsCancellationRequested)
+                {
+
+                }
+                finally
+                {
+                    _Stopped.Set();
+                }
+            }
+
+            public async Task<LightningInvoice> WaitInvoice(CancellationToken cancellation)
+            {
+                try
+                {
+                    return await _Invoices.Reader.ReadAsync(cancellation);
+                }
+                catch (ChannelClosedException)
+                {
+                    throw new TaskCanceledException();
+                }
+            }
+
+            public void Dispose()
+            {
+                _Cts.Cancel();
+                _Stopped.Wait();
+                _Invoices.Writer.Complete();
+            }
+        }
+
+
+        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
+            };
+
+
+            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;
+        }
+
+        public async Task<LightningInvoice> GetInvoice(string invoiceId, CancellationToken cancellation = default(CancellationToken))
+        {
+            var resp = await _rpcClient.LookupInvoiceAsync(invoiceId, null, cancellation);
+            return ConvertLndInvoice(resp);
+        }
+
+        public Task<ILightningListenInvoiceSession> Listen(CancellationToken cancellation = default(CancellationToken))
+        {
+            var session = new LndInvoiceClientSession(this._rpcClient);
+            session.StartListening();
+            return Task.FromResult<ILightningListenInvoiceSession>(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

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,84 @@
+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 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;
+        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);
+        }
+    }
+}

BTCPayServer/Program.cs

@@ -31,9 +31,14 @@ namespace BTCPayServer
             var logger = loggerFactory.CreateLogger("Configuration");
             try
             {
+                // This is the only way toat LoadArgs can print to console. Because LoadArgs is called by the HostBuilder before Logs.Configure is called
                 var conf = new DefaultConfiguration() { Logger = logger }.CreateConfiguration(args);
                 if (conf == null)
                     return;
+                Logs.Configure(loggerFactory);
+                new BTCPayServerOptions().LoadArgs(conf);
+                Logs.Configure(null);
+                /////
 
                 host = new WebHostBuilder()
                     .UseKestrel()
@@ -64,6 +69,8 @@ namespace BTCPayServer
             finally
             {
                 processor.Dispose();
+                if(host == null)
+                    Logs.Configuration.LogError("Configuration error");
                 if (host != null)
                     host.Dispose();
                 loggerProvider.Dispose();

BTCPayServer/Rating/ExchangeRates.cs

@@ -41,9 +41,9 @@ namespace BTCPayServer.Rating
             }
             else
             {
-                if (rate.Value.HasValue)
+                if (rate.BidAsk != null)
                 {
-                    _AllRates[key].Value = rate.Value;
+                    _AllRates[key].BidAsk = rate.BidAsk;
                 }
             }
         }
@@ -58,39 +58,175 @@ namespace BTCPayServer.Rating
             return GetEnumerator();
         }
 
-        public void SetRate(string exchangeName, CurrencyPair currencyPair, decimal value)
+        public void SetRate(string exchangeName, CurrencyPair currencyPair, BidAsk bidAsk)
         {
             if (ByExchange.TryGetValue(exchangeName, out var rates))
             {
                 var rate = rates.FirstOrDefault(r => r.CurrencyPair == currencyPair);
-                if (rate != null)
-                    rate.Value = value;
+                if(rate != null)
+                {
+                    rate.BidAsk = bidAsk;
+                }
+                var invPair = currencyPair.Inverse();
+                var invRate = rates.FirstOrDefault(r => r.CurrencyPair == invPair);
+                if (invRate != null)
+                {
+                    invRate.BidAsk = bidAsk?.Inverse();
+                }
             }
         }
-        public decimal? GetRate(string exchangeName, CurrencyPair currencyPair)
+        public BidAsk GetRate(string exchangeName, CurrencyPair currencyPair)
         {
             if (currencyPair.Left == currencyPair.Right)
-                return 1.0m;
+                return BidAsk.One;
             if (ByExchange.TryGetValue(exchangeName, out var rates))
             {
                 var rate = rates.FirstOrDefault(r => r.CurrencyPair == currencyPair);
                 if (rate != null)
-                    return rate.Value;
+                    return rate.BidAsk;
             }
             return null;
         }
     }
+    public class BidAsk
+    {
+
+        private readonly static BidAsk _One = new BidAsk(1.0m);
+        public static BidAsk One
+        {
+            get
+            {
+                return _One;
+            }
+        }
+
+        private readonly static BidAsk _Zero = new BidAsk(0.0m);
+        public static BidAsk Zero
+        {
+            get
+            {
+                return _Zero;
+            }
+        }
+        public BidAsk(decimal bid, decimal ask)
+        {
+            if (bid > ask)
+                throw new ArgumentException("the bid should be lower than ask", nameof(bid));
+            _Ask = ask;
+            _Bid = bid;
+        }
+        public BidAsk(decimal v) : this(v, v)
+        {
+
+        }
+
+        private readonly decimal _Bid;
+        public decimal Bid
+        {
+            get
+            {
+                return _Bid;
+            }
+        }
+
+
+        private readonly decimal _Ask;
+        public decimal Ask
+        {
+            get
+            {
+                return _Ask;
+            }
+        }
+        public BidAsk Inverse()
+        {
+            return new BidAsk(1.0m / Ask, 1.0m / Bid);
+        }
+
+        public static BidAsk operator +(BidAsk a, BidAsk b)
+        {
+            return new BidAsk(a.Bid + b.Bid, a.Ask + b.Ask);
+        }
+
+        public static BidAsk operator +(BidAsk a)
+        {
+            return new BidAsk(a.Bid, a.Ask);
+        }
+
+        public static BidAsk operator -(BidAsk a)
+        {
+            return new BidAsk(-a.Bid, -a.Ask);
+        }
+
+        public static BidAsk operator *(BidAsk a, BidAsk b)
+        {
+            return new BidAsk(a.Bid * b.Bid, a.Ask * b.Ask);
+        }
+
+        public static BidAsk operator /(BidAsk a, BidAsk b)
+        {
+            // This one is tricky.
+            // BTC_EUR = (6000, 6100)
+            // Implicit rule give
+            // EUR_BTC = 1 / BTC_EUR
+            // Or
+            // EUR_BTC = (1, 1) / BTC_EUR
+            // Naive calculation would give us ( 1/6000, 1/6100) = (0.000166, 0.000163)
+            // However, this is an invalid BidAsk!!! because 0.000166 > 0.000163
+            // So instead, we need to calculate (1/6100, 1/6000)
+            return new BidAsk(a.Bid / b.Ask, a.Ask / b.Bid);
+        }
+
+        public static BidAsk operator -(BidAsk a, BidAsk b)
+        {
+            return new BidAsk(a.Bid - b.Bid, a.Ask - b.Ask);
+        }
+
+
+        public override bool Equals(object obj)
+        {
+            BidAsk item = obj as BidAsk;
+            if (item == null)
+                return false;
+            return Bid == item.Bid && Ask == item.Ask;
+        }
+        public static bool operator ==(BidAsk a, BidAsk b)
+        {
+            if (System.Object.ReferenceEquals(a, b))
+                return true;
+            if (((object)a == null) || ((object)b == null))
+                return false;
+            return a.Bid == b.Bid && a.Ask == b.Ask;
+        }
+
+        public static bool operator !=(BidAsk a, BidAsk b)
+        {
+            return !(a == b);
+        }
+
+        public override int GetHashCode()
+        {
+            return ToString().GetHashCode(StringComparison.InvariantCulture);
+        }
+
+        public override string ToString()
+        {
+            if (Bid == Ask)
+                return Bid.ToString(CultureInfo.InvariantCulture);
+            return $"({Bid.ToString(CultureInfo.InvariantCulture)} , {Ask.ToString(CultureInfo.InvariantCulture)})";
+        }
+    }
     public class ExchangeRate
     {
         public string Exchange { get; set; }
         public CurrencyPair CurrencyPair { get; set; }
-        public decimal? Value { get; set; }
+        public BidAsk BidAsk { get; set; }
 
         public override string ToString()
         {
-            if (Value == null)
+            if (BidAsk == null)
                 return $"{Exchange}({CurrencyPair})";
-            return $"{Exchange}({CurrencyPair}) == {Value.Value.ToString(CultureInfo.InvariantCulture)}";
+            return $"{Exchange}({CurrencyPair}) == {BidAsk.ToString()}";
         }
     }
 }

BTCPayServer/Rating/RateRules.cs

@@ -18,6 +18,7 @@ namespace BTCPayServer.Rating
         UnsupportedOperator,
         MissingArgument,
         DivideByZero,
+        InvalidNegative,
         PreprocessError,
         RateUnavailable,
         InvalidExchangeName,
@@ -139,7 +140,7 @@ namespace BTCPayServer.Rating
             }
             return new RateRule(this, currencyPair, candidate);
         }
-        
+
         public ExpressionSyntax FindBestCandidate(CurrencyPair p)
         {
             var invP = p.Inverse();
@@ -147,9 +148,9 @@ namespace BTCPayServer.Rating
             foreach (var pair in new[]
             {
                 (Pair: p, Priority: 0, Inverse: false),
-                (Pair: new CurrencyPair(p.Left, "X"), Priority: 1, Inverse: false),
-                (Pair: new CurrencyPair("X", p.Right), Priority: 1, Inverse: false),
-                (Pair: invP, Priority: 2, Inverse: true),
+                (Pair: invP, Priority: 1, Inverse: true),
+                (Pair: new CurrencyPair(p.Left, "X"), Priority: 2, Inverse: false),
+                (Pair: new CurrencyPair("X", p.Right), Priority: 2, Inverse: false),
                 (Pair: new CurrencyPair(invP.Left, "X"), Priority: 3, Inverse: true),
                 (Pair: new CurrencyPair("X", invP.Right), Priority: 3, Inverse: true),
                 (Pair: new CurrencyPair("X", "X"), Priority: 4, Inverse: false)
@@ -216,8 +217,7 @@ namespace BTCPayServer.Rating
                     }
                     else
                     {
-                        var token = SyntaxFactory.ParseToken(rate.Value.ToString(CultureInfo.InvariantCulture));
-                        return SyntaxFactory.LiteralExpression(SyntaxKind.NumericLiteralExpression, token);
+                        return RateRules.CreateExpression(rate.ToString());
                     }
                 }
             }
@@ -225,7 +225,7 @@ namespace BTCPayServer.Rating
 
         class CalculateWalker : CSharpSyntaxWalker
         {
-            public Stack<decimal> Values = new Stack<decimal>();
+            public Stack<BidAsk> Values = new Stack<BidAsk>();
             public List<RateRulesErrors> Errors = new List<RateRulesErrors>();
 
             public override void VisitPrefixUnaryExpression(PrefixUnaryExpressionSyntax node)
@@ -254,7 +254,15 @@ namespace BTCPayServer.Rating
                 switch (node.Kind())
                 {
                     case SyntaxKind.UnaryMinusExpression:
-                        Values.Push(-Values.Pop());
+                        var v = Values.Pop();
+                        if(v.Bid == v.Ask)
+                        {
+                            Values.Push(-v);
+                        }
+                        else
+                        {
+                            Errors.Add(RateRulesErrors.InvalidNegative);
+                        }
                         break;
                     case SyntaxKind.UnaryPlusExpression:
                         Values.Push(+Values.Pop());
@@ -299,7 +307,7 @@ namespace BTCPayServer.Rating
                         Values.Push(a * b);
                         break;
                     case SyntaxKind.DivideExpression:
-                        if (b == decimal.Zero)
+                        if (a.Ask == decimal.Zero || b.Ask == decimal.Zero)
                         {
                             Errors.Add(RateRulesErrors.DivideByZero);
                         }
@@ -309,19 +317,48 @@ namespace BTCPayServer.Rating
                         }
                         break;
                     case SyntaxKind.SubtractExpression:
-                        Values.Push(a - b);
+                        if (b.Bid == b.Ask)
+                        {
+                            Values.Push(a - b);
+                        }
+                        else
+                        {
+                            Errors.Add(RateRulesErrors.InvalidNegative);
+                        }
                         break;
                     default:
                         throw new NotSupportedException("Should never happen");
                 }
             }
 
+            Stack<decimal> _TupleValues = null;
+            public override void VisitTupleExpression(TupleExpressionSyntax node)
+            {
+                _TupleValues = new Stack<decimal>();
+                base.VisitTupleExpression(node);
+                if(_TupleValues.Count != 2)
+                {
+                    Errors.Add(RateRulesErrors.MissingArgument);
+                }
+                else
+                {
+                    var ask = _TupleValues.Pop();
+                    var bid = _TupleValues.Pop();
+                    Values.Push(new BidAsk(bid, ask));
+                }
+                _TupleValues = null;
+            }
+
             public override void VisitLiteralExpression(LiteralExpressionSyntax node)
             {
                 switch (node.Kind())
                 {
                     case SyntaxKind.NumericLiteralExpression:
-                        Values.Push(decimal.Parse(node.ToString(), CultureInfo.InvariantCulture));
+                        var v = decimal.Parse(node.ToString(), CultureInfo.InvariantCulture);
+                        if (_TupleValues == null)
+                            Values.Push(new BidAsk(v));
+                        else
+                            _TupleValues.Push(v);
                         break;
                 }
             }
@@ -347,17 +384,23 @@ namespace BTCPayServer.Rating
         class FlattenExpressionRewriter : CSharpSyntaxRewriter
         {
             RateRules parent;
+            CurrencyPair pair;
+            int nested = 0;
             public FlattenExpressionRewriter(RateRules parent, CurrencyPair pair)
             {
-                Context.Push(pair);
+                this.pair = pair;
                 this.parent = parent;
             }
 
             public ExchangeRates ExchangeRates = new ExchangeRates();
-            public Stack<CurrencyPair> Context { get; set; } = new Stack<CurrencyPair>();
             bool IsInvocation;
             public override SyntaxNode VisitInvocationExpression(InvocationExpressionSyntax node)
             {
+                if (IsInvocation)
+                {
+                    Errors.Add(RateRulesErrors.InvalidCurrencyIdentifier);
+                    return RateRules.CreateExpression($"ERR_INVALID_CURRENCY_PAIR({node.ToString()})");
+                }
                 IsInvocation = true;
                 _ExchangeName = node.Expression.ToString();
                 var result = base.VisitInvocationExpression(node);
@@ -365,18 +408,27 @@ namespace BTCPayServer.Rating
                 return result;
             }
 
+            bool IsArgumentList;
+            public override SyntaxNode VisitArgumentList(ArgumentListSyntax node)
+            {
+                IsArgumentList = true;
+                var result = base.VisitArgumentList(node);
+                IsArgumentList = false;
+                return result;
+            }
+
             string _ExchangeName = null;
 
             public List<RateRulesErrors> Errors = new List<RateRulesErrors>();
             const int MaxNestedCount = 8;
             public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
             {
-                if (CurrencyPair.TryParse(node.Identifier.ValueText, out var currentPair))
+                if (
+                    (!IsInvocation || IsArgumentList) &&
+                    CurrencyPair.TryParse(node.Identifier.ValueText, out var currentPair))
                 {
-                    var ctx = Context.Peek();
-
-                    var replacedPair = new CurrencyPair(left: currentPair.Left == "X" ? ctx.Left : currentPair.Left,
-                                                       right: currentPair.Right == "X" ? ctx.Right : currentPair.Right);
+                    var replacedPair = new CurrencyPair(left: currentPair.Left == "X" ? pair.Left : currentPair.Left,
+                                                       right: currentPair.Right == "X" ? pair.Right : currentPair.Right);
                     if (IsInvocation) // eg. replace bittrex(BTC_X) to bittrex(BTC_USD)
                     {
                         ExchangeRates.Add(new ExchangeRate() { CurrencyPair = replacedPair, Exchange = _ExchangeName });
@@ -385,13 +437,13 @@ namespace BTCPayServer.Rating
                     else // eg. replace BTC_X to BTC_USD, then replace by the expression for BTC_USD
                     {
                         var bestCandidate = parent.FindBestCandidate(replacedPair);
-                        if (Context.Count > MaxNestedCount)
+                        if (nested > MaxNestedCount)
                         {
                             Errors.Add(RateRulesErrors.TooMuchNestedCalls);
                             return RateRules.CreateExpression($"ERR_TOO_MUCH_NESTED_CALLS({replacedPair})");
                         }
-                        Context.Push(replacedPair);
-                        var replaced = Visit(bestCandidate);
+                        var innerFlatten = CreateNewContext(replacedPair);
+                        var replaced = innerFlatten.Visit(bestCandidate);
                         if (replaced is ExpressionSyntax expression)
                         {
                             var hasBinaryOps = new HasBinaryOperations();
@@ -401,7 +453,6 @@ namespace BTCPayServer.Rating
                                 replaced = SyntaxFactory.ParenthesizedExpression(expression);
                             }
                         }
-                        Context.Pop();
                         if (Errors.Contains(RateRulesErrors.TooMuchNestedCalls))
                         {
                             return RateRules.CreateExpression($"ERR_TOO_MUCH_NESTED_CALLS({replacedPair})");
@@ -411,16 +462,37 @@ namespace BTCPayServer.Rating
                 }
                 return base.VisitIdentifierName(node);
             }
+
+            private FlattenExpressionRewriter CreateNewContext(CurrencyPair pair)
+            {
+                return new FlattenExpressionRewriter(parent, pair)
+                {
+                    Errors = Errors,
+                    nested = nested + 1,
+                    ExchangeRates = ExchangeRates,
+                };
+            }
         }
         private SyntaxNode expression;
         FlattenExpressionRewriter flatten;
 
         public RateRule(RateRules parent, CurrencyPair currencyPair, SyntaxNode candidate)
         {
+            _CurrencyPair = currencyPair;
             flatten = new FlattenExpressionRewriter(parent, currencyPair);
             this.expression = flatten.Visit(candidate);
         }
 
+
+        private readonly CurrencyPair _CurrencyPair;
+        public CurrencyPair CurrencyPair
+        {
+            get
+            {
+                return _CurrencyPair;
+            }
+        }
+
         public ExchangeRates ExchangeRates
         {
             get
@@ -452,7 +524,7 @@ namespace BTCPayServer.Rating
                 Errors.AddRange(calculate.Errors);
                 return false;
             }
-            _Value = calculate.Values.Pop();
+            _Value = calculate.Values.Pop().Bid;
             _EvaluatedNode = result;
             return true;
         }

BTCPayServer/Security/BitpayAuthentication.cs

@@ -0,0 +1,247 @@
+using System;
+using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Http.Extensions;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+using BTCPayServer.Authentication;
+using BTCPayServer.Models;
+using BTCPayServer.Services;
+using BTCPayServer.Services.Stores;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Options;
+using NBitcoin;
+using NBitcoin.DataEncoders;
+using NBitpayClient;
+using NBitpayClient.Extensions;
+using Newtonsoft.Json.Linq;
+using BTCPayServer.Logging;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Authentication;
+using System.Text.Encodings.Web;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BTCPayServer.Security
+{
+    public class BitpayAuthentication
+    {
+        public class BitpayAuthOptions : AuthenticationSchemeOptions
+        {
+
+        }
+        class BitpayAuthHandler : AuthenticationHandler<BitpayAuthOptions>
+        {
+            StoreRepository _StoreRepository;
+            TokenRepository _TokenRepository;
+            public BitpayAuthHandler(
+                TokenRepository tokenRepository,
+                StoreRepository storeRepository,
+                IOptionsMonitor<BitpayAuthOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
+            {
+                _TokenRepository = tokenRepository;
+                _StoreRepository = storeRepository;
+            }
+
+            protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
+            {
+                if (Context.Request.HttpContext.GetIsBitpayAPI())
+                {
+                    List<Claim> claims = new List<Claim>();
+                    var bitpayAuth = Context.Request.HttpContext.GetBitpayAuth();
+                    string storeId = null;
+                    // Careful, those are not the opposite. failedAuth says if a the tentative failed.
+                    // successAuth, ensure that at least one succeed.
+                    var failedAuth = false;
+                    var successAuth = false;
+                    if (!string.IsNullOrEmpty(bitpayAuth.Signature) && !string.IsNullOrEmpty(bitpayAuth.Id))
+                    {
+                        var result = await CheckBitId(Context.Request.HttpContext, bitpayAuth.Signature, bitpayAuth.Id, claims);
+                        storeId = result.StoreId;
+                        failedAuth = !result.SuccessAuth;
+                        successAuth = result.SuccessAuth;
+                    }
+                    else if (!string.IsNullOrEmpty(bitpayAuth.Authorization))
+                    {
+                        storeId = await CheckLegacyAPIKey(Context.Request.HttpContext, bitpayAuth.Authorization);
+                        if (storeId == null)
+                        {
+                            Logs.PayServer.LogDebug("API key check failed");
+                            failedAuth = true;
+                        }
+                        successAuth = storeId != null;
+                    }
+
+                    if (failedAuth)
+                    {
+                        return AuthenticateResult.Fail("Invalid credentials");
+                    }
+
+                    if (successAuth)
+                    {
+                        if (storeId != null)
+                        {
+                            claims.Add(new Claim(Policies.CanUseStore.Key, storeId));
+                            var store = await _StoreRepository.FindStore(storeId);
+                            Context.Request.HttpContext.SetStoreData(store);
+                        }
+                        return AuthenticateResult.Success(new AuthenticationTicket(new ClaimsPrincipal(new ClaimsIdentity(claims, Policies.BitpayAuthentication)), Policies.BitpayAuthentication));
+                    }
+                }
+                return AuthenticateResult.NoResult();
+            }
+
+            private async Task<(string StoreId, bool SuccessAuth)> CheckBitId(HttpContext httpContext, string sig, string id, List<Claim> claims)
+            {
+                httpContext.Request.EnableRewind();
+
+                string storeId = null;
+                string body = string.Empty;
+                if (httpContext.Request.ContentLength != 0 && httpContext.Request.Body != null)
+                {
+                    using (StreamReader reader = new StreamReader(httpContext.Request.Body, Encoding.UTF8, true, 1024, true))
+                    {
+                        body = reader.ReadToEnd();
+                    }
+                    httpContext.Request.Body.Position = 0;
+                }
+
+                var url = httpContext.Request.GetEncodedUrl();
+                try
+                {
+                    var key = new PubKey(id);
+                    if (BitIdExtensions.CheckBitIDSignature(key, sig, url, body))
+                    {
+                        var sin = key.GetBitIDSIN();
+                        claims.Add(new Claim(Claims.SIN, sin));
+
+                        string token = null;
+                        if (httpContext.Request.Query.TryGetValue("token", out var tokenValues))
+                        {
+                            token = tokenValues[0];
+                        }
+
+                        if (token == null && !String.IsNullOrEmpty(body) && httpContext.Request.Method == "POST")
+                        {
+                            try
+                            {
+                                token = JObject.Parse(body)?.Property("token")?.Value?.Value<string>();
+                            }
+                            catch { }
+                        }
+
+                        if (token != null)
+                        {
+                            var bitToken = await GetTokenPermissionAsync(sin, token);
+                            if (bitToken == null)
+                            {
+                                return (null, false);
+                            }
+                            storeId = bitToken.StoreId;
+                        }
+                    }
+                }
+                catch (FormatException) { }
+                return (storeId, true);
+            }
+
+            private async Task<string> CheckLegacyAPIKey(HttpContext httpContext, string auth)
+            {
+                var splitted = auth.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+                if (splitted.Length != 2 || !splitted[0].Equals("Basic", StringComparison.OrdinalIgnoreCase))
+                {
+                    return null;
+                }
+
+                string apiKey = null;
+                try
+                {
+                    apiKey = Encoders.ASCII.EncodeData(Encoders.Base64.DecodeData(splitted[1]));
+                }
+                catch
+                {
+                    return null;
+                }
+                return await _TokenRepository.GetStoreIdFromAPIKey(apiKey);
+            }
+
+            private async Task<BitTokenEntity> GetTokenPermissionAsync(string sin, string expectedToken)
+            {
+                var actualTokens = (await _TokenRepository.GetTokens(sin)).ToArray();
+                actualTokens = actualTokens.SelectMany(t => GetCompatibleTokens(t)).ToArray();
+
+                var actualToken = actualTokens.FirstOrDefault(a => a.Value.Equals(expectedToken, StringComparison.Ordinal));
+                if (expectedToken == null || actualToken == null)
+                {
+                    Logs.PayServer.LogDebug($"No token found for facade {Facade.Merchant} for SIN {sin}");
+                    return null;
+                }
+                return actualToken;
+            }
+
+            private IEnumerable<BitTokenEntity> GetCompatibleTokens(BitTokenEntity token)
+            {
+                if (token.Facade == Facade.Merchant.ToString())
+                {
+                    yield return token.Clone(Facade.User);
+                    yield return token.Clone(Facade.PointOfSale);
+                }
+                if (token.Facade == Facade.PointOfSale.ToString())
+                {
+                    yield return token.Clone(Facade.User);
+                }
+                yield return token;
+            }
+
+            private bool IsBitpayAPI(HttpContext httpContext, bool bitpayAuth)
+            {
+                if (!httpContext.Request.Path.HasValue)
+                    return false;
+
+                var isJson = (httpContext.Request.ContentType ?? string.Empty).StartsWith("application/json", StringComparison.OrdinalIgnoreCase);
+                var path = httpContext.Request.Path.Value;
+                if (
+                    bitpayAuth &&
+                    path == "/invoices" &&
+                  httpContext.Request.Method == "POST" &&
+                  isJson)
+                    return true;
+
+                if (
+                    bitpayAuth &&
+                    path == "/invoices" &&
+                  httpContext.Request.Method == "GET")
+                    return true;
+
+                if (
+                    path.StartsWith("/invoices/", StringComparison.OrdinalIgnoreCase) &&
+                    httpContext.Request.Method == "GET" &&
+                    (isJson || httpContext.Request.Query.ContainsKey("token")))
+                    return true;
+
+                if (path.Equals("/rates", StringComparison.OrdinalIgnoreCase) &&
+                    httpContext.Request.Method == "GET")
+                    return true;
+
+                if (
+                    path.Equals("/tokens", StringComparison.Ordinal) &&
+                    (httpContext.Request.Method == "GET" || httpContext.Request.Method == "POST"))
+                    return true;
+
+                return false;
+            }
+        }
+        internal static void AddAuthentication(IServiceCollection services, Action<BitpayAuthOptions> bitpayAuth = null)
+        {
+            bitpayAuth = bitpayAuth ?? new Action<BitpayAuthOptions>((o) => { });
+            services.AddAuthentication().AddScheme<BitpayAuthOptions, BitpayAuthHandler>(Policies.BitpayAuthentication, bitpayAuth);
+        }
+    }
+}

BTCPayServer/Security/BitpayClaimsFilter.cs

@@ -1,196 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Routing;
-using Microsoft.AspNetCore.Http.Extensions;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using BTCPayServer.Authentication;
-using BTCPayServer.Models;
-using BTCPayServer.Services;
-using BTCPayServer.Services.Stores;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.Extensions.Options;
-using NBitcoin;
-using NBitcoin.DataEncoders;
-using NBitpayClient;
-using NBitpayClient.Extensions;
-using Newtonsoft.Json.Linq;
-using BTCPayServer.Logging;
-using Microsoft.AspNetCore.Http.Internal;
-
-namespace BTCPayServer.Security
-{
-    public class BitpayClaimsFilter : IAsyncAuthorizationFilter, IConfigureOptions<MvcOptions>
-    {
-        UserManager<ApplicationUser> _UserManager;
-        StoreRepository _StoreRepository;
-        TokenRepository _TokenRepository;
-
-        public BitpayClaimsFilter(
-            UserManager<ApplicationUser> userManager,
-            TokenRepository tokenRepository,
-            StoreRepository storeRepository)
-        {
-            _UserManager = userManager;
-            _StoreRepository = storeRepository;
-            _TokenRepository = tokenRepository;
-        }
-
-        void IConfigureOptions<MvcOptions>.Configure(MvcOptions options)
-        {
-            options.Filters.Add(typeof(BitpayClaimsFilter));
-        }
-
-        public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
-        {
-            var principal = context.HttpContext.User;
-            if (context.HttpContext.GetIsBitpayAPI())
-            {
-                var bitpayAuth = context.HttpContext.GetBitpayAuth();
-                string storeId = null;
-                var failedAuth = false;
-                if (!string.IsNullOrEmpty(bitpayAuth.Signature) && !string.IsNullOrEmpty(bitpayAuth.Id))
-                {
-                    storeId = await CheckBitId(context.HttpContext, bitpayAuth.Signature, bitpayAuth.Id);
-                    if (!context.HttpContext.User.Claims.Any(c => c.Type == Claims.SIN))
-                    {
-                        Logs.PayServer.LogDebug("BitId signature check failed");
-                        failedAuth = true;
-                    }
-                }
-                else if (!string.IsNullOrEmpty(bitpayAuth.Authorization))
-                {
-                    storeId = await CheckLegacyAPIKey(context.HttpContext, bitpayAuth.Authorization);
-                    if (storeId == null)
-                    {
-                        Logs.PayServer.LogDebug("API key check failed");
-                        failedAuth = true;
-                    }
-                }
-
-                if (storeId != null)
-                {
-                    var identity = ((ClaimsIdentity)context.HttpContext.User.Identity);
-                    identity.AddClaim(new Claim(Policies.CanUseStore.Key, storeId));
-                    var store = await _StoreRepository.FindStore(storeId);
-                    context.HttpContext.SetStoreData(store);
-                }
-                else if (failedAuth)
-                {
-                    throw new BitpayHttpException(401, "Invalid credentials");
-                }
-            }
-        }
-
-        private async Task<string> CheckBitId(HttpContext httpContext, string sig, string id)
-        {
-            httpContext.Request.EnableRewind();
-
-            string storeId = null;
-            string body = string.Empty;
-            if (httpContext.Request.ContentLength != 0 && httpContext.Request.Body != null)
-            {
-                using (StreamReader reader = new StreamReader(httpContext.Request.Body, Encoding.UTF8, true, 1024, true))
-                {
-                    body = reader.ReadToEnd();
-                }
-                httpContext.Request.Body.Position = 0;
-            }
-
-            var url = httpContext.Request.GetEncodedUrl();
-            try
-            {
-                var key = new PubKey(id);
-                if (BitIdExtensions.CheckBitIDSignature(key, sig, url, body))
-                {
-                    var sin = key.GetBitIDSIN();
-                    var identity = ((ClaimsIdentity)httpContext.User.Identity);
-                    identity.AddClaim(new Claim(Claims.SIN, sin));
-
-                    string token = null;
-                    if (httpContext.Request.Query.TryGetValue("token", out var tokenValues))
-                    {
-                        token = tokenValues[0];
-                    }
-
-                    if (token == null && !String.IsNullOrEmpty(body) && httpContext.Request.Method == "POST")
-                    {
-                        try
-                        {
-                            token = JObject.Parse(body)?.Property("token")?.Value?.Value<string>();
-                        }
-                        catch { }
-                    }
-
-                    if (token != null)
-                    {
-                        var bitToken = await GetTokenPermissionAsync(sin, token);
-                        if (bitToken == null)
-                        {
-                            return null;
-                        }
-                        storeId = bitToken.StoreId;
-                    }
-                }
-            }
-            catch (FormatException) { }
-            return storeId;
-        }
-
-        private async Task<string> CheckLegacyAPIKey(HttpContext httpContext, string auth)
-        {
-            var splitted = auth.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-            if (splitted.Length != 2 || !splitted[0].Equals("Basic", StringComparison.OrdinalIgnoreCase))
-            {
-                return null;
-            }
-
-            string apiKey = null;
-            try
-            {
-                apiKey = Encoders.ASCII.EncodeData(Encoders.Base64.DecodeData(splitted[1]));
-            }
-            catch
-            {
-                return null;
-            }
-            return await _TokenRepository.GetStoreIdFromAPIKey(apiKey);
-        }
-
-        private async Task<BitTokenEntity> GetTokenPermissionAsync(string sin, string expectedToken)
-        {
-            var actualTokens = (await _TokenRepository.GetTokens(sin)).ToArray();
-            actualTokens = actualTokens.SelectMany(t => GetCompatibleTokens(t)).ToArray();
-
-            var actualToken = actualTokens.FirstOrDefault(a => a.Value.Equals(expectedToken, StringComparison.Ordinal));
-            if (expectedToken == null || actualToken == null)
-            {
-                Logs.PayServer.LogDebug($"No token found for facade {Facade.Merchant} for SIN {sin}");
-                return null;
-            }
-            return actualToken;
-        }
-
-        private IEnumerable<BitTokenEntity> GetCompatibleTokens(BitTokenEntity token)
-        {
-            if (token.Facade == Facade.Merchant.ToString())
-            {
-                yield return token.Clone(Facade.User);
-                yield return token.Clone(Facade.PointOfSale);
-            }
-            if (token.Facade == Facade.PointOfSale.ToString())
-            {
-                yield return token.Clone(Facade.User);
-            }
-            yield return token;
-        }
-    }
-}

BTCPayServer/Security/Policies.cs

@@ -8,6 +8,7 @@ namespace BTCPayServer.Security
 {
     public static class Policies
     {
+        public const string BitpayAuthentication = "Bitpay.Auth";
         public const string CookieAuthentication = "Identity.Application";
         public static AuthorizationOptions AddBTCPayPolicies(this AuthorizationOptions options)
         {

BTCPayServer/Services/HardwareWalletService.cs

@@ -20,9 +20,9 @@ namespace BTCPayServer.Services
         public HardwareWalletException(string message) : base(message) { }
         public HardwareWalletException(string message, Exception inner) : base(message, inner) { }
     }
-    public class HardwareWalletService
+    public class HardwareWalletService : IDisposable
     {
-        class WebSocketTransport : LedgerWallet.Transports.ILedgerTransport
+        class WebSocketTransport : LedgerWallet.Transports.ILedgerTransport, IDisposable
         {
             private readonly WebSocket webSocket;
 
@@ -33,26 +33,40 @@ namespace BTCPayServer.Services
                 this.webSocket = webSocket;
             }
 
+            SemaphoreSlim _Semaphore = new SemaphoreSlim(1, 1);
             public TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(10);
             public async Task<byte[][]> Exchange(byte[][] apdus)
             {
+                await _Semaphore.WaitAsync();
                 List<byte[]> responses = new List<byte[]>();
-                using (CancellationTokenSource cts = new CancellationTokenSource(Timeout))
+                try
                 {
-                    foreach (var apdu in apdus)
+                    using (CancellationTokenSource cts = new CancellationTokenSource(Timeout))
                     {
-                        await this.webSocket.SendAsync(new ArraySegment<byte>(apdu), WebSocketMessageType.Binary, true, cts.Token);
-                    }
-                    foreach (var apdu in apdus)
-                    {
-                        byte[] response = new byte[300];
-                        var result = await this.webSocket.ReceiveAsync(new ArraySegment<byte>(response), cts.Token);
-                        Array.Resize(ref response, result.Count);
-                        responses.Add(response);
+                        foreach (var apdu in apdus)
+                        {
+                            await this.webSocket.SendAsync(new ArraySegment<byte>(apdu), WebSocketMessageType.Binary, true, cts.Token);
+                        }
+                        foreach (var apdu in apdus)
+                        {
+                            byte[] response = new byte[300];
+                            var result = await this.webSocket.ReceiveAsync(new ArraySegment<byte>(response), cts.Token);
+                            Array.Resize(ref response, result.Count);
+                            responses.Add(response);
+                        }
                     }
                 }
+                finally
+                {
+                    _Semaphore.Release();
+                }
                 return responses.ToArray();
             }
+
+            public void Dispose()
+            {
+                _Semaphore.Dispose();
+            }
         }
 
         private readonly LedgerClient _Ledger;
@@ -121,7 +135,7 @@ namespace BTCPayServer.Services
         public async Task<KeyPath> GetKeyPath(BTCPayNetwork network, DirectDerivationStrategy directStrategy)
         {
             List<KeyPath> derivations = new List<KeyPath>();
-            if(network.NBitcoinNetwork.Consensus.SupportSegwit)
+            if (network.NBitcoinNetwork.Consensus.SupportSegwit)
                 derivations.Add(new KeyPath("49'"));
             derivations.Add(new KeyPath("44'"));
             KeyPath foundKeyPath = null;
@@ -155,6 +169,12 @@ namespace BTCPayServer.Services
             _Transport.Timeout = TimeSpan.FromMinutes(5);
             return await Ledger.SignTransactionAsync(signatureRequests, unsigned, changeKeyPath);
         }
+
+        public void Dispose()
+        {
+            if(_Transport != null)
+                _Transport.Dispose();
+        }
     }
 
     public class LedgerTestResult

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -12,6 +12,8 @@ using NBXplorer.Models;
 using NBXplorer;
 using NBXplorer.DerivationStrategy;
 using BTCPayServer.Payments;
+using NBitpayClient;
+using BTCPayServer.Payments.Bitcoin;
 
 namespace BTCPayServer.Services.Invoices
 {
@@ -336,19 +338,34 @@ namespace BTCPayServer.Services.Invoices
                 ExpirationTime = ExpirationTime,
                 Status = Status,
                 Currency = ProductInformation.Currency,
-                Flags = new Flags() { Refundable = Refundable }
+                Flags = new Flags() { Refundable = Refundable },
+                PaymentSubtotals = new Dictionary<string, long>(),
+                PaymentTotals = new Dictionary<string, long>(),
+                SupportedTransactionCurrencies = new Dictionary<string, InvoiceSupportedTransactionCurrency>(),
+                Addresses = new Dictionary<string, string>(),
+                PaymentCodes = new Dictionary<string, InvoicePaymentUrls>(),
+                ExchangeRates = new Dictionary<string, Dictionary<string, decimal>>()
             };
 
             dto.Url = ServerUrl.WithTrailingSlash() + $"invoice?id=" + Id;
             dto.CryptoInfo = new List<NBitpayClient.InvoiceCryptoInfo>();
+            dto.MinerFees = new Dictionary<string, MinerFeeInfo>();
             foreach (var info in this.GetPaymentMethods(networkProvider))
             {
                 var accounting = info.Calculate();
                 var cryptoInfo = new NBitpayClient.InvoiceCryptoInfo();
-                cryptoInfo.CryptoCode = info.GetId().CryptoCode;
+                var subtotalPrice = accounting.TotalDue - accounting.NetworkFee;
+                var cryptoCode = info.GetId().CryptoCode;
+                var address = info.GetPaymentMethodDetails()?.GetPaymentDestination();
+                var exrates = new Dictionary<string, decimal>
+                {
+                    { ProductInformation.Currency, cryptoInfo.Rate }
+                };
+
+                cryptoInfo.CryptoCode = cryptoCode;
                 cryptoInfo.PaymentType = info.GetId().PaymentType.ToString();
                 cryptoInfo.Rate = info.Rate;
-                cryptoInfo.Price = (accounting.TotalDue - accounting.NetworkFee).ToString();
+                cryptoInfo.Price = subtotalPrice.ToString();
 
                 cryptoInfo.Due = accounting.Due.ToString();
                 cryptoInfo.Paid = accounting.Paid.ToString();
@@ -357,17 +374,19 @@ namespace BTCPayServer.Services.Invoices
                 cryptoInfo.TxCount = accounting.TxCount;
                 cryptoInfo.CryptoPaid = accounting.CryptoPaid.ToString();
 
-                cryptoInfo.Address = info.GetPaymentMethodDetails()?.GetPaymentDestination();
-                cryptoInfo.ExRates = new Dictionary<string, decimal>
-                {
-                    { ProductInformation.Currency, cryptoInfo.Rate }
-                };
+                cryptoInfo.Address = address;
+
+                cryptoInfo.ExRates = exrates;
                 var paymentId = info.GetId();
                 var scheme = info.Network.UriScheme;
                 cryptoInfo.Url = ServerUrl.WithTrailingSlash() + $"i/{paymentId}/{Id}";
 
                 if (paymentId.PaymentType == PaymentTypes.BTCLike)
                 {
+                    var minerInfo = new MinerFeeInfo();
+                    minerInfo.TotalFee = accounting.NetworkFee.Satoshi;
+                    minerInfo.SatoshiPerBytes = ((BitcoinLikeOnChainPaymentMethod)info.GetPaymentMethodDetails()).FeeRate.GetFee(1).Satoshi;
+                    dto.MinerFees.TryAdd(paymentId.CryptoCode, minerInfo);
                     var cryptoSuffix = cryptoInfo.CryptoCode == "BTC" ? "" : "/" + cryptoInfo.CryptoCode;
                     cryptoInfo.PaymentUrls = new NBitpayClient.InvoicePaymentUrls()
                     {
@@ -377,7 +396,7 @@ namespace BTCPayServer.Services.Invoices
                         BIP21 = $"{scheme}:{cryptoInfo.Address}?amount={cryptoInfo.Due}",
                     };
                 }
-                
+
                 if (paymentId.PaymentType == PaymentTypes.LightningLike)
                 {
                     cryptoInfo.PaymentUrls = new NBitpayClient.InvoicePaymentUrls()
@@ -396,10 +415,23 @@ namespace BTCPayServer.Services.Invoices
                     dto.BTCDue = cryptoInfo.Due;
                     dto.PaymentUrls = cryptoInfo.PaymentUrls;
                 }
+
 #pragma warning restore CS0618
                 dto.CryptoInfo.Add(cryptoInfo);
+
+                dto.PaymentCodes.Add(paymentId.ToString(), cryptoInfo.PaymentUrls);
+                dto.PaymentSubtotals.Add(paymentId.ToString(), subtotalPrice.Satoshi);
+                dto.PaymentTotals.Add(paymentId.ToString(), accounting.TotalDue.Satoshi);
+                dto.SupportedTransactionCurrencies.TryAdd(cryptoCode, new InvoiceSupportedTransactionCurrency()
+                {
+                    Enabled = true
+                });
+                dto.Addresses.Add(paymentId.ToString(), address);
+                dto.ExchangeRates.TryAdd(cryptoCode, exrates);
             }
 
+            //dto.AmountPaid dto.MinerFees & dto.TransactionCurrency are not supported by btcpayserver as we have multi currency payment support per invoice
+
             Populate(ProductInformation, dto);
             Populate(BuyerInformation, dto);
 

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -112,7 +112,7 @@ namespace BTCPayServer.Services.Invoices
             invoice.StoreId = storeId;
             using (var context = _ContextFactory.CreateContext())
             {
-                context.Invoices.Add(new InvoiceData()
+                context.Invoices.Add(new Data.InvoiceData()
                 {
                     StoreDataId = storeId,
                     Id = invoice.Id,
@@ -267,7 +267,7 @@ namespace BTCPayServer.Services.Invoices
         {
             using (var context = _ContextFactory.CreateContext())
             {
-                var invoiceData = await context.FindAsync<InvoiceData>(invoiceId).ConfigureAwait(false);
+                var invoiceData = await context.FindAsync<Data.InvoiceData>(invoiceId).ConfigureAwait(false);
                 if (invoiceData == null)
                     return;
                 var invoiceEntity = ToObject<InvoiceEntity>(invoiceData.Blob, null);
@@ -307,7 +307,7 @@ namespace BTCPayServer.Services.Invoices
         {
             using (var context = _ContextFactory.CreateContext())
             {
-                var invoiceData = await context.FindAsync<InvoiceData>(invoiceId).ConfigureAwait(false);
+                var invoiceData = await context.FindAsync<Data.InvoiceData>(invoiceId).ConfigureAwait(false);
                 if (invoiceData == null)
                     return;
                 invoiceData.Status = status;
@@ -320,7 +320,7 @@ namespace BTCPayServer.Services.Invoices
         {
             using (var context = _ContextFactory.CreateContext())
             {
-                var invoiceData = await context.FindAsync<InvoiceData>(invoiceId).ConfigureAwait(false);
+                var invoiceData = await context.FindAsync<Data.InvoiceData>(invoiceId).ConfigureAwait(false);
                 if (invoiceData?.Status != "paid")
                     return;
                 invoiceData.Status = "invalid";
@@ -331,7 +331,7 @@ namespace BTCPayServer.Services.Invoices
         {
             using (var context = _ContextFactory.CreateContext())
             {
-                IQueryable<InvoiceData> query =
+                IQueryable<Data.InvoiceData> query =
                     context
                     .Invoices
                     .Include(o => o.Payments)
@@ -351,7 +351,7 @@ namespace BTCPayServer.Services.Invoices
             }
         }
 
-        private InvoiceEntity ToEntity(InvoiceData invoice)
+        private InvoiceEntity ToEntity(Data.InvoiceData invoice)
         {
             var entity = ToObject<InvoiceEntity>(invoice.Blob, null);
 #pragma warning disable CS0618
@@ -386,7 +386,7 @@ namespace BTCPayServer.Services.Invoices
         {
             using (var context = _ContextFactory.CreateContext())
             {
-                IQueryable<InvoiceData> query = context
+                IQueryable<Data.InvoiceData> query = context
                     .Invoices
                     .Include(o => o.Payments)
                     .Include(o => o.RefundAddresses);

BTCPayServer/Services/Mails/EmailSettings.cs

@@ -55,7 +55,7 @@ namespace BTCPayServer.Services.Mails
         public SmtpClient CreateSmtpClient()
         {
             SmtpClient client = new SmtpClient(Server, Port.Value);
-            client.EnableSsl = true;
+            client.EnableSsl = EnableSSL;
             client.UseDefaultCredentials = false;
             client.Credentials = new NetworkCredential(Login, Password);
             client.DeliveryMethod = SmtpDeliveryMethod.Network;

BTCPayServer/Services/Rates/BTCPayRateProviderFactory.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using ExchangeSharp;
@@ -35,7 +36,6 @@ namespace BTCPayServer.Services.Rates
         }
         IMemoryCache _Cache;
         private IOptions<MemoryCacheOptions> _CacheOptions;
-
         public IMemoryCache Cache
         {
             get
@@ -68,10 +68,12 @@ namespace BTCPayServer.Services.Rates
             DirectProviders.Add("bittrex", new ExchangeSharpRateProvider("bittrex", new ExchangeBittrexAPI(), true));
             DirectProviders.Add("poloniex", new ExchangeSharpRateProvider("poloniex", new ExchangePoloniexAPI(), false));
             DirectProviders.Add("hitbtc", new ExchangeSharpRateProvider("hitbtc", new ExchangeHitbtcAPI(), false));
+            DirectProviders.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
 
             // Handmade providers
             DirectProviders.Add("bitpay", new BitpayRateProvider(new NBitpayClient.Bitpay(new NBitcoin.Key(), new Uri("https://bitpay.com/"))));
             DirectProviders.Add(QuadrigacxRateProvider.QuadrigacxName, new QuadrigacxRateProvider());
+            DirectProviders.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, Authenticator = _CoinAverageSettings });
 
             // Those exchanges make multiple requests when calling GetTickers so we remove them
             //DirectProviders.Add("kraken", new ExchangeSharpRateProvider("kraken", new ExchangeKrakenAPI(), true));
@@ -82,6 +84,20 @@ namespace BTCPayServer.Services.Rates
             //DirectProviders.Add("bitstamp", new ExchangeSharpRateProvider("bitstamp", new ExchangeBitstampAPI()));
         }
 
+        public CoinAverageExchanges GetSupportedExchanges()
+        {
+            CoinAverageExchanges exchanges = new CoinAverageExchanges();
+            foreach (var exchange in _CoinAverageSettings.AvailableExchanges)
+            {
+                exchanges.Add(exchange.Value);
+            }
+
+            // Add other exchanges supported here
+            exchanges.Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average"));
+            exchanges.Add(new CoinAverageExchange("cryptopia", "Cryptopia"));
+
+            return exchanges;
+        }
 
         private readonly Dictionary<string, IRateProvider> _DirectProviders = new Dictionary<string, IRateProvider>();
         public Dictionary<string, IRateProvider> DirectProviders

BTCPayServer/Services/Rates/BitpayRateProvider.cs

@@ -24,7 +24,7 @@ namespace BTCPayServer.Services.Rates
         {
             return new ExchangeRates((await _Bitpay.GetRatesAsync().ConfigureAwait(false))
                 .AllRates
-                .Select(r => new ExchangeRate() { Exchange = BitpayName, CurrencyPair = new CurrencyPair("BTC", r.Code), Value = r.Value })
+                .Select(r => new ExchangeRate() { Exchange = BitpayName, CurrencyPair = new CurrencyPair("BTC", r.Code), BidAsk = new BidAsk(r.Value) })
                 .ToList());
         }
     }

BTCPayServer/Services/Rates/CoinAverageRateProvider.cs

@@ -54,7 +54,7 @@ namespace BTCPayServer.Services.Rates
         public const string CoinAverageName = "coinaverage";
         public CoinAverageRateProvider()
         {
-            
+
         }
         static HttpClient _Client = new HttpClient();
 
@@ -69,10 +69,31 @@ namespace BTCPayServer.Services.Rates
 
         public ICoinAverageAuthenticator Authenticator { get; set; }
 
-        private bool TryToDecimal(JProperty p, out decimal v)
+        private bool TryToBidAsk(JProperty p, out BidAsk bidAsk)
         {
-            JToken token = p.Value[Exchange == CoinAverageName ? "last" : "bid"];
-            return decimal.TryParse(token.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out v);
+            bidAsk = null;
+            if (Exchange == CoinAverageName)
+            {
+                JToken last = p.Value["last"];
+                if (!decimal.TryParse(last.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v) ||
+                    v <= 0)
+                    return false;
+                bidAsk = new BidAsk(v);
+                return true;
+            }
+            else
+            {
+                JToken bid = p.Value["bid"];
+                JToken ask = p.Value["ask"];
+                if (bid == null || ask == null ||
+                    !decimal.TryParse(bid.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v1) ||
+                    !decimal.TryParse(ask.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v2) ||
+                    v1 > v2 ||
+                    v1 <= 0 || v2 <= 0)
+                    return false;
+                bidAsk = new BidAsk(v1, v2);
+                return true;
+            }
         }
 
         public async Task<ExchangeRates> GetRatesAsync()
@@ -108,10 +129,10 @@ namespace BTCPayServer.Services.Rates
                 {
                     ExchangeRate exchangeRate = new ExchangeRate();
                     exchangeRate.Exchange = Exchange;
-                    if (!TryToDecimal(prop, out decimal value))
+                    if (!TryToBidAsk(prop, out var value))
                         continue;
-                    exchangeRate.Value = value;
-                    if(CurrencyPair.TryParse(prop.Name, out var pair))
+                    exchangeRate.BidAsk = value;
+                    if (CurrencyPair.TryParse(prop.Name, out var pair))
                     {
                         exchangeRate.CurrencyPair = pair;
                         exchangeRates.Add(exchangeRate);

BTCPayServer/Services/Rates/CoinAverageSettings.cs

@@ -43,12 +43,11 @@ namespace BTCPayServer.Services.Rates
     {
         public CoinAverageExchanges()
         {
-            Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average"));
         }
 
         public void Add(CoinAverageExchange exchange)
         {
-            Add(exchange.Name, exchange);
+            TryAdd(exchange.Name, exchange);
         }
     }
     public class CoinAverageSettings : ICoinAverageAuthenticator

BTCPayServer/Services/Rates/CurrencyNameTable.cs

@@ -31,6 +31,7 @@ namespace BTCPayServer.Services.Rates
             get;
             internal set;
         }
+        public bool Crypto { get; set; }
     }
     public class CurrencyNameTable
     {
@@ -40,6 +41,27 @@ namespace BTCPayServer.Services.Rates
         }
 
         static Dictionary<string, IFormatProvider> _CurrencyProviders = new Dictionary<string, IFormatProvider>();
+
+        public NumberFormatInfo GetNumberFormatInfo(string currency, bool useFallback)
+        {
+            var data = GetCurrencyProvider(currency);
+            if (data is NumberFormatInfo nfi)
+                return nfi;
+            if (data is CultureInfo ci)
+                return ci.NumberFormat;
+            if (!useFallback)
+                return null;
+            return CreateFallbackCurrencyFormatInfo(currency);
+        }
+
+        private NumberFormatInfo CreateFallbackCurrencyFormatInfo(string currency)
+        {
+            var usd = GetNumberFormatInfo("USD", false);
+            var currencyInfo = (NumberFormatInfo)usd.Clone();
+            currencyInfo.CurrencySymbol = currency;
+            return currencyInfo;
+        }
+
         public IFormatProvider GetCurrencyProvider(string currency)
         {
             lock (_CurrencyProviders)
@@ -54,7 +76,11 @@ namespace BTCPayServer.Services.Rates
                         }
                         catch { }
                     }
-                    AddCurrency(_CurrencyProviders, "BTC", 8, "BTC");
+
+                    foreach (var network in new BTCPayNetworkProvider(NetworkType.Mainnet).GetAll())
+                    {
+                        AddCurrency(_CurrencyProviders, network.CryptoCode, 8, network.CryptoCode);
+                    }
                 }
                 return _CurrencyProviders.TryGet(currency);
             }
@@ -106,13 +132,38 @@ namespace BTCPayServer.Services.Rates
                     info.Symbol = splitted[3];
                 }
             }
+
+            foreach (var network in new BTCPayNetworkProvider(NetworkType.Mainnet).GetAll())
+            {
+                dico.TryAdd(network.CryptoCode, new CurrencyData()
+                {
+                    Code = network.CryptoCode,
+                    Divisibility = 8,
+                    Name = network.CryptoCode,
+                    Crypto = true
+                });
+            }
+
             return dico.Values.ToArray();
         }
 
-        public CurrencyData GetCurrencyData(string currency)
+        public CurrencyData GetCurrencyData(string currency, bool useFallback)
         {
             CurrencyData result;
-            _Currencies.TryGetValue(currency.ToUpperInvariant(), out result);
+            if(!_Currencies.TryGetValue(currency.ToUpperInvariant(), out result))
+            {
+                if(useFallback)
+                {
+                    var usd = GetCurrencyData("USD", false);
+                    result = new CurrencyData()
+                    {
+                        Code = currency,
+                        Crypto = true,
+                        Name = currency,
+                        Divisibility = usd.Divisibility
+                    };
+                }
+            }
             return result;
         }
 

BTCPayServer/Services/Rates/ExchangeSharpRateProvider.cs

@@ -61,7 +61,7 @@ namespace BTCPayServer.Services.Rates
                 var rate = new ExchangeRate();
                 rate.CurrencyPair = pair;
                 rate.Exchange = _ExchangeName;
-                rate.Value = ticker.Value.Bid;
+                rate.BidAsk = new BidAsk(ticker.Value.Bid, ticker.Value.Ask);
                 return rate;
             }
             catch (ArgumentException)

BTCPayServer/Services/Rates/QuadrigacxRateProvider.cs

@@ -14,13 +14,19 @@ namespace BTCPayServer.Services.Rates
         public const string QuadrigacxName = "quadrigacx";
         static HttpClient _Client = new HttpClient();
 
-        private bool TryToDecimal(JObject p, out decimal v)
+        private bool TryToBidAsk(JObject p, out BidAsk v)
         {
-            v = 0.0m;
-            JToken token = p.Property("bid")?.Value;
-            if (token == null)
+            v = null;
+            JToken bid = p.Property("bid")?.Value;
+            JToken ask = p.Property("ask")?.Value;
+            if (bid == null || ask == null)
                 return false;
-            return decimal.TryParse(token.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out v);
+            if (!decimal.TryParse(bid.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v1) ||
+               !decimal.TryParse(bid.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v2) ||
+               v1 <= 0m || v2 <= 0m || v1 > v2)
+                return false;
+            v = new BidAsk(v1, v2);
+            return true;
         }
 
         public async Task<ExchangeRates> GetRatesAsync()
@@ -37,9 +43,9 @@ namespace BTCPayServer.Services.Rates
                     continue;
                 rate.CurrencyPair = pair;
                 rate.Exchange = QuadrigacxName;
-                if (!TryToDecimal((JObject)prop.Value, out var v))
+                if (!TryToBidAsk((JObject)prop.Value, out var v))
                     continue;
-                rate.Value = v;
+                rate.BidAsk = v;
                 exchangeRates.Add(rate);
             }
             return exchangeRates;

BTCPayServer/Validation/UriAttribute.cs

@@ -0,0 +1,23 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+
+namespace BTCPayServer.Validation
+{
+    //from https://stackoverflow.com/a/47196738/275504
+    public class UriAttribute : ValidationAttribute
+    {
+        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        {
+            var str = value == null ? null : Convert.ToString(value, CultureInfo.InvariantCulture);
+            Uri uri;
+            bool valid = string.IsNullOrWhiteSpace(str) || Uri.TryCreate(str, UriKind.Absolute, out uri);
+
+            if (!valid)
+            {
+                return new ValidationResult(ErrorMessage);
+            }
+            return ValidationResult.Success;
+        }
+    }
+}

BTCPayServer/Views/Account/ConfirmEmail.cshtml

@@ -7,7 +7,7 @@
 
         <div class="row">
             <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="@("Thank you for confirming your email.")" />
+                <partial name="_StatusMessage" model="@("Thank you for confirming your email.")" />
             </div>
         </div>
     </div>

BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml

@@ -38,6 +38,31 @@
                         <textarea asp-for="Template" rows="20" cols="40" class="form-control"></textarea>
                         <span asp-validation-for="Template" class="text-danger"></span>
                     </div>
+                    <div class="form-group">
+                        <h5>Host button externally</h5>
+                        <p>You can host point of sale buttons in an external website with the following code.</p>
+                        @if(Model.Example1 != null)
+                        {
+                            <span>For anything with a custom amount</span>
+                            <pre><code class="html">@Model.Example1</code></pre>
+                        }
+                        @if(Model.Example2 != null)
+                        {
+                            <span>For a specific item of your template</span>
+                            <pre><code class="html">@Model.Example2</code></pre>
+                        }
+                        <p>A <code>POST</code> callback will be sent to notification with the following form will be sent to <code>notificationUrl</code> once the enough is paid and once again once there is enough confirmations to the payment:</p>
+                        <pre><code class="json">@Model.ExampleCallback</code></pre>
+                        <p><strong>Never</strong> trust anything but <code>id</code>, <strong>ignore</strong> the other fields completely, an attacker can spoof those, they are present only for backward compatibility reason:</p>
+                        <p>
+                            <ul>
+                                <li><strong>Build the invoice's url by yourself</strong> do not trust the <code>url</code> field, this can be spoofed to use attacker's server.</li>
+                                <li>Send a <code>GET</code> request to the invoice's url with <code>Content-Type: application/json</code></li>
+                                <li>Verify that the <code>orderId</code> is from your backend, that the <code>price</code> is correct and that <code>status</code> is either <code>confirmed</code> or <code>complete</code></li>
+                                <li>You can then ship your order</li>
+                            </ul>
+                        </p>
+                    </div>
                     <div class="form-group">
                         <input type="submit" class="btn btn-primary" />
                     </div>
@@ -47,3 +72,10 @@
         </div>
     </div>
 </section>
+
+@section Scripts {
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+    <script>hljs.initHighlightingOnLoad();</script>
+}
+

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -73,7 +73,7 @@
                 <span>{{ srvModel.btcDue }} {{ srvModel.cryptoCode }}</span>
             </div>
 
-            <div class="single-item-order__right__ex-rate">
+            <div class="single-item-order__right__ex-rate" v-if="srvModel.orderAmountFiat">
                 1 {{ srvModel.cryptoCode }} = {{ srvModel.rate }}
             </div>
         </div>
@@ -87,6 +87,12 @@
                 <div class="line-items__item__label">{{$t("Order Amount")}}</div>
                 <div class="line-items__item__value">{{srvModel.orderAmount}} {{ srvModel.cryptoCode }}</div>
             </div>
+            <div class="line-items__item line-items_fiatvalue" v-if="srvModel.orderAmountFiat">
+                <div class="line-items__item__label">&nbsp;</div>
+                <div class="line-items__item__value single-item-order__right__ex-rate">
+                    {{srvModel.orderAmountFiat}}
+                </div>
+            </div>
             <div class="line-items__item">
                 <div class="line-items__item__label">
                     <span>{{$t("Network Cost")}}</span>
@@ -133,7 +139,7 @@
     </div>
 </div>
 
-<div adjust-height="" class="payment-box">
+<div class="payment-box">
     <div class="bp-view payment manual-flow enter-contact-email active" id="emailAddressView">
         <form class="manual__step-one refund-address-form contact-email-form" id="emailAddressForm" name="emailAddressForm" novalidate="">
             <div class="manual__step-one__header">

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -53,15 +53,15 @@
                     </tr>
                     <tr>
                         <th>Created date</th>
-                        <td>@Model.CreatedDate</td>
+                        <td>@Model.CreatedDate.ToBrowserDate()</td>
                     </tr>
                     <tr>
                         <th>Expiration date</th>
-                        <td>@Model.ExpirationDate</td>
+                        <td>@Model.ExpirationDate.ToBrowserDate()</td>
                     </tr>
                     <tr>
                         <th>Monitoring date</th>
-                        <td>@Model.MonitoringDate</td>
+                        <td>@Model.MonitoringDate.ToBrowserDate()</td>
                     </tr>
                     <tr>
                         <th>Transaction speed</th>
@@ -289,7 +289,7 @@
                         @foreach(var evt in Model.Events)
                         {
                             <tr>
-                                <td>@evt.Timestamp</td>
+                                <td>@evt.Timestamp.ToBrowserDate()</td>
                                 <td>@evt.Message</td>
                             </tr>
                         }

BTCPayServer/Views/Invoice/ListInvoices.cshtml

@@ -66,7 +66,7 @@
                     @foreach(var invoice in Model.Invoices)
                     {
                         <tr>
-                            <td>@invoice.Date</td>
+                            <td>@invoice.Date.ToTimeAgo()</td>
                             <td>
                                 @if(invoice.RedirectUrl != string.Empty)
                                 {

BTCPayServer/Views/Server/Rates.cshtml

@@ -40,7 +40,7 @@
                 <table class="table table-sm">
                     <tr>
                         <th>Quota period</th>
-                        <td>@Model.RateLimits.TotalPeriod.Prettify()</td>
+                        <td>@Model.RateLimits.TotalPeriod.TimeString()</td>
                     </tr>
                     <tr>
                         <th>Requests quota</th>
@@ -48,7 +48,7 @@
                     </tr>
                     <tr>
                         <th>Quota reset in</th>
-                        <td>@Model.RateLimits.CounterReset.Prettify()</td>
+                        <td>@Model.RateLimits.CounterReset.TimeString()</td>
                     </tr>
                 </table>
             }

BTCPayServer/Views/Shared/Error.cshtml

@@ -0,0 +1,22 @@
+@model ErrorViewModel
+@{
+    ViewData["Title"] = "Error";
+}
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+@if(Model != null && Model.ShowRequestId)
+{
+    <p>
+        <strong>Request ID:</strong> <code>@Model.RequestId</code>
+    </p>
+}
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+</p>
+<p>
+    <strong>Development environment should not be enabled in deployed applications</strong>, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>, and restarting the application.
+</p>

BTCPayServer/Views/Shared/SyncModal.cshtml

@@ -10,8 +10,8 @@
         </div>
         <div class="modal-body">
             <p>
-                Some of your nodes are still synching...<br />
-                BTCPay Server will not work correctly until it is over.
+                Some of your nodes are still synchronizing...<br />
+                BTCPay Server will not create invoices with those cryptocurrencies.
             </p>
             @foreach (var line in dashboard.GetAll())
             {
@@ -47,12 +47,12 @@
                         }
                         else if (line.Status.BitcoinStatus.IsSynched)
                         {
-                            <li>The node is synched (Height: @line.Status.BitcoinStatus.Headers)</li>
+                            <li>The node is synchronized (Height: @line.Status.BitcoinStatus.Headers)</li>
                             @if (line.Status.BitcoinStatus.IsSynched &&
                                 line.Status.SyncHeight.HasValue &&
                                 line.Status.SyncHeight.Value < line.Status.BitcoinStatus.Headers)
                             {
-                                <li>NBXplorer is synching... (Height: @line.Status.SyncHeight.Value)</li>
+                                <li>NBXplorer is synchronizing... (Height: @line.Status.SyncHeight.Value)</li>
                             }
                         }
                         else

BTCPayServer/Views/Stores/AddLightningNode.cshtml

@@ -16,7 +16,7 @@
 <div class="alert alert-warning alert-dismissible" role="alert">
     <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <p>
-        <span>A connection to a lightning charge node or clightning unix socket is required to generate lignting network enabled invoices. <br /></span>
+        <span>A connection to a lightning charge node or clightning unix socket is required to generate lightning network enabled invoices. <br /></span>
         <span>This is experimental and not advised for production so keep in mind:</span>
     </p>
     <ul>
@@ -36,9 +36,9 @@
                 <span>This URL should point to an installed lightning charge server for @Model.CryptoCode</span>
             </div>
             <div class="form-group">
-                <label asp-for="Url"></label>
-                <input id="lightningurl" asp-for="Url" class="form-control" />
-                <span asp-validation-for="Url" class="text-danger"></span>
+                <label asp-for="ConnectionString"></label>
+                <input id="lightningurl" asp-for="ConnectionString" class="form-control" />
+                <span asp-validation-for="ConnectionString" class="text-danger"></span>
                 @if(Model.InternalLightningNode != null)
                 {
                     <p class="form-text text-muted">

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -96,7 +96,7 @@
                 <div class="form-group">
                     <h5>Lightning nodes (Experimental)</h5>
                     <p>
-                        <span>A connection to a lightning charge node is required to generate lignting network enabled invoices.<br /></span>
+                        <span>A connection to a lightning charge node is required to generate lightning network enabled invoices.<br /></span>
                         <span>This is experimental and not advised for production.</span>
                     </p>
                 </div>

BTCPayServer/Views/Stores/Wallet.cshtml

@@ -17,7 +17,7 @@
             If your Ledger wallet is not detected:
         </p>
         <ul>
-            <li>Make sure you are running the Ledger Bitcoin or Litecoin app with version superior or equal to 1.2.4</li>
+            <li>Make sure you are running the Ledger app with version superior or equal to 1.2.4</li>
             <li>Use a browser supporting the <a href="https://www.yubico.com/support/knowledge-base/categories/articles/browsers-support-u2f/">U2F protocol</a></li>
         </ul>
         <p id="hw-loading"><span class="fa fa-question-circle" style="color:orange"></span> <span>Detecting hardware wallet...</span></p>

BTCPayServer/Views/ViewsRazor.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
 namespace BTCPayServer.Views
@@ -22,5 +24,39 @@ namespace BTCPayServer.Views
             var activePage = (T)viewData[ACTIVE_PAGE_KEY];
             return page.Equals(activePage) ? "active" : null;
         }
+
+        public static HtmlString ToBrowserDate(this DateTimeOffset date)
+        {
+            var hello = date.ToString("o", CultureInfo.InvariantCulture);
+            return new HtmlString($"<span class='localizeDate'>{hello}</span>");
+        }
+
+        public static string ToTimeAgo(this DateTimeOffset date)
+        {
+            var formatted = (DateTimeOffset.UtcNow - date).TimeString() + " ago";
+            return formatted;
+        }
+
+        public static string TimeString(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;
+        }
     }
 }

BTCPayServer/bundleconfig.json

@@ -18,7 +18,8 @@
             "wwwroot/vendor/jquery-easing/jquery.easing.js",
             "wwwroot/vendor/scrollreveal/scrollreveal.min.js",
             "wwwroot/vendor/magnific-popup/jquery.magnific-popup.js",
-            "wwwroot/vendor/bootstrap4-creativestart/*.js"
+            "wwwroot/vendor/bootstrap4-creativestart/*.js",
+            "wwwroot/main/**/*.js"
         ]
     },
     {

BTCPayServer/wwwroot/checkout/css/normalizer.css

@@ -10328,6 +10328,7 @@ All mobile class names should be prefixed by m- */
 .wrong-email .payment-tabs {
     pointer-events: none;
     margin-top: -2.95rem;
+    z-index: -1;
     margin-bottom: 1rem;
 }
 
@@ -10412,10 +10413,6 @@ All mobile class names should be prefixed by m- */
     transform: translateY(20px);
 }
 
-.payment-tabs {
-    z-index: 1;
-}
-
 .single-item-order {
     z-index: 2;
 }
@@ -11146,31 +11143,13 @@ language-selector {
 
 line-items {
     background: #FBFBFB;
-    height: 25px;
-    border-top: 0;
+    border-top: 1px solid rgba(238, 238, 238, 0.5);
     z-index: 2;
-    position: relative;
-    display: block;
-    overflow: hidden;
-    height: 0;
-    transition: height 250ms ease;
+    display: none;
 }
 
-    line-items.expanded {
-        height: 120px;
-        border-top: 1px solid rgba(238, 238, 238, 0.5);
-    }
-
-        line-items.expanded.paid-over {
-            height: 295px;
-        }
-
-        line-items.expanded.paid-partial-expired, line-items.expanded.paid-full {
-            height: 272px;
-        }
-
     line-items .line-items {
-        padding: 1rem;
+        padding: 10px 1rem;
         color: #565D6E;
     }
 
@@ -11198,6 +11177,10 @@ line-items {
         padding: 2px 0;
     }
 
+    line-items .line-items_fiatvalue {
+        margin-top: -5px;
+    }
+
     line-items .line-items__item__label {
         flex-grow: 1;
         display: flex;

BTCPayServer/wwwroot/checkout/js/core.js

@@ -30,6 +30,7 @@ function onDataCallback(jsonData) {
         newStatus === "paid") {
         if ($(".modal-dialog").hasClass("expired")) {
             $(".modal-dialog").removeClass("expired");
+            $("#expired").removeClass("active");
         }
 
         $(".modal-dialog").addClass("paid");
@@ -39,6 +40,11 @@ function onDataCallback(jsonData) {
     }
 
     if (newStatus === "expired" || newStatus === "invalid") { //TODO: different state if the invoice is invalid (failed to confirm after timeout)
+        if ($(".modal-dialog").hasClass("paid")) {
+            $(".modal-dialog").removeClass("paid");
+            $("#paid").removeClass("active");
+        }
+
         $(".timer-row").removeClass("expiring-soon");
         $(".timer-row__spinner").html("");
         $("#emailAddressView").removeClass("active");
@@ -237,8 +243,12 @@ $(document).ready(function () {
     });
 
     // Expand Line-Items
+    var lineItemsExpanded = false;
     $(".buyerTotalLine").click(function () {
         $("line-items").toggleClass("expanded");
+        lineItemsExpanded ? $("line-items").slideUp() : $("line-items").slideDown();
+        lineItemsExpanded = !lineItemsExpanded;
+
         $(".buyerTotalLine").toggleClass("expanded");
         $(".single-item-order__right__btc-price__chevron").toggleClass("expanded");
     });