From b592ee2fedaaa7045ccbca8cedba7942c4885672 Mon Sep 17 00:00:00 2001
From: rockstardev <5191402+rockstardev@users.noreply.github.com>
Date: Fri, 16 Feb 2024 09:43:51 -0500
Subject: [PATCH] Bumping LND to 0.17.4-beta (#5739)

* Clarifying that only onchain funds will be restored to the wallet

Off chain recovery would need to be done with channel.backup file which is not part of this process

* Adding powershell version of lncli invoker

* Bumping LND to 0.17.4-beta-rc1

* Bumping LND to 0.17.4-beta
---
 BTCPayServer.Tests/docker-compose.altcoins.yml   | 4 ++--
 BTCPayServer.Tests/docker-compose.yml            | 4 ++--
 BTCPayServer.Tests/docker-customer-lncli.ps1     | 2 ++
 BTCPayServer.Tests/docker-merchant-lncli.ps1     | 2 ++
 BTCPayServer/Views/UIServer/LndSeedBackup.cshtml | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 BTCPayServer.Tests/docker-customer-lncli.ps1
 create mode 100644 BTCPayServer.Tests/docker-merchant-lncli.ps1

diff --git a/BTCPayServer.Tests/docker-compose.altcoins.yml b/BTCPayServer.Tests/docker-compose.altcoins.yml
index 3394e513d..c1d9bc74c 100644
--- a/BTCPayServer.Tests/docker-compose.altcoins.yml
+++ b/BTCPayServer.Tests/docker-compose.altcoins.yml
@@ -224,7 +224,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.17.3-beta
+    image: btcpayserver/lnd:v0.17.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -259,7 +259,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.17.3-beta
+    image: btcpayserver/lnd:v0.17.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index 308886893..3d0ce022e 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -211,7 +211,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.17.3-beta
+    image: btcpayserver/lnd:v0.17.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -248,7 +248,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.17.3-beta
+    image: btcpayserver/lnd:v0.17.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
diff --git a/BTCPayServer.Tests/docker-customer-lncli.ps1 b/BTCPayServer.Tests/docker-customer-lncli.ps1
new file mode 100644
index 000000000..473c4a015
--- /dev/null
+++ b/BTCPayServer.Tests/docker-customer-lncli.ps1
@@ -0,0 +1,2 @@
+$container_id="$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=customer_lnd)"
+docker exec -ti $container_id lncli --no-macaroons --rpcserver localhost:10008 $args
diff --git a/BTCPayServer.Tests/docker-merchant-lncli.ps1 b/BTCPayServer.Tests/docker-merchant-lncli.ps1
new file mode 100644
index 000000000..825ecf993
--- /dev/null
+++ b/BTCPayServer.Tests/docker-merchant-lncli.ps1
@@ -0,0 +1,2 @@
+$container_id="$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=merchant_lnd)"
+docker exec -ti $container_id lncli --no-macaroons --rpcserver localhost:10008 $args
diff --git a/BTCPayServer/Views/UIServer/LndSeedBackup.cshtml b/BTCPayServer/Views/UIServer/LndSeedBackup.cshtml
index b9f9fd8fe..9b068a95c 100644
--- a/BTCPayServer/Views/UIServer/LndSeedBackup.cshtml
+++ b/BTCPayServer/Views/UIServer/LndSeedBackup.cshtml
@@ -1,4 +1,4 @@
-@using BTCPayServer.Abstractions.Models
+@using BTCPayServer.Abstractions.Models
 @model LndSeedBackupViewModel
 @{
     ViewData.SetActivePage(ServerNavPages.Services, "LND Seed Backup");
@@ -11,7 +11,7 @@
     <div class="row">
         <div class="col-lg-8">
             <div class="form-group">
-                <p>The LND seed backup is useful to recover funds of your LND wallet in case of a corruption of your server.</p>
+                <p>The LND seed backup is useful to recover on-chain funds of your LND wallet in case of a corruption of your server.</p>
                 <p>The recovering process is documented by LND on <a href="https://github.com/lightningnetwork/lnd/blob/master/docs/recovery.md" rel="noreferrer noopener">this page</a>.</p>
             </div>
             <button class="btn btn-primary @(Model.Removed ? "collapse" : "")" id="details" type="button">See confidential seed information</button>