Merge branch 'king-11/update-cln-vls' into 'main'

vls: add rpc server credentials

See merge request lightning-signer/vls-container!26

.env

@@ -1,18 +1,18 @@
 # bitcoin version 26.0
 BITCOIN_VERSION=26.0
 BITCOIN_SHA256SUMS_HASH=63487c308a6655f939efd700bfca8e0285fa2f869283aaa7192bdd4b8799a747
-# core lightning version v24.02.2
+# core lightning version v24.05
 CORE_LIGHTNING_REPO=https://github.com/ElementsProject/lightning.git
-CORE_LIGHTNING_GIT_HASH=a2a136fe3ebef1d028d1e20ebf1f987b8c05bbf8
-# clboss version v0.13.1
+CORE_LIGHTNING_GIT_HASH=11586abf79cad33727c03dfa810ae8bcdd3762bf
+# clboss version v0.13.1 (2024-05-31 21:28:55 -0700)
 CLBOSS_REPO=https://github.com/ZmnSCPxj/clboss.git
-CLBOSS_GIT_HASH=e4f15b6aeccc0548b8c80f7948d2265111c4e9c5
+CLBOSS_GIT_HASH=df51d5486b05acbeca16cb9e42d18fa082e6079a
 # cln plugins (2024-06-06 17:02:52 +0200)
 CLN_PLUGINS_REPO=https://github.com/lightningd/plugins.git
 CLN_PLUGINS_GIT_HASH=de0c7af343df25e82536233ac248ef46efea8670
 # txoo version 0.6.4
 TXOO_REPO=https://gitlab.com/lightning-signer/txoo.git
 TXOO_GIT_HASH=6f0718e3f2b9406df5e3cd73306f473199141da0
-# vls version v0.11.0
+# vls version v0.11.0 (2024-06-06 15:09:25 +0000)
 VLS_REPO=https://gitlab.com/lightning-signer/validating-lightning-signer.git
-VLS_GIT_HASH=395b604964d5a0b4e9ee32c1b6e440dfbf4874f0
+VLS_GIT_HASH=f853773d0252430b8b24f181562a8afdd42293fa

lightningd/Dockerfile

@@ -15,6 +15,7 @@ RUN apk update && \
       gettext \
       git \
       gmp-dev \
+      jq \
       libsodium \
       libtool \
       net-tools \

lightningd/regtest-config

@@ -3,7 +3,6 @@ bitcoin-rpcuser=rpcuser
 bitcoin-rpcpassword=VLSsigner1
 bitcoin-rpcport=38332
 log-level=info
-max-locktime-blocks=288
 important-plugin=/usr/bin/clboss
 clboss-auto-close=true
 bind-addr=0.0.0.0:19846

lightningd/testnet-config

@@ -3,7 +3,6 @@ bitcoin-rpcuser=rpcuser
 bitcoin-rpcpassword=VLSsigner1
 bitcoin-rpcport=18332
 log-level=info
-max-locktime-blocks=288
 important-plugin=/usr/bin/clboss
 clboss-auto-close=true
 bind-addr=0.0.0.0:19735

vlsd/healthcheck.sh

@@ -2,4 +2,4 @@
 
 set -ex
 
-vls-cli info
+vls-cli --rpc-user rpcuser --rpc-password VLSsigner2 info

vlsd/vlsd2.toml

@@ -1 +1,3 @@
 datadir = "/home/vls/.lightning-signer"
+rpc-user = "rpcuser"
+rpc-pass = "VLSsigner2"