From 08d2776f209fbb87e75bfa19ea8ebe76c6830a4b Mon Sep 17 00:00:00 2001 From: Lakshya Singh Date: Tue, 11 Jun 2024 06:41:44 +0530 Subject: [PATCH 1/2] cln: update to v24.05 clboss to master add jq as new dependency Signed-off-by: Lakshya Singh --- .env | 8 ++++---- lightningd/Dockerfile | 1 + lightningd/regtest-config | 1 - lightningd/testnet-config | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.env b/.env index b704cee..1710999 100644 --- a/.env +++ b/.env @@ -1,12 +1,12 @@ # 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 diff --git a/lightningd/Dockerfile b/lightningd/Dockerfile index 403d462..bad7b50 100644 --- a/lightningd/Dockerfile +++ b/lightningd/Dockerfile @@ -15,6 +15,7 @@ RUN apk update && \ gettext \ git \ gmp-dev \ + jq \ libsodium \ libtool \ net-tools \ diff --git a/lightningd/regtest-config b/lightningd/regtest-config index 4364535..73b55e7 100644 --- a/lightningd/regtest-config +++ b/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 diff --git a/lightningd/testnet-config b/lightningd/testnet-config index 73a0d33..8c39c21 100644 --- a/lightningd/testnet-config +++ b/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 From b82341616a76bc695595e0d79ec4450f544bc3c0 Mon Sep 17 00:00:00 2001 From: Lakshya Singh Date: Tue, 11 Jun 2024 06:42:20 +0530 Subject: [PATCH 2/2] vls: update to main add rpc server auth creds Signed-off-by: Lakshya Singh --- .env | 4 ++-- vlsd/healthcheck.sh | 2 +- vlsd/vlsd2.toml | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 1710999..34f3952 100644 --- a/.env +++ b/.env @@ -13,6 +13,6 @@ 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 diff --git a/vlsd/healthcheck.sh b/vlsd/healthcheck.sh index 7bf72ec..6da300b 100755 --- a/vlsd/healthcheck.sh +++ b/vlsd/healthcheck.sh @@ -2,4 +2,4 @@ set -ex -vls-cli info \ No newline at end of file +vls-cli --rpc-user rpcuser --rpc-password VLSsigner2 info diff --git a/vlsd/vlsd2.toml b/vlsd/vlsd2.toml index 1d30a05..5c8c8ab 100644 --- a/vlsd/vlsd2.toml +++ b/vlsd/vlsd2.toml @@ -1 +1,3 @@ datadir = "/home/vls/.lightning-signer" +rpc-user = "rpcuser" +rpc-pass = "VLSsigner2"