Update NBitcoin and NBXplorer

BTCPayServer.Tests/BTCPayServer.Tests.csproj

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

BTCPayServer.Tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.0.5-sdk-2.1.4
+FROM microsoft/dotnet:2.0.6-sdk-2.1.101-stretch
 WORKDIR /app
  # caches restore result by copying csproj file separately
 COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj
@@ -9,4 +9,4 @@ RUN dotnet restore
 # copies the rest of your code
 COPY . ../.
 
-ENTRYPOINT ["dotnet", "test"]
+ENTRYPOINT ["dotnet", "test"]

BTCPayServer.Tests/docker-compose.yml

@@ -46,7 +46,7 @@ services:
       - lightning-charged
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.1.24
+    image: nicolasdorier/nbxplorer:1.0.1.25
     ports:
       - "32838:32838"
     expose: 
@@ -89,7 +89,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: nicolasdorier/clightning
+    image: nicolasdorier/clightning:0.0.0.2
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -110,11 +110,10 @@ services:
       - bitcoind
 
   lightning-charged:
-    image: shesek/lightning-charge:0.3.5
+    image: shesek/lightning-charge:0.3.7
     environment:
       NETWORK: regtest
       API_TOKEN: foiewnccewuify
-      SKIP_BITCOIND: 1
       BITCOIND_RPCCONNECT: bitcoind
     volumes:
       - "bitcoin_datadir:/etc/bitcoin"
@@ -130,7 +129,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: nicolasdorier/clightning
+    image: nicolasdorier/clightning:0.0.0.2
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |

BTCPayServer/BTCPayNetworkProvider.Litecoin.cs

@@ -12,7 +12,7 @@ namespace BTCPayServer
     {
         public void InitLitecoin()
         {
-            NBXplorer.Altcoins.Litecoin.Networks.EnsureRegistered();
+            NBitcoin.Altcoins.Litecoin.EnsureRegistered();
             var ltcRate = new CoinAverageRateProvider("LTC");
 
             var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LTC");

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.72</Version>
+		<Version>1.0.1.74</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -35,10 +35,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.65" />
+    <PackageReference Include="NBitcoin" Version="4.1.0.3" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.18" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.1.16" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.1.17" />
     <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" />
@@ -49,8 +49,8 @@
   </ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.2" PrivateAssets="All" />
 		<PackageReference Include="YamlDotNet" Version="4.3.1" />
 	</ItemGroup>
 

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -92,11 +92,14 @@ namespace BTCPayServer.Configuration
             PostgresConnectionString = conf.GetOrDefault<string>("postgres", null);
             BundleJsCss = conf.GetOrDefault<bool>("bundlejscss", true);
             ExternalUrl = conf.GetOrDefault<Uri>("externalurl", null);
+
+            RootPath = conf.GetOrDefault<string>("rootpath", "/");
+
             var old = conf.GetOrDefault<Uri>("internallightningnode", null);
             if(old != null)
                 throw new ConfigException($"internallightningnode should not be used anymore, use btclightning instead");
         }
-
+        public string RootPath { get; set; }
         public Dictionary<string, LightningConnectionString> InternalLightningByCryptoCode { get; set; } = new Dictionary<string, LightningConnectionString>();
 
         public BTCPayNetworkProvider NetworkProvider { get; set; }

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -31,6 +31,9 @@ namespace BTCPayServer.Configuration
             app.Option("--regtest | -regtest", $"Use regtest (Deprecated, use --network instead)", CommandOptionType.BoolValue);
             app.Option("--chains | -c", $"Chains to support comma separated (default: btc, available: {chains})", CommandOptionType.SingleValue);
             app.Option("--postgres", $"Connection string to postgres database (default: sqlite is used)", CommandOptionType.SingleValue);
+            app.Option("--externalurl", $"The expected external url of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
+            app.Option("--bundlejscss", $"Bundle javascript and css files for better performance (default: true)", CommandOptionType.SingleValue);
+            app.Option("--rootpath", "The root path in the URL to access BTCPay (default: /)", CommandOptionType.SingleValue);
             foreach (var network in provider.GetAll())
             {
                 var crypto = network.CryptoCode.ToLowerInvariant();
@@ -38,8 +41,6 @@ namespace BTCPayServer.Configuration
                 app.Option($"--{crypto}explorercookiefile", $"Path to the cookie file (default: {network.NBXplorerNetwork.DefaultSettings.DefaultCookieFile})", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}lightning", $"Easy configuration of lightning for the server adnistrator: Must be a unix socket of CLightning (lightning-rpc) or URL to a charge server (default: empty)", CommandOptionType.SingleValue);
             }
-            app.Option("--externalurl", $"The expected external url of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
-            app.Option("--bundlejscss", $"Bundle javascript and css files for better performance (default: true)", CommandOptionType.SingleValue);
             return app;
         }
 

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -443,11 +443,14 @@ namespace BTCPayServer.Controllers
             StatusMessage = null;
             if (store.Role != StoreRoles.Owner)
             {
-                StatusMessage = "Error: You need to be owner of this store to create an invoice";
+                ModelState.AddModelError(nameof(model.StoreId), "You need to be owner of this store to create an invoice");
+                return View(model);
             }
+
             if (store.GetSupportedPaymentMethods(_NetworkProvider).Count() == 0)
             {
-                StatusMessage = "Error: You need to configure the derivation scheme in order to create an invoice";
+                ModelState.AddModelError(nameof(model.StoreId), "You need to configure the derivation scheme in order to create an invoice");
+                return View(model);
             }
 
             if(StatusMessage != null)

BTCPayServer/Controllers/StoresController.cs

@@ -197,8 +197,8 @@ namespace BTCPayServer.Controllers
             vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
             vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
             vm.AllowCoinConversion = storeBlob.AllowCoinConversion;
-            vm.CustomCSS = storeBlob.CustomCSS;
-            vm.CustomLogo = storeBlob.CustomLogo;
+            vm.CustomCSS = storeBlob.CustomCSS?.AbsoluteUri;
+            vm.CustomLogo = storeBlob.CustomLogo?.AbsoluteUri;
             return View(vm);
         }
 
@@ -245,8 +245,8 @@ namespace BTCPayServer.Controllers
             blob.AllowCoinConversion = model.AllowCoinConversion;
             blob.LightningMaxValue = lightningMaxValue;
             blob.OnChainMinValue = onchainMinValue;
-            blob.CustomLogo = model.CustomLogo;
-            blob.CustomCSS = model.CustomCSS;
+            blob.CustomLogo = string.IsNullOrWhiteSpace(model.CustomLogo) ? null : new Uri(model.CustomLogo, UriKind.Absolute);
+            blob.CustomCSS = string.IsNullOrWhiteSpace(model.CustomCSS) ? null : new Uri(model.CustomCSS, UriKind.Absolute);
             if (store.SetStoreBlob(blob))
             {
                 needUpdate = true;

BTCPayServer/Hosting/Startup.cs

@@ -147,7 +147,25 @@ namespace BTCPayServer.Hosting
             IApplicationBuilder app,
             IHostingEnvironment env,
             IServiceProvider prov,
+            BTCPayServerOptions options,
             ILoggerFactory loggerFactory)
+        {
+            Logs.Configure(loggerFactory);
+            Logs.Configuration.LogInformation($"Root Path: {options.RootPath}");
+            if (options.RootPath.Equals("/", StringComparison.OrdinalIgnoreCase))
+            {
+                ConfigureCore(app, env, prov, loggerFactory);
+            }
+            else
+            {
+                app.Map(options.RootPath, appChild =>
+                {
+                    ConfigureCore(appChild, env, prov, loggerFactory);
+                });
+            }
+        }
+
+        private static void ConfigureCore(IApplicationBuilder app, IHostingEnvironment env, IServiceProvider prov, ILoggerFactory loggerFactory)
         {
             if (env.IsDevelopment())
             {
@@ -155,9 +173,6 @@ namespace BTCPayServer.Hosting
                 app.UseBrowserLink();
             }
 
-
-            Logs.Configure(loggerFactory);
-
             //App insight do not that by itself...
             loggerFactory.AddApplicationInsights(prov, LogLevel.Information);
 

BTCPayServer/Models/StoreViewModels/CheckoutExperienceViewModel.cs

@@ -37,10 +37,10 @@ namespace BTCPayServer.Models.StoreViewModels
 
         [Display(Name = "Link to a custom CSS stylesheet")]
         [Url]
-        public Uri CustomCSS { get; set; }
+        public string CustomCSS { get; set; }
         [Display(Name = "Link to a custom logo")]
         [Url]
-        public Uri CustomLogo { get; set; }
+        public string CustomLogo { get; set; }
 
         public void SetCryptoCurrencies(ExplorerClientProvider explorerProvider, string defaultCrypto)
         {