Show restricted macaroon for LND

BTCPayServer/BTCPayServer.csproj

@@ -33,7 +33,7 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.2" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.3" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
     <PackageReference Include="Hangfire" Version="1.6.20" />
@@ -46,7 +46,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NBitcoin" Version="4.1.1.72" />
+    <PackageReference Include="NBitcoin" Version="4.1.1.73" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.30" />	  
     <PackageReference Include="DBreeze" Version="1.92.0" />
     <PackageReference Include="NBXplorer.Client" Version="2.0.0.1" />

BTCPayServer/Controllers/ServerController.cs

@@ -486,6 +486,10 @@ namespace BTCPayServer.Controllers
             {
                 model.Macaroon = Encoders.Hex.EncodeData(external.Macaroon);
             }
+            if (external.RestrictedMacaroon != null)
+            {
+                model.RestrictedMacaroon = Encoders.Hex.EncodeData(external.RestrictedMacaroon);
+            }
 
             if (nonce != null)
             {
@@ -534,6 +538,7 @@ namespace BTCPayServer.Controllers
                 conf.Port = external.BaseUri.Port;
                 conf.SSL = external.BaseUri.Scheme == "https";
                 conf.Macaroon = external.Macaroon == null ? null : Encoders.Hex.EncodeData(external.Macaroon);
+                conf.RestrictedMacaroon = external.RestrictedMacaroon == null ? null : Encoders.Hex.EncodeData(external.RestrictedMacaroon);
                 conf.CertificateThumbprint = external.CertificateThumbprint == null ? null : Encoders.Hex.EncodeData(external.CertificateThumbprint);
                 confs.Configurations.Add(conf);
             }
@@ -545,6 +550,7 @@ namespace BTCPayServer.Controllers
                 restconf.CryptoCode = cryptoCode;
                 restconf.Uri = external.BaseUri.AbsoluteUri;
                 restconf.Macaroon = external.Macaroon == null ? null : Encoders.Hex.EncodeData(external.Macaroon);
+                restconf.RestrictedMacaroon = external.RestrictedMacaroon == null ? null : Encoders.Hex.EncodeData(external.RestrictedMacaroon);
                 restconf.CertificateThumbprint = external.CertificateThumbprint == null ? null : Encoders.Hex.EncodeData(external.CertificateThumbprint);
                 confs.Configurations.Add(restconf);
             }
@@ -573,6 +579,18 @@ namespace BTCPayServer.Controllers
                     return null;
                 }
             }
+            if (connectionString.RestrictedMacaroonFilePath != null)
+            {
+                try
+                {
+                    connectionString.RestrictedMacaroon = System.IO.File.ReadAllBytes(connectionString.RestrictedMacaroonFilePath);
+                }
+                catch
+                {
+                    Logs.Configuration.LogWarning($"{cryptoCode}: The restrictedmacaroon file path of the external LND grpc config was not found ({connectionString.RestrictedMacaroonFilePathMacaroonFilePath})");
+                }
+                connectionString.RestrictedMacaroonFilePath = null;
+            }
             return connectionString;
         }
 

BTCPayServer/Models/ServerViewModels/LndGrpcServicesViewModel.cs

@@ -11,6 +11,7 @@ namespace BTCPayServer.Models.ServerViewModels
         public string Host { get; set; }
         public bool SSL { get; set; }
         public string Macaroon { get; set; }
+        public string RestrictedMacaroon { get; set; }
         public string CertificateThumbprint { get; set; }
         public string QRCode { get; set; }
         public string QRCodeLink { get; set; }

BTCPayServer/Services/LightningConfigurationProvider.cs

@@ -51,6 +51,7 @@ namespace BTCPayServer.Services
         public bool SSL { get; set; }
         public string CertificateThumbprint { get; set; }
         public string Macaroon { get; set; }
+        public string RestrictedMacaroon { get; set; }
     }
     public class LNDRestConfiguration
     {
@@ -60,5 +61,6 @@ namespace BTCPayServer.Services
         public string Uri { get; set; }
         public string Macaroon { get; set; }
         public string CertificateThumbprint { get; set; }
+        public string RestrictedMacaroon { get; set; }
     }
 }

BTCPayServer/Views/Server/LndServices.cshtml

@@ -86,6 +86,13 @@
                         <input asp-for="Macaroon" readonly class="form-control" />
                     </div>
                 }
+                @if (Model.RestrictedMacaroon != null)
+                {
+                    <div class="form-group">
+                        <label asp-for="RestrictedMacaroon"></label>
+                        <input asp-for="RestrictedMacaroon" readonly class="form-control" />
+                    </div>
+                }
                 @if (Model.CertificateThumbprint != null)
                 {
                     <div class="form-group">