Make sure a too high expiration do not trigger "The value needs to translate in milliseconds to -1 (signifying an infinite timeout)"

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.74</Version>
+		<Version>1.0.1.76</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -209,16 +209,16 @@ namespace BTCPayServer.HostedServices
             var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId);
             try
             {
-                var now = DateTimeOffset.UtcNow;
-                if (invoice.ExpirationTime > now)
+                var delay = invoice.ExpirationTime - DateTimeOffset.UtcNow;
+                if (delay > TimeSpan.Zero)
                 {
-                    await Task.Delay(invoice.ExpirationTime - now, _Cts.Token);
+                    await Task.Delay(delay, _Cts.Token);
                 }
                 Watch(invoiceId);
-                now = DateTimeOffset.UtcNow;
-                if (invoice.MonitoringExpiration > now)
+                delay = invoice.MonitoringExpiration - DateTimeOffset.UtcNow;
+                if (delay > TimeSpan.Zero)
                 {
-                    await Task.Delay(invoice.MonitoringExpiration - now, _Cts.Token);
+                    await Task.Delay(delay, _Cts.Token);
                 }
                 Watch(invoiceId);
             }

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -64,7 +64,7 @@ namespace BTCPayServer.Models.StoreViewModels
         }
 
         [Display(Name = "Invoice expires if the full amount has not been paid after ... minutes")]
-        [Range(1, 60 * 24 * 31)]
+        [Range(1, 60 * 24 * 24)]
         public int InvoiceExpiration
         {
             get;
@@ -72,7 +72,7 @@ namespace BTCPayServer.Models.StoreViewModels
         }
 
         [Display(Name = "Payment invalid if transactions fails to confirm ... minutes after invoice expiration")]
-        [Range(10, 60 * 24 * 31)]
+        [Range(10, 60 * 24 * 24)]
         public int MonitoringExpiration
         {
             get;

BTCPayServer/Payments/Lightning/CLightning/CLightningRPCClient.cs

@@ -174,10 +174,10 @@ namespace BTCPayServer.Payments.Lightning.CLightning
         }
 
         static NBitcoin.DataEncoders.DataEncoder InvoiceIdEncoder = NBitcoin.DataEncoders.Encoders.Base58;
-        async Task<LightningInvoice> ILightningInvoiceClient.CreateInvoice(LightMoney amount, TimeSpan expiry, CancellationToken cancellation)
+        async Task<LightningInvoice> ILightningInvoiceClient.CreateInvoice(LightMoney amount, string description, TimeSpan expiry, CancellationToken cancellation)
         {
             var id = InvoiceIdEncoder.EncodeData(RandomUtils.GetBytes(20));
-            var invoice = await SendCommandAsync<CLightningInvoice>("invoice", new object[] { amount.MilliSatoshi, id, "" }, cancellation: cancellation);
+            var invoice = await SendCommandAsync<CLightningInvoice>("invoice", new object[] { amount.MilliSatoshi, id, description ?? "" }, cancellation: cancellation);
             invoice.Label = id;
             invoice.MilliSatoshi = amount;
             invoice.Status = "unpaid";

BTCPayServer/Payments/Lightning/Charge/ChargeClient.cs

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

BTCPayServer/Payments/Lightning/Charge/CreateInvoiceRequest.cs

@@ -9,5 +9,6 @@ namespace BTCPayServer.Payments.Lightning.Charge
     {
         public LightMoney Amont { get; set; }
         public TimeSpan Expiry { get; set; }
+        public string Description { get; set; }
     }
 }

BTCPayServer/Payments/Lightning/ILightningInvoiceClient.cs

@@ -29,7 +29,7 @@ namespace BTCPayServer.Payments.Lightning
     public interface ILightningInvoiceClient
     {
         Task<LightningInvoice> GetInvoice(string invoiceId, CancellationToken cancellation = default(CancellationToken));
-        Task<LightningInvoice> CreateInvoice(LightMoney amount, TimeSpan expiry, CancellationToken cancellation = default(CancellationToken));
+        Task<LightningInvoice> CreateInvoice(LightMoney amount, string description, TimeSpan expiry, CancellationToken cancellation = default(CancellationToken));
         Task<ILightningListenInvoiceSession> Listen(CancellationToken cancellation = default(CancellationToken));
         Task<LightningNodeInformation> GetInfo(CancellationToken cancellation = default(CancellationToken));
     }

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -36,7 +36,7 @@ namespace BTCPayServer.Payments.Lightning
             LightningInvoice lightningInvoice = null;
             try
             {
-                lightningInvoice = await client.CreateInvoice(new LightMoney(due, LightMoneyUnit.BTC), expiry);
+                lightningInvoice = await client.CreateInvoice(new LightMoney(due, LightMoneyUnit.BTC), invoice.ProductInformation.ItemDesc, expiry);
             }
             catch(Exception ex)
             {

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -296,7 +296,7 @@
                     {{srvModel.orderId}}
                 </div>
             </div>
-            <a href="/invoices" class="action-button" style="margin-top: 20px;">
+            <a class="action-button" style="margin-top: 20px;">
                 <bp-done-text>
                     <span>{{$t("Return to StoreName", srvModel)}}</span>
                 </bp-done-text>