notify on invalid in fullnotification is true

BTCPayServer.Tests/docker-compose.yml

@@ -21,7 +21,7 @@ services:
       - "tests:127.0.0.1"
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.0.28
+    image: nicolasdorier/nbxplorer:1.0.0.29
     ports:
       - "32838:32838"
     expose: 
@@ -39,6 +39,9 @@ services:
       - bitcoind
       - postgres
 
+  eclair:
+    image: nicolasdorier/docker-bitcoin:0.15.0.1
+
   bitcoind:
     container_name: btcpayserver_dev_bitcoind
     image: nicolasdorier/docker-bitcoin:0.15.0.1

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.0.29</Version>
+		<Version>1.0.0.33</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
@@ -21,7 +21,7 @@
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.1" />
     <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
-    <PackageReference Include="NBitcoin" Version="4.0.0.41" />
+    <PackageReference Include="NBitcoin" Version="4.0.0.48" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.12" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
     <PackageReference Include="NBXplorer.Client" Version="1.0.0.18" />

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -57,6 +57,7 @@ namespace BTCPayServer.Configuration
             CookieFile = conf.GetOrDefault<string>("explorer.cookiefile", networkInfo.DefaultExplorerCookieFile);
             RequireHttps = conf.GetOrDefault<bool>("requirehttps", false);
             PostgresConnectionString = conf.GetOrDefault<string>("postgres", null);
+            ExternalUrl = conf.GetOrDefault<Uri>("externalurl", null);
         }
 
         public bool RequireHttps
@@ -68,5 +69,10 @@ namespace BTCPayServer.Configuration
             get;
             set;
         }
+        public Uri ExternalUrl
+        {
+            get;
+            set;
+        }
     }
 }

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -19,8 +19,8 @@ namespace BTCPayServer.Configuration
         {
             CommandLineApplication app = new CommandLineApplication(true)
             {
-                FullName = "NBXplorer\r\nLightweight block explorer for tracking HD wallets",
-                Name = "NBXplorer"
+                FullName = "BTCPay\r\nOpen source, self-hosted payment processor.",
+                Name = "BTCPay"
             };
             app.HelpOption("-? | -h | --help");
             app.Option("-n | --network", $"Set the network among ({NetworkInformation.ToStringAll()}) (default: {Network.Main.ToString()})", CommandOptionType.SingleValue);
@@ -30,7 +30,7 @@ namespace BTCPayServer.Configuration
             app.Option("--postgres", $"Connection string to postgres database (default: sqlite is used)", CommandOptionType.SingleValue);
             app.Option("--explorerurl", $"Url of the NBxplorer (default: : Default setting of NBXplorer for the network)", CommandOptionType.SingleValue);
             app.Option("--explorercookiefile", $"Path to the cookie file (default: Default setting of NBXplorer for the network)", CommandOptionType.SingleValue);
-
+            app.Option("--externalurl", $"The expected external url of this service, use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
             return app;
         }
 

BTCPayServer/Hosting/BTCpayMiddleware.cs

@@ -30,13 +30,16 @@ namespace BTCPayServer.Hosting
         TokenRepository _TokenRepository;
         RequestDelegate _Next;
         CallbackController _CallbackController;
+        BTCPayServerOptions _Options;
         public BTCPayMiddleware(RequestDelegate next,
             TokenRepository tokenRepo,
+            BTCPayServerOptions options,
             CallbackController callbackController)
         {
             _TokenRepository = tokenRepo ?? throw new ArgumentNullException(nameof(tokenRepo));
             _Next = next ?? throw new ArgumentNullException(nameof(next));
             _CallbackController = callbackController;
+            _Options = options ?? throw new ArgumentNullException(nameof(options));
         }
 
 
@@ -50,6 +53,16 @@ namespace BTCPayServer.Hosting
                 _Registered = true;
             }
 
+            // Make sure that code executing after this point think that the external url has been hit.
+            if(_Options.ExternalUrl != null)
+            {
+                httpContext.Request.Scheme = _Options.ExternalUrl.Scheme;
+                if(_Options.ExternalUrl.IsDefaultPort)
+                    httpContext.Request.Host = new HostString(_Options.ExternalUrl.Host);
+                else
+                    httpContext.Request.Host = new HostString(_Options.ExternalUrl.Host, _Options.ExternalUrl.Port);
+            }
+
             httpContext.Request.Headers.TryGetValue("x-signature", out StringValues values);
             var sig = values.FirstOrDefault();
             httpContext.Request.Headers.TryGetValue("x-identity", out values);

BTCPayServer/Services/Invoices/InvoiceWatcher.cs

@@ -133,6 +133,10 @@ namespace BTCPayServer.Services.Invoices
                 needSave = true;
                 await _InvoiceRepository.UnaffectAddress(invoice.Id);
                 invoice.Status = "expired";
+                if (invoice.FullNotifications)
+                {
+                    _NotificationManager.Notify(invoice);
+                }
             }
 
             if (invoice.Status == "new" || invoice.Status == "expired")

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -10,7 +10,7 @@
     <!-- base href="/" -->
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>BitPay Invoice</title>
+    <title>BTCPay Invoice</title>
 
     <environment include="Development">
         <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />