From afaca77f12c9e58a20401fd26057302e08c8cda0 Mon Sep 17 00:00:00 2001
From: Dominion5254 <musashidisciple@proton.me>
Date: Mon, 21 Oct 2024 22:06:01 -0600
Subject: [PATCH] Update/v24.08.2 (#135)

* Update lightning to 24.08.2

* Update clboss to 0.14.0

* Update version and release notes

* fix clboss build

* fix -modded flag (hopefully)
---
 Dockerfile                       | 7 ++++++-
 clboss                           | 2 +-
 lightning                        | 2 +-
 manifest.yaml                    | 5 +++--
 scripts/procedures/migrations.ts | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5db404e..77b20a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,6 @@ FROM debian:bullseye-slim AS clboss
 
 RUN apt-get update -qq && \
     apt-get install -qq -y --no-install-recommends \
-        # autoconf \
         autoconf-archive \
         automake \
         build-essential \
@@ -66,6 +65,7 @@ COPY clboss/. /tmp/clboss
 WORKDIR /tmp/clboss
 RUN autoreconf -i
 RUN ./configure
+RUN ./generate_commit_hash.sh
 RUN make
 RUN make install
 RUN strip /usr/local/bin/clboss
@@ -166,6 +166,11 @@ RUN pip3 install -r requirements.txt && pip3 cache purge
 # https://github.com/ElementsProject/lightning/pull/7376#issuecomment-2161102381
 RUN poetry lock --no-update && poetry install
 
+# Ensure that git differences are removed before making bineries, to avoid `-modded` suffix
+# poetry.lock changed due to pyln-client, pyln-proto and pyln-testing version updates
+# pyproject.toml was updated to exclude clnrest and wss-proxy plugins in base-builder stage
+RUN git reset --hard HEAD
+
 RUN ./configure --prefix=/tmp/lightning_install --enable-static && make && poetry run make install
 
 # Export the requirements for the plugins so we can install them in builder-python stage
diff --git a/clboss b/clboss
index 159ef70..d595541 160000
--- a/clboss
+++ b/clboss
@@ -1 +1 @@
-Subproject commit 159ef70278100ab6fda4e625259f2a52b791979a
+Subproject commit d5955419e3bea3f0414affc4a4994043abc0a726
diff --git a/lightning b/lightning
index 9852e59..82f4ad6 160000
--- a/lightning
+++ b/lightning
@@ -1 +1 @@
-Subproject commit 9852e5986b3f32373369b0ada4c30b389c3f1018
+Subproject commit 82f4ad68e34a2428c556e63fc2632d48a914968c
diff --git a/manifest.yaml b/manifest.yaml
index 54a0649..1291137 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -1,5 +1,5 @@
 id: c-lightning
-version: 24.08.1
+version: 24.08.2
 title: Core Lightning
 license: BSD-MIT
 wrapper-repo: https://github.com/Start9Labs/cln-startos
@@ -7,7 +7,8 @@ upstream-repo: https://github.com/ElementsProject/lightning
 support-site: https://github.com/ElementsProject/lightning/issues
 marketing-site: https://blockstream.com/lightning
 release-notes: |-
-  * Update to CLN 24.08.1 [Release Notes](https://github.com/ElementsProject/lightning/releases/tag/v24.08.1)
+  * Update to CLN 24.08.2 [Release Notes](https://github.com/ElementsProject/lightning/releases/tag/v24.08.2)
+  * Update clboss to 0.14.0
 build: ["make"]
 description:
   short: "An implementation of the Lightning Network protocol by Blockstream."
diff --git a/scripts/procedures/migrations.ts b/scripts/procedures/migrations.ts
index dc07bd8..7c292b3 100644
--- a/scripts/procedures/migrations.ts
+++ b/scripts/procedures/migrations.ts
@@ -345,7 +345,7 @@ export const migration: T.ExpectedExports.migration =
         )
       },
     },
-    "24.08.1",
+    "24.08.2",
   );
 
 function generateRandomString(length: number) {