bump

Javascript floating point math fix, closes #701

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.88</Version>
+		<Version>1.0.3.89</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -30,15 +30,17 @@
     <None Remove="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="bundleconfig.json" />
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.14" />
-    <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
+    <PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
+    <PackageReference Include="BundlerMinifier.Core" Version="2.9.406" />
+    <PackageReference Include="BundlerMinifier.TagHelpers" Version="2.9.406" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
     <PackageReference Include="HtmlSanitizer" Version="4.0.199" />
     <PackageReference Include="LedgerWallet" Version="2.0.0.3" />
-    <PackageReference Include="Meziantou.AspNetCore.BundleTagHelpers" Version="2.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.2">

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -36,7 +36,6 @@ using BTCPayServer.Authentication;
 using Microsoft.Extensions.Caching.Memory;
 using BTCPayServer.Logging;
 using BTCPayServer.HostedServices;
-using Meziantou.AspNetCore.BundleTagHelpers;
 using System.Security.Claims;
 using BTCPayServer.PaymentRequest;
 using BTCPayServer.Payments.Changelly;
@@ -48,6 +47,7 @@ using NBXplorer.DerivationStrategy;
 using NicolasDorier.RateLimits;
 using Npgsql;
 using BTCPayServer.Services.Apps;
+using BundlerMinifier.TagHelpers;
 
 namespace BTCPayServer.Hosting
 {
@@ -218,7 +218,7 @@ namespace BTCPayServer.Hosting
             services.AddAuthorization(o => Policies.AddBTCPayPolicies(o));
             BitpayAuthentication.AddAuthentication(services);
 
-            services.AddBundles();
+            services.AddSingleton<IBundleProvider, ResourceBundleProvider>();
             services.AddTransient<BundleOptions>(provider =>
             {
                 var opts = provider.GetRequiredService<BTCPayServerOptions>();

BTCPayServer/Hosting/ResourceBundleProvider.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using BundlerMinifier.TagHelpers;
+using Microsoft.AspNetCore.Hosting;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Hosting
+{
+    public class ResourceBundleProvider : IBundleProvider
+    {
+        BundleProvider _InnerProvider;
+        Lazy<Dictionary<string, Bundle>> _BundlesByName;
+        public ResourceBundleProvider(IHostingEnvironment hosting, BundleOptions options)
+        {
+            if (options.UseBundles)
+            {
+                _BundlesByName = new Lazy<Dictionary<string, Bundle>>(() =>
+                {
+                    using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("BTCPayServer.bundleconfig.json"))
+                    using (var reader = new StreamReader(stream, Encoding.UTF8))
+                    {
+                        var content = reader.ReadToEnd();
+                        return JArray.Parse(content).OfType<JObject>()
+                               .Select(jobj => new Bundle()
+                               {
+                                   Name = jobj.Property("name")?.Value.Value<string>() ?? jobj.Property("outputFileName").Value.Value<string>(),
+                                   OutputFileUrl = Path.Combine(hosting.ContentRootPath, jobj.Property("outputFileName").Value.Value<string>())
+                               }).ToDictionary(o => o.Name, o => o);
+                    }
+                }, true);
+            }
+            else
+            {
+                _InnerProvider = new BundleProvider();
+            }
+        }
+        public Bundle GetBundle(string name)
+        {
+            if (_InnerProvider != null)
+                return _InnerProvider.GetBundle(name);
+            _BundlesByName.Value.TryGetValue(name, out var bundle);
+            return bundle;
+        }
+    }
+}

BTCPayServer/Hosting/Startup.cs

@@ -34,7 +34,6 @@ using Microsoft.AspNetCore.Mvc.Cors.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using System.Net;
 using BTCPayServer.PaymentRequest;
-using Meziantou.AspNetCore.BundleTagHelpers;
 using BTCPayServer.Security;
 using BTCPayServer.Services.Apps;
 

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -100,13 +100,25 @@ namespace BTCPayServer.Payments.Lightning
                 {
                     var charge = lightningSupportedMethod.CreateClient(network);
                     LightningInvoice chargeInvoice = null;
+                    string errorMessage = $"{lightningSupportedMethod.CryptoCode} (Lightning): Can't connect to the lightning server";
                     try
                     {
                         chargeInvoice = await charge.GetInvoice(lightningMethod.InvoiceId);
                     }
+                    catch (System.Net.Sockets.SocketException socketEx) when (socketEx.SocketErrorCode == System.Net.Sockets.SocketError.ConnectionRefused)
+                    {
+                        Logs.PayServer.LogError(errorMessage);
+                        continue;
+                    }
+                    catch (Exception ex) when (ex.InnerException is System.Net.Sockets.SocketException socketEx
+                                              && socketEx.SocketErrorCode == System.Net.Sockets.SocketError.ConnectionRefused)
+                    {
+                        Logs.PayServer.LogError(errorMessage);
+                        continue;
+                    }
                     catch (Exception ex)
                     {
-                        Logs.PayServer.LogError(ex, $"{lightningSupportedMethod.CryptoCode} (Lightning): Can't connect to the lightning server");
+                        Logs.PayServer.LogError(ex, errorMessage);
                         continue;
                     }
                     if (chargeInvoice == null)

BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @model UpdateCrowdfundViewModel
 @{
     ViewData["Title"] = "Update Crowdfund";

BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 @model BTCPayServer.Models.AppViewModels.ViewCrowdfundViewModel
 @{

BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 
 @model BTCPayServer.Models.AppViewModels.ViewPointOfSaleViewModel

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.Services.LanguageService langService
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Linq

BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml

@@ -1,6 +1,6 @@
 @using BTCPayServer.Services.PaymentRequests
 @model BTCPayServer.Models.PaymentRequestViewModels.UpdatePaymentRequestViewModel
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 
 <section>
     <div class="container">

BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml

@@ -1,6 +1,6 @@
 @model BTCPayServer.Models.PaymentRequestViewModels.ViewPaymentRequestViewModel
 
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 @{
     ViewData["Title"] = Model.Title;

BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 
 @model BTCPayServer.Controllers.ShowLightningNodeInfoViewModel

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -5,7 +5,7 @@
 @inject BTCPayServer.HostedServices.NBXplorerDashboard dashboard
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 
 <!DOCTYPE html>
 <html lang="en">

BTCPayServer/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -1,3 +1,3 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
 
 <bundle name="wwwroot/bundles/jqueryvalidate-bundle.min.js" />

BTCPayServer/wwwroot/checkout/js/core.js

@@ -106,7 +106,8 @@ function onDataCallback(jsonData) {
 }
 
 function numberFormatted(x) {
-    var parts = x.toString().split(".");
+    var rounded = Math.round(x);
+    var parts = rounded.toString().split(".");
     parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, " ");
     return parts.join(".");
 }

BTCPayServer/wwwroot/locales/pt-BR.json

@@ -24,16 +24,16 @@
   "Copied": "Copiado",
   "ConversionTab_BodyTop": "Você pode pagar {{btcDue}} {{cryptoCode}} utilizando outras altcoins além das que a loja aceita diretamente.",
   "ConversionTab_BodyDesc": "Esse serviço é oferecido por terceiros. Por favor, tenha em mente que não temos nenhum controle sobre como seus fundos serão utilizados. A fatura apenas será marcada como paga quando os fundos forem recebidos na Blockchain {{cryptoCode}}.",
-  "ConversionTab_CalculateAmount_Error": "Retry",
-  "ConversionTab_LoadCurrencies_Error": "Retry",
+  "ConversionTab_CalculateAmount_Error": "Tentar novamente",
+  "ConversionTab_LoadCurrencies_Error": "Tentar novamente",
   "ConversionTab_Lightning": "Não há provedores de conversão disponíveis para pagamentos via Lightning Network.",
-  "ConversionTab_CurrencyList_Select_Option": "Please select a currency to convert from",
+  "ConversionTab_CurrencyList_Select_Option": "Por favor selecione a moeda da qual pretende converter",
   "Invoice expiring soon...": "A fatura está expirando...",
   "Invoice expired": "Fatura expirada",
   "What happened?": "O que aconteceu?",
   "InvoiceExpired_Body_1": "Essa fatura expirou. Uma fatura é válida por apenas {{maxTimeMinutes}} minutos. \nVocê pode voltar para {{storeName}} se quiser enviar o seu pagamento novamente.",
   "InvoiceExpired_Body_2": "Se você tentou enviar um pagamento, ele ainda não foi aceito pela rede Bitcoin. Nós ainda não recebemos o valor enviado.",
-  "InvoiceExpired_Body_3": "",
+  "InvoiceExpired_Body_3": "Se o recebermos mais tarde, vamos processar o pedido ou entrar em contato para combinarmos uma devolução...",
   "Invoice ID": "Nº da Fatura",
   "Order ID": "Nº do Pedido",
   "Return to StoreName": "Voltar para {{storeName}}",
@@ -41,10 +41,10 @@
   "This invoice has been archived": "Essa fatura foi arquivada",
   "Archived_Body": "Por favor, entre em contato com o estabelecimento para informações e suporte",
   "BOLT 11 Invoice": "Fatura BOLT 11",
-  "Node Info": "Informação de nó",
+  "Node Info": "Informação do nó",
   "txCount": "{{count}} transação",
   "txCount_plural": "{{count}} transações",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly",
-  "Close": "Close"
+  "Pay with CoinSwitch": "Pagar com CoinSwitch",
+  "Pay with Changelly": "Pagar com Changelly",
+  "Close": "Fechar"
 }