bump

Tweaking Checkout page so that it works properly in IE

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>

BTCPayServer.Tests/UnitTest1.cs

@@ -45,7 +45,7 @@ namespace BTCPayServer.Tests
         [Fact]
         public void CanCalculateCryptoDue2()
         {
-            var dummy = new Key().PubKey.GetAddress(Network.RegTest);
+            var dummy = new Key().PubKey.GetAddress(Network.RegTest).ToString();
 #pragma warning disable CS0618
             InvoiceEntity invoiceEntity = new InvoiceEntity();
             invoiceEntity.Payments = new System.Collections.Generic.List<PaymentEntity>();
@@ -347,7 +347,6 @@ namespace BTCPayServer.Tests
                     ItemDesc = "Some description"
                 });
 
-
                 tester.SendLightningPayment(invoice);
 
                 Eventually(() =>

BTCPayServer.Tests/docker-compose.yml

@@ -40,7 +40,7 @@ services:
       - lightning-charged
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.1.18
+    image: nicolasdorier/nbxplorer:1.0.1.22
     ports:
       - "32838:32838"
     expose: 

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.44</Version>
+		<Version>1.0.1.47</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -31,10 +31,10 @@
     <PackageReference Include="Meziantou.AspNetCore.BundleTagHelpers" Version="1.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.0" />
-    <PackageReference Include="NBitcoin" Version="4.0.0.59" />
+    <PackageReference Include="NBitcoin" Version="4.0.0.65" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.18" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.1.14" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.1.16" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.13" />

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -68,11 +68,11 @@ namespace BTCPayServer.Controllers
             {
                 var cryptoInfo = dto.CryptoInfo.First(o => o.GetpaymentMethodId() == data.GetId());
                 var accounting = data.Calculate();
-                var paymentNetwork = _NetworkProvider.GetNetwork(data.GetId().CryptoCode);
+                var paymentMethodId = data.GetId();
                 var cryptoPayment = new InvoiceDetailsModel.CryptoPayment();
-                cryptoPayment.CryptoCode = paymentNetwork.CryptoCode;
-                cryptoPayment.Due = accounting.Due.ToString() + $" {paymentNetwork.CryptoCode}";
-                cryptoPayment.Paid = accounting.CryptoPaid.ToString() + $" {paymentNetwork.CryptoCode}";
+                cryptoPayment.PaymentMethod = ToString(paymentMethodId);
+                cryptoPayment.Due = accounting.Due.ToString() + $" {paymentMethodId.CryptoCode}";
+                cryptoPayment.Paid = accounting.CryptoPaid.ToString() + $" {paymentMethodId.CryptoCode}";
 
                 var onchainMethod = data.GetPaymentMethodDetails() as Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod;
                 if(onchainMethod != null)
@@ -86,13 +86,13 @@ namespace BTCPayServer.Controllers
 
             var payments = invoice
                 .GetPayments()
-                .Where(p => p.GetpaymentMethodId().PaymentType == PaymentTypes.BTCLike)
+                .Where(p => p.GetPaymentMethodId().PaymentType == PaymentTypes.BTCLike)
                 .Select(async payment =>
                 {
                     var paymentData = (Payments.Bitcoin.BitcoinLikePaymentData)payment.GetCryptoPaymentData();
                     var m = new InvoiceDetailsModel.Payment();
                     var paymentNetwork = _NetworkProvider.GetNetwork(payment.GetCryptoCode());
-                    m.CryptoCode = payment.GetCryptoCode();
+                    m.PaymentMethod = ToString(payment.GetPaymentMethodId());
                     m.DepositAddress = paymentData.Output.ScriptPubKey.GetDestinationAddress(paymentNetwork.NBitcoinNetwork);
 
                     int confirmationCount = 0;
@@ -121,12 +121,32 @@ namespace BTCPayServer.Controllers
                 })
                 .ToArray();
             await Task.WhenAll(payments);
-            model.Addresses = invoice.HistoricalAddresses;
+            model.Addresses = invoice.HistoricalAddresses.Select(h=> new InvoiceDetailsModel.AddressModel
+            {
+                Destination = h.GetAddress(),
+                PaymentMethod = ToString(h.GetPaymentMethodId()),
+                Current = !h.UnAssigned.HasValue
+            }).ToArray();
             model.Payments = payments.Select(p => p.GetAwaiter().GetResult()).ToList();
             model.StatusMessage = StatusMessage;
             return View(model);
         }
 
+        private string ToString(PaymentMethodId paymentMethodId)
+        {
+            var type = paymentMethodId.PaymentType.ToString();
+            switch (paymentMethodId.PaymentType)
+            {
+                case PaymentTypes.BTCLike:
+                    type = "On-Chain";
+                    break;
+                case PaymentTypes.LightningLike:
+                    type = "Off-Chain";
+                    break;
+            }
+            return $"{paymentMethodId.CryptoCode} ({type})";
+        }
+
         [HttpGet]
         [Route("i/{invoiceId}")]
         [Route("i/{invoiceId}/{paymentMethodId}")]
@@ -220,7 +240,7 @@ namespace BTCPayServer.Controllers
                 .ToList()
             };
 
-            var isMultiCurrency = invoice.GetPayments().Select(p=>p.GetpaymentMethodId()).Concat(new[] { paymentMethod.GetId() }).Distinct().Count() > 1;
+            var isMultiCurrency = invoice.GetPayments().Select(p=>p.GetPaymentMethodId()).Concat(new[] { paymentMethod.GetId() }).Distinct().Count() > 1;
             if (isMultiCurrency)
                 model.NetworkFeeDescription = $"{accounting.NetworkFee} {network.CryptoCode}";
 
@@ -348,6 +368,7 @@ namespace BTCPayServer.Controllers
                     Date = Prettify(invoice.InvoiceTime),
                     InvoiceId = invoice.Id,
                     OrderId = invoice.OrderId ?? string.Empty,
+                    RedirectUrl = invoice.RedirectURL ?? string.Empty,
                     AmountCurrency = $"{invoice.ProductInformation.Price.ToString(CultureInfo.InvariantCulture)} {invoice.ProductInformation.Currency}"
                 });
             }

BTCPayServer/Controllers/StoresController.LightningLike.cs

@@ -54,10 +54,11 @@ namespace BTCPayServer.Controllers
                     return View(vm);
                 }
 
-                if (uri.Scheme != "https")
+                var domain = GetDomain(uri.AbsoluteUri);
+                if (uri.Scheme != "https" && domain != "127.0.0.1" && domain != "localhost")
                 {
                     var internalNode = GetInternalLightningNodeIfAuthorized();
-                    if (internalNode == null || GetDomain(internalNode) != GetDomain(uri.AbsoluteUri))
+                    if (internalNode == null || GetDomain(internalNode) != domain)
                     {
                         ModelState.AddModelError(nameof(vm.Url), "The url must be HTTPS");
                         return View(vm);

BTCPayServer/Data/HistoricalAddressInvoiceData.cs

@@ -27,9 +27,10 @@ namespace BTCPayServer.Data
         public string CryptoCode { get; set; }
 
 #pragma warning disable CS0618
-        public string GetCryptoCode()
+        public Payments.PaymentMethodId GetPaymentMethodId()
         {
-            return string.IsNullOrEmpty(CryptoCode) ? "BTC" : CryptoCode;
+            return string.IsNullOrEmpty(CryptoCode) ? new Payments.PaymentMethodId("BTC", Payments.PaymentTypes.BTCLike)
+                                                    : Payments.PaymentMethodId.Parse(CryptoCode);
         }
         public string GetAddress()
         {

BTCPayServer/HostedServices/InvoiceNotificationManager.cs

@@ -75,7 +75,8 @@ namespace BTCPayServer.HostedServices
                 if (string.IsNullOrEmpty(invoice.NotificationURL))
                     return;
                 _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name));
-                await SendNotification(invoice, eventCode, name, cts.Token);
+                var response = await SendNotification(invoice, eventCode, name, cts.Token);
+                response.EnsureSuccessStatusCode();
                 return;
             }
             catch (OperationCanceledException) when (cts.IsCancellationRequested)
@@ -112,7 +113,7 @@ namespace BTCPayServer.HostedServices
             try
             {
                 HttpResponseMessage response = await SendNotification(job.Invoice, job.EventCode, job.Message, cts.Token);
-                reschedule = response.StatusCode != System.Net.HttpStatusCode.OK;
+                reschedule = !response.IsSuccessStatusCode;
                 Logger.LogInformation("Job " + jobId + " returned " + response.StatusCode);
 
                 _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)

BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs

@@ -12,16 +12,22 @@ namespace BTCPayServer.Models.InvoicingModels
     {
         public class CryptoPayment
         {
-            public string CryptoCode { get; set; }
+            public string PaymentMethod { get; set; }
             public string Due { get; set; }
             public string Paid { get; set; }
             public string Address { get; internal set; }
             public string Rate { get; internal set; }
             public string PaymentUrl { get; internal set; }
         }
+        public class AddressModel
+        {
+            public string PaymentMethod { get; set; }
+            public string Destination { get; set; }
+            public bool Current { get; set; }
+        }
         public class Payment
         {
-            public string CryptoCode { get; set; }
+            public string PaymentMethod { get; set; }
             public string Confirmations
             {
                 get; set;
@@ -126,7 +132,7 @@ namespace BTCPayServer.Models.InvoicingModels
             get;
             internal set;
         }
-        public HistoricalAddressInvoiceData[] Addresses { get; set; }
+        public AddressModel[] Addresses { get; set; }
         public DateTimeOffset MonitoringDate { get; internal set; }
         public List<Data.InvoiceEventData> Events { get; internal set; }
     }

BTCPayServer/Models/InvoicingModels/InvoicesModel.cs

@@ -39,6 +39,7 @@ namespace BTCPayServer.Models.InvoicingModels
         }
 
         public string OrderId { get; set; }
+        public string RedirectUrl { get; set; }
         public string InvoiceId
         {
             get; set;

BTCPayServer/Payments/Bitcoin/BitcoinLikeOnChainPaymentMethod.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer.Payments.Bitcoin
 
         public string GetPaymentDestination()
         {
-            return DepositAddress?.ToString();
+            return DepositAddress;
         }
 
         public decimal GetTxFee()
@@ -33,10 +33,7 @@ namespace BTCPayServer.Payments.Bitcoin
 
         public void SetPaymentDestination(string newPaymentDestination)
         {
-            if (newPaymentDestination == null)
-                DepositAddress = null;
-            else
-                DepositAddress = BitcoinAddress.Create(newPaymentDestination, DepositAddress.Network);
+            DepositAddress = newPaymentDestination;
         }
 
         // Those properties are JsonIgnore because their data is inside CryptoData class for legacy reason
@@ -45,7 +42,11 @@ namespace BTCPayServer.Payments.Bitcoin
         [JsonIgnore]
         public Money TxFee { get; set; }
         [JsonIgnore]
-        public BitcoinAddress DepositAddress { get; set; }
+        public String DepositAddress { get; set; }
+        public BitcoinAddress GetDepositAddress(Network network)
+        {
+            return string.IsNullOrEmpty(DepositAddress) ? null : BitcoinAddress.Create(DepositAddress, network);
+        }
         ///////////////////////////////////////////////////////////////////////////////////////
     }
 }

BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs

@@ -34,7 +34,7 @@ namespace BTCPayServer.Payments.Bitcoin
             Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod onchainMethod = new Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod();
             onchainMethod.FeeRate = await getFeeRate;
             onchainMethod.TxFee = onchainMethod.FeeRate.GetFee(100); // assume price for 100 bytes
-            onchainMethod.DepositAddress = await getAddress;
+            onchainMethod.DepositAddress = (await getAddress).ToString();
             return onchainMethod;
         }
 

BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs

@@ -98,20 +98,6 @@ namespace BTCPayServer.Payments.Bitcoin
                 }
             }, null, 0, (int)PollInterval.TotalMilliseconds);
             leases.Add(_ListenPoller);
-
-            leases.Add(_Aggregator.Subscribe<Events.InvoiceEvent>(async inv =>
-            {
-                if (inv.Name == "invoice_created")
-                {
-                    var invoice = await _InvoiceRepository.GetInvoice(null, inv.InvoiceId);
-                    await Task.WhenAll(invoice.GetSupportedPaymentMethod<DerivationStrategy>(_NetworkProvider)
-                           .Select(s => (Session: _SessionsByCryptoCode.TryGet(s.PaymentId.CryptoCode), 
-                                         DerivationStrategy: s.DerivationStrategyBase))
-                           .Where(s => s.Session != null)
-                           .Select(s => s.Session.ListenDerivationSchemesAsync(new[] { s.DerivationStrategy }))
-                           .ToArray()).ConfigureAwait(false);
-                }
-            }));
             return Task.CompletedTask;
         }
 
@@ -139,7 +125,7 @@ namespace BTCPayServer.Payments.Bitcoin
                 using (session)
                 {
                     await session.ListenNewBlockAsync(_Cts.Token).ConfigureAwait(false);
-                    await session.ListenDerivationSchemesAsync((await GetStrategies(network)).ToArray(), _Cts.Token).ConfigureAwait(false);
+                    await session.ListenAllDerivationSchemesAsync(cancellation: _Cts.Token).ConfigureAwait(false);
 
                     Logs.PayServer.LogInformation($"{network.CryptoCode}: Checking if any pending invoice got paid while offline...");
                     int paymentCount = await FindPaymentViaPolling(wallet, network);
@@ -213,7 +199,7 @@ namespace BTCPayServer.Payments.Bitcoin
         IEnumerable<BitcoinLikePaymentData> GetAllBitcoinPaymentData(InvoiceEntity invoice)
         {
             return invoice.GetPayments()
-                    .Where(p => p.GetpaymentMethodId().PaymentType == PaymentTypes.BTCLike)
+                    .Where(p => p.GetPaymentMethodId().PaymentType == PaymentTypes.BTCLike)
                     .Select(p => (BitcoinLikePaymentData)p.GetCryptoPaymentData());
         }
 
@@ -227,7 +213,7 @@ namespace BTCPayServer.Payments.Bitcoin
             var conflicts = GetConflicts(transactions.Select(t => t.Value));
             foreach (var payment in invoice.GetPayments(wallet.Network))
             {
-                if (payment.GetpaymentMethodId().PaymentType != PaymentTypes.BTCLike)
+                if (payment.GetPaymentMethodId().PaymentType != PaymentTypes.BTCLike)
                     continue;
                 var paymentData = (BitcoinLikePaymentData)payment.GetCryptoPaymentData();
                 if (!transactions.TryGetValue(paymentData.Outpoint.Hash, out TransactionResult tx))
@@ -365,11 +351,11 @@ namespace BTCPayServer.Payments.Bitcoin
             var paymentMethod = invoice.GetPaymentMethod(wallet.Network, PaymentTypes.BTCLike, _ExplorerClients.NetworkProviders);
             if (paymentMethod != null &&
                 paymentMethod.GetPaymentMethodDetails() is BitcoinLikeOnChainPaymentMethod btc &&
-                btc.DepositAddress.ScriptPubKey == paymentData.Output.ScriptPubKey &&
+                btc.GetDepositAddress(wallet.Network.NBitcoinNetwork).ScriptPubKey == paymentData.Output.ScriptPubKey &&
                 paymentMethod.Calculate().Due > Money.Zero)
             {
                 var address = await wallet.ReserveAddressAsync(strategy);
-                btc.DepositAddress = address;
+                btc.DepositAddress = address.ToString();
                 await _InvoiceRepository.NewAddress(invoiceId, btc, wallet.Network);
                 _Aggregator.Publish(new InvoiceNewAddressEvent(invoiceId, address.ToString(), wallet.Network));
                 paymentMethod.SetPaymentMethodDetails(btc);
@@ -379,21 +365,6 @@ namespace BTCPayServer.Payments.Bitcoin
             _Aggregator.Publish(new InvoiceEvent(invoiceId, 1002, "invoice_receivedPayment"));
             return invoice;
         }
-
-        private async Task<List<DerivationStrategyBase>> GetStrategies(BTCPayNetwork network)
-        {
-            List<DerivationStrategyBase> strategies = new List<DerivationStrategyBase>();
-            foreach (var invoiceId in await _InvoiceRepository.GetPendingInvoices())
-            {
-                var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId);
-                var strategy = GetDerivationStrategy(invoice, network);
-                if (strategy != null)
-                    strategies.Add(strategy);
-            }
-
-            return strategies;
-        }
-
         public Task StopAsync(CancellationToken cancellationToken)
         {
             leases.Dispose();

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -582,7 +582,7 @@ namespace BTCPayServer.Services.Invoices
                 return new Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod()
                 {
                     FeeRate = FeeRate,
-                    DepositAddress = string.IsNullOrEmpty(DepositAddress) ? null : BitcoinAddress.Create(DepositAddress, Network?.NBitcoinNetwork),
+                    DepositAddress = string.IsNullOrEmpty(DepositAddress) ? null : DepositAddress,
                     TxFee = TxFee
                 };
             }
@@ -592,7 +592,7 @@ namespace BTCPayServer.Services.Invoices
                 if (details is Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod btcLike)
                 {
                     btcLike.TxFee = TxFee;
-                    btcLike.DepositAddress = BitcoinAddress.Create(DepositAddress, Network?.NBitcoinNetwork);
+                    btcLike.DepositAddress = string.IsNullOrEmpty(DepositAddress) ? null : DepositAddress;
                     btcLike.FeeRate = FeeRate;
                 }
                 return details;
@@ -655,7 +655,7 @@ namespace BTCPayServer.Services.Invoices
                 .OrderBy(p => p.ReceivedTime)
                 .Select(_ =>
                 {
-                    var txFee = _.GetValue(paymentMethods, GetId(), paymentMethods[_.GetpaymentMethodId()].GetTxFee());
+                    var txFee = _.GetValue(paymentMethods, GetId(), paymentMethods[_.GetPaymentMethodId()].GetTxFee());
                     paid += _.GetValue(paymentMethods, GetId());
                     if (!paidEnough)
                     {
@@ -663,7 +663,7 @@ namespace BTCPayServer.Services.Invoices
                         paidTxFee += txFee;
                     }
                     paidEnough |= paid >= RoundUp(totalDue, 8);
-                    if (GetId() == _.GetpaymentMethodId())
+                    if (GetId() == _.GetPaymentMethodId())
                     {
                         cryptoPaid += _.GetCryptoPaymentData().GetValue();
                         txRequired++;
@@ -766,7 +766,7 @@ namespace BTCPayServer.Services.Invoices
                 paymentData.Legacy = true;
                 return paymentData;
             }
-            if (GetpaymentMethodId().PaymentType == PaymentTypes.BTCLike)
+            if (GetPaymentMethodId().PaymentType == PaymentTypes.BTCLike)
             {
                 var paymentData = JsonConvert.DeserializeObject<Payments.Bitcoin.BitcoinLikePaymentData>(CryptoPaymentData);
                 // legacy
@@ -774,7 +774,7 @@ namespace BTCPayServer.Services.Invoices
                 paymentData.Outpoint = Outpoint;
                 return paymentData;
             }
-            if(GetpaymentMethodId().PaymentType== PaymentTypes.LightningLike)
+            if(GetPaymentMethodId().PaymentType== PaymentTypes.LightningLike)
             {
                 return JsonConvert.DeserializeObject<Payments.Lightning.LightningLikePaymentData>(CryptoPaymentData);
             }
@@ -802,7 +802,7 @@ namespace BTCPayServer.Services.Invoices
         {
             value = value ?? this.GetCryptoPaymentData().GetValue();
             var to = paymentMethodId;
-            var from = this.GetpaymentMethodId();
+            var from = this.GetPaymentMethodId();
             if (to == from)
                 return decimal.Round(value.Value, 8);
             var fromRate = paymentMethods[from].Rate;
@@ -813,7 +813,7 @@ namespace BTCPayServer.Services.Invoices
             return otherCurrencyValue;
         }
 
-        public PaymentMethodId GetpaymentMethodId()
+        public PaymentMethodId GetPaymentMethodId()
         {
 #pragma warning disable CS0618 // Type or member is obsolete
             return new PaymentMethodId(CryptoCode ?? "BTC", string.IsNullOrEmpty(CryptoPaymentDataType) ? PaymentTypes.BTCLike : Enum.Parse<PaymentTypes>(CryptoPaymentDataType));

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -130,7 +130,7 @@ namespace BTCPayServer.Services.Invoices
                         throw new InvalidOperationException("CryptoCode unsupported");
                     var paymentDestination = paymentMethod.GetPaymentMethodDetails().GetPaymentDestination();
 
-                    string address = GetDestination(paymentMethod);
+                    string address = GetDestination(paymentMethod, paymentMethod.Network.NBitcoinNetwork);
                     context.AddressInvoices.Add(new AddressInvoiceData()
                     {
                         InvoiceDataId = invoice.Id,
@@ -162,12 +162,12 @@ namespace BTCPayServer.Services.Invoices
             return invoice;
         }
 
-        private static string GetDestination(PaymentMethod paymentMethod)
+        private static string GetDestination(PaymentMethod paymentMethod, Network network)
         {
             // For legacy reason, BitcoinLikeOnChain is putting the hashes of addresses in database
             if (paymentMethod.GetId().PaymentType == Payments.PaymentTypes.BTCLike)
             {
-                return ((Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod)paymentMethod.GetPaymentMethodDetails()).DepositAddress.ScriptPubKey.Hash.ToString();
+                return ((Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod)paymentMethod.GetPaymentMethodDetails()).GetDepositAddress(network).ScriptPubKey.Hash.ToString();
             }
             ///////////////
             return paymentMethod.GetPaymentMethodDetails().GetPaymentDestination();
@@ -209,7 +209,7 @@ namespace BTCPayServer.Services.Invoices
                     InvoiceDataId = invoiceId,
                     CreatedTime = DateTimeOffset.UtcNow
                 }
-                .Set(GetDestination(currencyData), currencyData.GetId()));
+                .Set(GetDestination(currencyData, network.NBitcoinNetwork), currencyData.GetId()));
                 context.HistoricalAddressInvoices.Add(new HistoricalAddressInvoiceData()
                 {
                     InvoiceDataId = invoiceId,

BTCPayServer/Services/Wallets/BTCPayWallet.cs

@@ -137,6 +137,7 @@ namespace BTCPayServer.Services.Wallets
                     entry.AbsoluteExpiration = DateTimeOffset.UtcNow + CacheSpan;
                     return result;
                 });
+                _FetchingUTXOs.TryRemove(strategy.ToString(), out var unused);
                 completionSource.TrySetResult(utxos);
             }
             catch (Exception ex)

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -169,8 +169,9 @@
                                 <div adjust-height="" class="payment-box">
                                     <div class="bp-view payment scan" id="scan">
                                         <div class="payment__scan">
-                                            <img :src="srvModel.cryptoImage" style="position: absolute; height:64px; width:64px; left:118px; top:96px;" />
-                                            <qrcode :val="srvModel.invoiceBitcoinUrlQR" :size="256" bg-color="#f5f5f7" fg-color="#000" />
+                                            <img v-bind:src="srvModel.cryptoImage" style="position: absolute; height:64px; width:64px; left:118px; top:96px;" />
+                                            <qrcode v-bind:val="srvModel.invoiceBitcoinUrlQR" v-bind:size="256" bg-color="#f5f5f7" fg-color="#000">
+                                            </qrcode>
                                         </div>
                                         <div class="payment__details__instruction__open-wallet">
                                             <a class="payment__details__instruction__open-wallet__btn action-button" v-bind:href="srvModel.invoiceBitcoinUrl">

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -10,6 +10,9 @@
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .money {
+        text-align: right;
+    }
 </style>
 
 <section>
@@ -67,7 +70,7 @@
                     </tr>
                     <tr>
                         <th>Refund email</th>
-                        <td>@Model.RefundEmail</td>
+                        <td><a href="mailto:@Model.RefundEmail">@Model.RefundEmail</a></td>
                     </tr>
                     <tr>
                         <th>Order Id</th>
@@ -83,7 +86,7 @@
                     </tr>
                     <tr>
                         <th>Redirect Url</th>
-                        <td>@Model.RedirectUrl</td>
+                        <td><a href="@Model.RedirectUrl">@Model.RedirectUrl</a></td>
                     </tr>
                 </table>
             </div>
@@ -98,7 +101,7 @@
                     </tr>
                     <tr>
                         <th>Email</th>
-                        <td>@Model.BuyerInformation.BuyerEmail</td>
+                        <td><a href="mailto:@Model.BuyerInformation.BuyerEmail">@Model.BuyerInformation.BuyerEmail</a></td>
                     </tr>
                     <tr>
                         <th>Phone</th>
@@ -153,22 +156,22 @@
                 <table class="table">
                     <thead class="thead-inverse">
                         <tr>
-                            <th>Crypto</th>
-                            <th>Rate</th>
-                            <th>Paid</th>
-                            <th>Due</th>
+                            <th style="white-space:nowrap;">Payment method</th>
                             <th>Address</th>
+                            <th class="money">Rate</th>
+                            <th class="money">Paid</th>
+                            <th class="money">Due</th>
                         </tr>
                     </thead>
                     <tbody>
                         @foreach(var payment in Model.CryptoPayments)
                     {
                         <tr>
-                            <td>@payment.CryptoCode</td>
-                            <td>@payment.Rate</td>
-                            <td>@payment.Paid</td>
-                            <td>@payment.Due</td>
+                            <td>@payment.PaymentMethod</td>
                             <td>@payment.Address</td>
+                            <td class="money">@payment.Rate</td>
+                            <td class="money">@payment.Paid</td>
+                            <td class="money">@payment.Due</td>
                         </tr>
                 }
                     </tbody>
@@ -181,24 +184,21 @@
                 <table class="table">
                     <thead class="thead-inverse">
                         <tr>
-                            <th>Crypto</th>
-                            <th>Date</th>
+                            <th style="white-space:nowrap;">Payment method</th>
                             <th>Deposit address</th>
                             <th>Transaction Id</th>
-                            <th>Confirmations</th>
-                            <th>Replaced</th>
+                            <th style="text-align:right;">Confirmations</th>
                         </tr>
                     </thead>
                     <tbody>
                         @foreach(var payment in Model.Payments)
                     {
+                            var replaced = payment.Replaced ? "text-decoration: line-through;" : "";
                         <tr>
-                            <td>@payment.CryptoCode</td>
-                            <td>@payment.ReceivedTime</td>
-                            <td>@payment.DepositAddress</td>
-                            <td><a href="@payment.TransactionLink" target="_blank">@payment.TransactionId</a></td>
-                            <td>@payment.Confirmations</td>
-                            <td>@payment.Replaced</td>
+                            <td style="@replaced">@payment.PaymentMethod</td>
+                            <td style="@replaced">@payment.DepositAddress</td>
+                            <td style="@replaced"><a href="@payment.TransactionLink" target="_blank">@payment.TransactionId</a></td>
+                            <td style="text-align:right;">@payment.Confirmations</td>
                         </tr>
                 }
                     </tbody>
@@ -211,20 +211,19 @@
                 <table class="table">
                     <thead class="thead-inverse">
                         <tr>
-                            <th>Crypto</th>
+                            <th style="white-space:nowrap;">Payment method</th>
                             <th>Address</th>
-                            <th>Current</th>
                         </tr>
                     </thead>
                     <tbody>
                         @foreach(var address in Model.Addresses)
-                    {
+                        {
+                            var current = address.Current ? "font-weight: bold;" : "";
                         <tr>
-                            <td>@address.GetCryptoCode()</td>
-                            <td>@address.GetAddress()</td>
-                            <td>@(!address.UnAssigned.HasValue)</td>
+                            <td style="width:100px;@current">@address.PaymentMethod</td>
+                            <td style="max-width:100px;overflow:hidden;@current">@address.Destination</td>
                         </tr>
-                }
+                    }
                     </tbody>
                 </table>
             </div>

BTCPayServer/Views/Invoice/ListInvoices.cshtml

@@ -47,8 +47,8 @@
                         <th>OrderId</th>
                         <th>InvoiceId</th>
                         <th>Status</th>
-                        <th>Amount</th>
-                        <th>Actions</th>
+                        <th style="text-align:right">Amount</th>
+                        <th style="text-align:right">Actions</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -56,7 +56,16 @@
                     {
                         <tr>
                             <td>@invoice.Date</td>
-                            <td>@invoice.OrderId</td>
+                            <td>
+                                @if(invoice.RedirectUrl != string.Empty)
+                                {
+                                    <a href="@invoice.RedirectUrl">@invoice.OrderId</a>
+                                }
+                                else
+                                {
+                                    <span>@invoice.OrderId</span>
+                                }
+                            </td>
                             <td>@invoice.InvoiceId</td>
                             @if(invoice.Status == "paid")
                             {
@@ -73,10 +82,15 @@
                             }
                             else
                             {
-                                <td>@invoice.Status</td>
+                                <td >@invoice.Status</td>
                             }
-                            <td>@invoice.AmountCurrency</td>
-                            <td><a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a> - <a asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId">Details</a></td>
+                            <td style="text-align:right">@invoice.AmountCurrency</td>
+                            <td style="text-align:right">
+                                @if(invoice.Status == "new")
+                                {
+                                    <a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a> <span>-</span> 
+                                }<a asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId">Details</a>
+                            </td>
                         </tr>
                     }
                 </tbody>

BTCPayServer/wwwroot/js/core.js

@@ -71,7 +71,8 @@ function fetchStatus() {
     var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/" + srvModel.paymentMethodId + "/status";
     $.ajax({
         url: path,
-        type: "GET"
+        type: "GET",
+        cache: false
     }).done(function (data) {
         onDataCallback(data);
     }).fail(function (jqXHR, textStatus, errorThrown) {