Bump Newtonsoft.Json from 13.0.1 to 13.0.2 in /BTCPayServer

.circleci/config.yml

@@ -149,3 +149,4 @@ workflows:
               ignore: /.*/
             tags:
               only: /(v[1-9]+(\.[0-9]+)*(-[a-z0-9-]+)?)|(v[a-z0-9-]+)/
+

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 # These are supported funding model platforms
-custom: https://foundation.btcpayserver.org
+custom: "https://btcpayserver.org/donate/"

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -30,7 +30,7 @@
     <ItemGroup>
       <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.3.8" />
       <PackageReference Include="NBitcoin" Version="7.0.10" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     </ItemGroup>
   <ItemGroup>
     <None Include="icon.png" Pack="true" PackagePath="\" />

BTCPayServer.Rating/BTCPayServer.Rating.csproj

@@ -7,7 +7,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
     <PackageReference Include="NBitcoin" Version="7.0.10" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="1.0.2" />
   </ItemGroup>
 

BTCPayServer/BTCPayServer.csproj

@@ -68,7 +68,7 @@
     <PackageReference Include="QRCoder" Version="1.4.3" />
     <PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.39" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
     <PackageReference Include="NicolasDorier.RateLimits" Version="1.2.3" />

BTCPayServer/Models/ServerViewModels/LNDGRPCServicesViewModel.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Models.ServerViewModels
+{
+    public class LndGrpcServicesViewModel
+    {
+        public string Host { get; set; }
+        public bool SSL { get; set; }
+        public string Macaroon { get; set; }
+        public string AdminMacaroon { get; set; }
+        public string ReadonlyMacaroon { get; set; }
+        public string InvoiceMacaroon { get; set; }
+        public string CertificateThumbprint { get; set; }
+        [Display(Name = "GRPC SSL Cipher suite (GRPC_SSL_CIPHER_SUITES)")]
+        public string GRPCSSLCipherSuites { get; set; }
+        public string QRCode { get; set; }
+        public string QRCodeLink { get; set; }
+        [Display(Name = "REST Uri")]
+        public string Uri { get; set; }
+        public string ConnectionType { get; internal set; }
+    }
+}

BTCPayServer/Views/UIInvoice/Checkout.cshtml

@@ -116,7 +116,7 @@
                         </script>
                     </div>
                     <div class="powered__by__btcpayserver">
-                        Powered by <a target="_blank" href="https://github.com/btcpayserver/btcpayserver" rel="noreferrer noopener">BTCPay Server</a>
+                        Powered by <a target="_blank" href="https://github.com/Eskyee/btcpayjungle">BTCPay Jungle</a>
                     </div>
                     @if (env.CheatMode)
                     {

BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml

@@ -379,4 +379,4 @@
     </div>
     <partial name="LayoutFoot"/>
 </body>
-</html>
+</html>

BTCPayServer/Views/UIServer/LNDGRPCServices.cshtml

@@ -0,0 +1,106 @@
+@model LndGrpcServicesViewModel
+@{
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+}
+
+
+<h4>LND GRPC</h4>
+<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
+<div class="row">
+    <div class="col-md-6">
+        <div asp-validation-summary="All" class="text-danger"></div>
+    </div>
+</div>
+
+<div class="row">
+
+    <div class="col-md-8">
+        <div class="form-group">
+            <p>
+                <span>BTCPay exposes gRPC services for outside consumption, you will find connection information here.<br /></span>
+            </p>
+        </div>
+
+        <div class="form-group">
+            <h5>QR Code connection</h5>
+            <p>
+                <span>You can use this QR Code to connect your Zap wallet to your LND instance.<br /></span>
+                <span>This QR Code is only valid for 10 minutes</span>
+            </p>
+        </div>
+        <div class="form-group">
+            @if(Model.QRCode == null)
+            {
+                <div class="form-group">
+                    <form method="post">
+                        <button type="submit" class="btn btn-primary">Show QR Code</button>
+                    </form>
+                </div>
+            }
+            else
+            {
+                <div class="form-group">
+                    <div id="qrCode"></div>
+                    <div id="qrCodeData" data-url="@Html.Raw(Model.QRCode)"></div>
+                </div>
+                <p>See QR Code information by clicking <a href="#detailsQR" data-toggle="collapse">here</a></p>
+                <div id="detailsQR" class="collapse">
+                    <div class="form-group">
+                        <label>QR Code data</label>
+                        <input asp-for="QRCode" readonly class="form-control" />
+                    </div>
+                    <div class="form-group">
+                        Click <a href="@Model.QRCodeLink" target="_blank">here</a> to open the configuration file.
+                    </div>
+                </div>
+            }
+
+
+            <div class="form-group">
+                <h5>More details...</h5>
+                <p>Alternatively, you can see the settings by clicking <a href="#details" data-toggle="collapse">here</a></p>
+            </div>
+            <div id="details" class="collapse">
+                <div class="form-group">
+                    <label asp-for="Host"></label>
+                    <input asp-for="Host" readonly class="form-control" />
+                </div>
+                <div class="form-group">
+                    <label asp-for="SSL"></label>
+                    <input asp-for="SSL" disabled type="checkbox" class="form-check-inline" />
+                </div>
+                @if(Model.Macaroon != null)
+                {
+                    <div class="form-group">
+                        <label asp-for="Macaroon"></label>
+                        <input asp-for="Macaroon" readonly class="form-control" />
+                    </div>
+                }
+                @if(Model.CertificateThumbprint != null)
+                {
+                    <div class="form-group">
+                        <label asp-for="CertificateThumbprint"></label>
+                        <input asp-for="CertificateThumbprint" readonly class="form-control" />
+                    </div>
+                }
+            </div>
+        </div>
+    </div>
+</div>
+
+@section Scripts {
+    @await Html.PartialAsync("_ValidationScriptsPartial")
+
+    @if(Model.QRCode != null)
+    {
+        <script type="text/javascript" src="~/js/qrcode.min.js"></script>
+        <script type="text/javascript">
+        new QRCode(document.getElementById("qrCode"),
+            {
+                text: "@Html.Raw(Model.QRCode)",
+                width: 150,
+                height: 150
+            });
+        </script>
+    }
+}

BTCPayServer/Views/UIStores/StoreUsers.cshtml

@@ -9,7 +9,7 @@
     <div class="col-xxl-constrain col-xl-8">
         <h3 class="mb-3">@ViewData["Title"]</h3>
         <p>
-            Give other registered BTCPay Server users access to your store.<br />
+            Give other registered Jungle Server users access to your store.<br />
             Guests will not be able to see or modify the store settings.
         </p>