Merge pull request #83 from Start9Labs/update/v23.02.2

Update/v23.02.2
Start9Labs · Apr 13, 2023 · b78ea5a · b78ea5a
2 parents 448141d + 4804320
commit b78ea5a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 33 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,3 +3,4 @@ c-lightning-http-plugin/target
 rust-teos/target
 !rust-teos/target/**/release/rust-teos
 lightning/target
+lightning/.git
diff --git a/Dockerfile b/Dockerfile
@@ -53,30 +53,6 @@ RUN make
 RUN make install
 RUN strip /usr/local/bin/clboss
 
-# # http plugin builder
-# FROM debian:bullseye-slim as http-plugin
-
-# RUN apt-get update -qq && \
-#     apt-get install -qq -y --no-install-recommends \
-#         # autoconf \
-#         autoconf-archive \
-#         automake \
-#         build-essential \
-#         git \
-#         libcurl4-gnutls-dev \
-#         libev-dev \
-#         libsqlite3-dev \
-#         libtool \
-#         pkg-config
-
-# COPY clboss/. /tmp/clboss
-# WORKDIR /tmp/clboss
-# RUN autoreconf -i
-# RUN ./configure
-# RUN make
-# RUN make install
-# RUN strip /usr/local/bin/clboss
-
 # lightningd builder
 FROM debian:bullseye-slim as builder
 
@@ -99,6 +75,7 @@ RUN apt-get update -qq && \
         git \
         gnupg \
         libpq-dev \
+        protobuf-compiler \
         libtool \
         libffi-dev \
         python3 \
@@ -143,8 +120,8 @@ WORKDIR /tmp/lightning-wrapper/c-lightning-http-plugin
 RUN cargo update && cargo +beta build --release
 RUN ls -al /tmp/lightning-wrapper/c-lightning-http-plugin/target/release && sleep 30
 WORKDIR /opt/lightningd
-COPY ./.git /tmp/lightning-wrapper/.git
 COPY lightning/. /tmp/lightning-wrapper/lightning
+COPY ./.git/modules/lightning /tmp/lightning-wrapper/lightning/.git/
 # COPY lightning/. /opt/lightningd
 RUN git clone --recursive /tmp/lightning-wrapper/lightning . && \
     git checkout $(git --work-tree=/tmp/lightning-wrapper/lightning --git-dir=/tmp/lightning-wrapper/lightning/.git rev-parse HEAD)
@@ -173,6 +150,7 @@ COPY --from=downloader /opt/tini /usr/bin/tini
 COPY --from=clboss /usr/local/bin/clboss /usr/local/libexec/c-lightning/plugins/clboss
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl \
     dnsutils \
     socat \
     inotify-tools \

diff --git a/lightning b/lightning
diff --git a/manifest.yaml b/manifest.yaml
@@ -1,17 +1,14 @@
 id: c-lightning
-version: 22.11.1.2
+version: 23.02.2
 title: Core Lightning
 license: BSD-MIT
 wrapper-repo: https://github.com/Start9Labs/c-lightning-wrapper
 upstream-repo: https://github.com/ElementsProject/lightning
 support-site: https://github.com/ElementsProject/lightning/issues
 marketing-site: https://blockstream.com/lightning
 release-notes: |-
-  * Update upstream to [v22.11.1](https://github.com/ElementsProject/lightning/releases/tag/v22.11.1)
-  * Fix sync health check so it accurately reports the current block height instead of just 0 of [tip]
-  * Add dual funding and liquidity ads to config so the funder will continue working after a restart
-  * Update clboss, c-lightning-REST, and plugins submodules to latest upstream code
-  * New config options: `htlc-minimum-msat` and `htlc-maximum-msat`
+  * Update upstream to [v23.02.2](https://github.com/ElementsProject/lightning/releases/tag/v23.02.2)
+  * Default config to Bitcoin Core rather than Proxy
 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
@@ -135,6 +135,16 @@ export const migration: T.ExpectedExports.migration = compat.migrations
           { version: "22.11.1", type: "down" },
         ),
       },
+      "23.02.2": {
+        up: compat.migrations.updateConfig(
+          (config) => {
+            return config;
+          },
+          true,
+          { version: "23.02.2", type: "up" },
+        ),
+        down: () => { throw new Error('Cannot downgrade') },
+      },
     },
-    "22.11.1.2",
+    "23.02.2",
   );