diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 36e7d9a28..6ea7245bf 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -33,7 +33,7 @@
-
+
diff --git a/BTCPayServer/Controllers/ServerController.cs b/BTCPayServer/Controllers/ServerController.cs
index f5d61b263..96d6774f0 100644
--- a/BTCPayServer/Controllers/ServerController.cs
+++ b/BTCPayServer/Controllers/ServerController.cs
@@ -536,10 +536,6 @@ namespace BTCPayServer.Controllers
{
model.Macaroon = Encoders.Hex.EncodeData(external.Macaroon);
}
- if (external.RestrictedMacaroon != null)
- {
- model.RestrictedMacaroon = Encoders.Hex.EncodeData(external.RestrictedMacaroon);
- }
if (nonce != null)
{
@@ -588,7 +584,6 @@ 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);
}
@@ -600,7 +595,6 @@ 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);
}
@@ -629,18 +623,6 @@ 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.RestrictedMacaroonFilePath})");
- }
- connectionString.RestrictedMacaroonFilePath = null;
- }
return connectionString;
}
diff --git a/BTCPayServer/Services/LightningConfigurationProvider.cs b/BTCPayServer/Services/LightningConfigurationProvider.cs
index cb7842af3..87bedef1d 100644
--- a/BTCPayServer/Services/LightningConfigurationProvider.cs
+++ b/BTCPayServer/Services/LightningConfigurationProvider.cs
@@ -51,7 +51,6 @@ 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
{
@@ -61,6 +60,5 @@ namespace BTCPayServer.Services
public string Uri { get; set; }
public string Macaroon { get; set; }
public string CertificateThumbprint { get; set; }
- public string RestrictedMacaroon { get; set; }
}
}