diff --git a/docker/build.py b/docker/build.py index 9dd64921..e63ec1b4 100755 --- a/docker/build.py +++ b/docker/build.py @@ -40,7 +40,7 @@ class Image: value="1.23.4-bullseye", ) -BITCOIN_VERSION = "28.0" +BITCOIN_VERSION = "28.1" LITECOIN_VERSION = "0.21.4" ELEMENTS_VERSION = "23.2.4" GETH_VERSION = "1.14.12" @@ -108,7 +108,7 @@ class Image: ], ), "regtest": Image( - tag="4.6.2", + tag="4.6.3", arguments=[ UBUNTU_VERSION, BITCOIN_BUILD_ARG, diff --git a/docker/regtest/startRegtest.sh b/docker/regtest/startRegtest.sh index f397288f..2c390754 100755 --- a/docker/regtest/startRegtest.sh +++ b/docker/regtest/startRegtest.sh @@ -29,7 +29,7 @@ docker run \ -p 9735:9735 \ -p 9293:9293 \ -p 9292:9292 \ - boltz/regtest:4.6.2 + boltz/regtest:4.6.3 docker exec regtest bash -c "cp /root/.lightning/regtest/*.pem /root/.lightning/regtest/certs" docker exec regtest chmod -R 777 /root/.lightning/regtest/certs diff --git a/lib/VersionCheck.ts b/lib/VersionCheck.ts index 5d35fa2c..acbc139b 100644 --- a/lib/VersionCheck.ts +++ b/lib/VersionCheck.ts @@ -78,7 +78,7 @@ class VersionCheck { > = { [ChainClient.serviceName]: { minimal: 220000, - maximal: 280000, + maximal: 280100, }, [ClnClient.serviceName]: { minimal: '24.11', @@ -130,10 +130,10 @@ class VersionCheck { if (version.startsWith('v')) { sanitizedVersion = sanitizedVersion.slice(1); } - if (version.endsWith(ClnClient.moddedVersionSuffix)) { + if (version.includes(ClnClient.moddedVersionSuffix)) { sanitizedVersion = sanitizedVersion.slice( 0, - -ClnClient.moddedVersionSuffix.length, + sanitizedVersion.indexOf(ClnClient.moddedVersionSuffix), ); } diff --git a/lib/lightning/cln/ClnClient.ts b/lib/lightning/cln/ClnClient.ts index 2b1928ba..37060e5d 100644 --- a/lib/lightning/cln/ClnClient.ts +++ b/lib/lightning/cln/ClnClient.ts @@ -46,7 +46,7 @@ class ClnClient { public static readonly serviceName = 'CLN'; public static readonly serviceNameHold = 'hold'; - public static readonly moddedVersionSuffix = '-modded'; + public static readonly moddedVersionSuffix = '-'; public static readonly paymentPendingError = 'payment already pending';