From cda7079388b26feac9d01cb33477ad4aca74ae98 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Tue, 28 Jan 2025 12:05:00 -0600 Subject: [PATCH 1/8] clighntingRpc: Update clightning to 24.11.1 --- clightning-rpc/clightning-rpc.sbt | 6 +++++- .../com/bitcoins/clightning/rpc/CLightningRpcClient.scala | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/clightning-rpc/clightning-rpc.sbt b/clightning-rpc/clightning-rpc.sbt index 22b2fd73ee..b41b712ad1 100644 --- a/clightning-rpc/clightning-rpc.sbt +++ b/clightning-rpc/clightning-rpc.sbt @@ -19,7 +19,7 @@ TaskKeys.downloadCLightning := { Files.createDirectories(binaryDir) } - val version = "24.02.2" + val version = "24.11.1" val (platform, suffix) = if (Properties.isLinux) { @@ -29,6 +29,8 @@ TaskKeys.downloadCLightning := { val version = new java.io.BufferedReader(inputStream).readLine() if (version == "22.04") { ("Ubuntu-22.04", "tar.xz") + } else if (version == "24.04") { + ("Ubuntu-24.04", "tar.xz") } else { ("Ubuntu-20.04", "tar.xz") } @@ -66,6 +68,8 @@ TaskKeys.downloadCLightning := { "0068852306bca9df3d213c6a29bb90451eb538be83e413d6838e9e2d2729ff7f" } else if (platform == "Ubuntu-22.04") { "7d78e49615ace6ff8ee9ebfdf30e108ecf41ce98834493260ee31486389b781f" + } else if (platform == "Ubuntu-22.04") { + "" } else sys.error(s"Unsupported OS: ${Properties.osName}") diff --git a/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/CLightningRpcClient.scala b/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/CLightningRpcClient.scala index 23ad2abdb0..a7ae513409 100644 --- a/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/CLightningRpcClient.scala +++ b/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/CLightningRpcClient.scala @@ -421,7 +421,7 @@ class CLightningRpcClient(val instance: CLightningInstanceLocal, binary: File)( object CLightningRpcClient { /** The current version we support of clightning */ - val version = "24.02.2" + val version = "24.11.1" private[clightning] def feeRateToJson(feeUnit: FeeUnit): JsString = { // clightning only takes SatoshisPerKiloByte or SatoshisPerKW From d5b4e51454e980d8e25a9a2b6797047822da6b4c Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Tue, 28 Jan 2025 14:14:24 -0600 Subject: [PATCH 2/8] Add platform suffix --- clightning-rpc/clightning-rpc.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clightning-rpc/clightning-rpc.sbt b/clightning-rpc/clightning-rpc.sbt index b41b712ad1..a6a43c46da 100644 --- a/clightning-rpc/clightning-rpc.sbt +++ b/clightning-rpc/clightning-rpc.sbt @@ -30,7 +30,7 @@ TaskKeys.downloadCLightning := { if (version == "22.04") { ("Ubuntu-22.04", "tar.xz") } else if (version == "24.04") { - ("Ubuntu-24.04", "tar.xz") + ("Ubuntu-24.04-amd64", "tar.xz") } else { ("Ubuntu-20.04", "tar.xz") } From c9fd62956505e626220700dc644a9e6ae748af86 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Tue, 28 Jan 2025 15:19:27 -0600 Subject: [PATCH 3/8] add amd64 suffix for Ubuntu 22.04 --- clightning-rpc/clightning-rpc.sbt | 2 +- lnd-rpc/lnd-rpc.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clightning-rpc/clightning-rpc.sbt b/clightning-rpc/clightning-rpc.sbt index a6a43c46da..1d3a258349 100644 --- a/clightning-rpc/clightning-rpc.sbt +++ b/clightning-rpc/clightning-rpc.sbt @@ -28,7 +28,7 @@ TaskKeys.downloadCLightning := { val inputStream = new java.io.InputStreamReader(processBuilder.start().getInputStream()) val version = new java.io.BufferedReader(inputStream).readLine() if (version == "22.04") { - ("Ubuntu-22.04", "tar.xz") + ("Ubuntu-22.04-amd64", "tar.xz") } else if (version == "24.04") { ("Ubuntu-24.04-amd64", "tar.xz") } else { diff --git a/lnd-rpc/lnd-rpc.sbt b/lnd-rpc/lnd-rpc.sbt index ffa86a30cd..47ddac75e4 100644 --- a/lnd-rpc/lnd-rpc.sbt +++ b/lnd-rpc/lnd-rpc.sbt @@ -77,7 +77,7 @@ TaskKeys.downloadLnd := { if (Properties.isLinux) "cd0c0c14c62334a00e8107be436a32e63dac7d3c63e3dd3c89c427da316ef873" else if (Properties.isMac && System.getProperty("os.arch") == "aarch64") - "69b43b6c84884305f856ca0fd2ac55263a54c1dedf43a7c8fb620bebc8453147" + "e7379d70d7f4dbc7c08172b22207d8e21fddee3d8bd6a5a5527d3f4e7a74698c" else if (Properties.isMac) "71ec034b2e62a6db29c88d941f8e8902fa6070ce45e1b3c22d529313ae5fd0ce" else if (Properties.isWin) From 26ba798e2cff89e01343596d7b9db5e09f9687db Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Wed, 29 Jan 2025 11:52:18 -0600 Subject: [PATCH 4/8] Fix typo in Ubuntu-24.04 --- clightning-rpc/clightning-rpc.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clightning-rpc/clightning-rpc.sbt b/clightning-rpc/clightning-rpc.sbt index 1d3a258349..55c8b4bf58 100644 --- a/clightning-rpc/clightning-rpc.sbt +++ b/clightning-rpc/clightning-rpc.sbt @@ -34,9 +34,9 @@ TaskKeys.downloadCLightning := { } else { ("Ubuntu-20.04", "tar.xz") } + } else { + sys.error(s"Unsupported OS: ${Properties.osName}") } -// else if (Properties.isMac) ("darwin-amd64", "tar.gz") // todo c-lightning adding in a future release - else sys.error(s"Unsupported OS: ${Properties.osName}") logger.debug(s"(Maybe) downloading clightning binaries for version: $version") @@ -68,7 +68,7 @@ TaskKeys.downloadCLightning := { "0068852306bca9df3d213c6a29bb90451eb538be83e413d6838e9e2d2729ff7f" } else if (platform == "Ubuntu-22.04") { "7d78e49615ace6ff8ee9ebfdf30e108ecf41ce98834493260ee31486389b781f" - } else if (platform == "Ubuntu-22.04") { + } else if (platform == "Ubuntu-24.04") { "" } else sys.error(s"Unsupported OS: ${Properties.osName}") From 94e888e388a4aa36de20213bbade47a9d4780e07 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Wed, 29 Jan 2025 12:06:09 -0600 Subject: [PATCH 5/8] Add amd64 suffix --- clightning-rpc/clightning-rpc.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clightning-rpc/clightning-rpc.sbt b/clightning-rpc/clightning-rpc.sbt index 55c8b4bf58..4aee834a1e 100644 --- a/clightning-rpc/clightning-rpc.sbt +++ b/clightning-rpc/clightning-rpc.sbt @@ -64,11 +64,11 @@ TaskKeys.downloadCLightning := { .mkString val expectedHash = - if (platform == "Ubuntu-20.04") { + if (platform == "Ubuntu-20.04-amd64") { "0068852306bca9df3d213c6a29bb90451eb538be83e413d6838e9e2d2729ff7f" - } else if (platform == "Ubuntu-22.04") { + } else if (platform == "Ubuntu-22.04-amd64") { "7d78e49615ace6ff8ee9ebfdf30e108ecf41ce98834493260ee31486389b781f" - } else if (platform == "Ubuntu-24.04") { + } else if (platform == "Ubuntu-24.04-amd64") { "" } else sys.error(s"Unsupported OS: ${Properties.osName}") From c2faec19902e24bfd47e1c6b993b6f31e060ab1c Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Wed, 29 Jan 2025 12:25:05 -0600 Subject: [PATCH 6/8] fix hash --- .github/workflows/Linux_2.13_RPC_Tests.yml | 2 +- clightning-rpc/clightning-rpc.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Linux_2.13_RPC_Tests.yml b/.github/workflows/Linux_2.13_RPC_Tests.yml index 4ca31de352..40d55ae190 100644 --- a/.github/workflows/Linux_2.13_RPC_Tests.yml +++ b/.github/workflows/Linux_2.13_RPC_Tests.yml @@ -7,7 +7,7 @@ on: jobs: test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 if: "! contains(github.event.pull_request.labels.*.name, 'documentation')" steps: diff --git a/clightning-rpc/clightning-rpc.sbt b/clightning-rpc/clightning-rpc.sbt index 4aee834a1e..2ee00ebd4b 100644 --- a/clightning-rpc/clightning-rpc.sbt +++ b/clightning-rpc/clightning-rpc.sbt @@ -67,7 +67,7 @@ TaskKeys.downloadCLightning := { if (platform == "Ubuntu-20.04-amd64") { "0068852306bca9df3d213c6a29bb90451eb538be83e413d6838e9e2d2729ff7f" } else if (platform == "Ubuntu-22.04-amd64") { - "7d78e49615ace6ff8ee9ebfdf30e108ecf41ce98834493260ee31486389b781f" + "10a42e4d8f1bfef2c82a4f16725669843a2243729e0904aeb0412981f8f2496c" } else if (platform == "Ubuntu-24.04-amd64") { "" } From 26cd443b6cb20df90ae1ac4711a83971b14f5d01 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Wed, 29 Jan 2025 12:30:10 -0600 Subject: [PATCH 7/8] Revert runs-on CI imageg --- .github/workflows/Linux_2.13_RPC_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux_2.13_RPC_Tests.yml b/.github/workflows/Linux_2.13_RPC_Tests.yml index 40d55ae190..4ca31de352 100644 --- a/.github/workflows/Linux_2.13_RPC_Tests.yml +++ b/.github/workflows/Linux_2.13_RPC_Tests.yml @@ -7,7 +7,7 @@ on: jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 timeout-minutes: 60 if: "! contains(github.event.pull_request.labels.*.name, 'documentation')" steps: From 5e2cc826a60ed03fb5394b4e6c4ce406f0422336 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Wed, 29 Jan 2025 12:40:23 -0600 Subject: [PATCH 8/8] Add Ubuntu-24.04-amd64 cligthning hash --- clightning-rpc/clightning-rpc.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clightning-rpc/clightning-rpc.sbt b/clightning-rpc/clightning-rpc.sbt index 2ee00ebd4b..f12f249479 100644 --- a/clightning-rpc/clightning-rpc.sbt +++ b/clightning-rpc/clightning-rpc.sbt @@ -69,7 +69,7 @@ TaskKeys.downloadCLightning := { } else if (platform == "Ubuntu-22.04-amd64") { "10a42e4d8f1bfef2c82a4f16725669843a2243729e0904aeb0412981f8f2496c" } else if (platform == "Ubuntu-24.04-amd64") { - "" + "f78eeb3bf71ad49f0dc7d42e9665b4f377b621b1606b46ab58ea4343f72f7dee" } else sys.error(s"Unsupported OS: ${Properties.osName}")