Fix logs name for Events, try catch websocket closure

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.0.43</Version>
+		<Version>1.0.0.47</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -235,6 +235,7 @@ namespace BTCPayServer.Controllers
                     await webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Closing", cts.Token);
                 }
             }
+            catch { }
             finally { webSocket.Dispose(); }
         }
 

BTCPayServer/Controllers/StoresController.cs

@@ -263,7 +263,7 @@ namespace BTCPayServer.Controllers
                 //var p2wsh = 0x2aa7ed3U;
                 Dictionary<uint, string[]> electrumMapping = new Dictionary<uint, string[]>();
                 //Source https://github.com/spesmilo/electrum/blob/9edffd17542de5773e7284a8c8a2673c766bb3c3/lib/bitcoin.py
-                var standard = _Network == Network.Main ? 0x0488b21eU : 0x043587cf;
+                var standard = 0x0488b21eU;
                 electrumMapping.Add(standard, new[] { "legacy" });
                 var p2wpkh_p2sh = 0x049d7cb2U;
                 electrumMapping.Add(p2wpkh_p2sh, new string[] { "p2sh" });
@@ -276,7 +276,7 @@ namespace BTCPayServer.Controllers
                 var prefix = Utils.ToUInt32(data, false);
                 if (!electrumMapping.TryGetValue(prefix, out string[] labels))
                     throw new FormatException("!electrumMapping.TryGetValue(prefix, out string[] labels)");
-                var standardPrefix = Utils.ToBytes(standard, false);
+                var standardPrefix = Utils.ToBytes(_Network == Network.Main ? 0x0488b21eU : 0x043587cf, false);
 
                 for (int i = 0; i < 4; i++)
                     data[i] = standardPrefix[i];

BTCPayServer/Logging/Logs.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer.Logging
         {
             Configuration = factory.CreateLogger("Configuration");
             PayServer = factory.CreateLogger("PayServer");
-            Events = factory.CreateLogger("PayServer");
+            Events = factory.CreateLogger("Events");
         }
         public static ILogger Configuration
         {

BTCPayServer/Services/BTCPayServerEnvironment.cs

@@ -36,7 +36,7 @@ namespace BTCPayServer.Services
         {
             StringBuilder txt = new StringBuilder();
             txt.Append($"@Copyright BTCPayServer v{Version}");
-            if (!Environment.IsProduction() || Build.Equals("Release", StringComparison.OrdinalIgnoreCase))
+            if (!Environment.IsProduction() || !Build.Equals("Release", StringComparison.OrdinalIgnoreCase))
             {
                 txt.Append($" Environment: {Environment.EnvironmentName} Build: {Build}");
             }

BTCPayServer/wwwroot/js/core.js

@@ -208,10 +208,15 @@ if (supportsWebSockets) {
     var path = srvModel.serverUrl + "/i/" + srvModel.invoiceId + "/status/ws";
     path = path.replace("https://", "wss://");
     path = path.replace("http://", "ws://");
-    var socket = new WebSocket(path);
-    socket.onmessage = function (e) {
-        fetchStatus();
-    };
+    try {
+        var socket = new WebSocket(path);
+        socket.onmessage = function (e) {
+            fetchStatus();
+        };
+    }
+    catch (e) {
+        console.error("Error while connecting to websocket for invoice notifictions");
+    }
 }
 
 var watcher = setInterval(function () {