Skip to content

Commit

Permalink
chore: bump CLN to v24.11 (#746)
Browse files Browse the repository at this point in the history
  • Loading branch information
michael1011 authored Dec 15, 2024
1 parent 33f058c commit 99f44a7
Show file tree
Hide file tree
Showing 9 changed files with 499 additions and 26 deletions.
33 changes: 19 additions & 14 deletions boltzr/src/lightning/cln/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ impl Cln {
timeout: None,
quantity: None,
payer_note: None,
payer_metadata: None,
recurrence_start: None,
recurrence_label: None,
recurrence_counter: None,
Expand Down Expand Up @@ -105,23 +106,27 @@ impl BaseClient for Cln {
}

async fn connect(&mut self) -> anyhow::Result<()> {
let configs = self.list_configs().await?;
let experimental_offers = match configs.configs {
Some(config) => match config.experimental_offers {
Some(option) => option.set,
let info = self.get_info().await?;
let version = info.version.split(".").collect::<Vec<&str>>();

if version[0] == "24" && version[1] == "08" {
let configs = self.list_configs().await?;
let experimental_offers = match configs.configs {
Some(config) => match config.experimental_offers {
Some(option) => option.set,
None => false,
},
None => false,
},
None => false,
};

if !experimental_offers {
return Err(crate::lightning::Error::NoBolt12Support(
"experimental-offers not enabled".into(),
)
.into());
};

if !experimental_offers {
return Err(crate::lightning::Error::NoBolt12Support(
"experimental-offers not enabled".into(),
)
.into());
}
}

let info = self.get_info().await?;
info!(
"Connected to {} CLN {} ({})",
self.symbol,
Expand Down
4 changes: 2 additions & 2 deletions docker/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Image:
ELEMENTS_VERSION = "23.2.4"
GETH_VERSION = "1.14.12"

C_LIGHTNING_VERSION = "24.08.2"
C_LIGHTNING_VERSION = "24.11"
ECLAIR_VERSION = "0.11.0"
LND_VERSION = "0.18.3-beta"

Expand Down Expand Up @@ -108,7 +108,7 @@ class Image:
],
),
"regtest": Image(
tag="4.5.8",
tag="4.6.0",
arguments=[
UBUNTU_VERSION,
BITCOIN_BUILD_ARG,
Expand Down
3 changes: 1 addition & 2 deletions docker/regtest/data/cln/config
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ fee-base=0
fee-per-satoshi=1
large-channels

grpc-host=0.0.0.0
grpc-port=9291

developer
dev-fast-gossip
dev-fast-reconnect
dev-bitcoind-poll=5

experimental-offers
2 changes: 1 addition & 1 deletion docker/regtest/startRegtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ docker run \
-p 9735:9735 \
-p 9293:9293 \
-p 9292:9292 \
boltz/regtest:4.5.8
boltz/regtest:4.6.0

docker exec regtest bash -c "cp /root/.lightning/regtest/*.pem /root/.lightning/regtest/certs"
docker exec regtest chmod -R 777 /root/.lightning/regtest/certs
Expand Down
4 changes: 2 additions & 2 deletions lib/VersionCheck.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ class VersionCheck {
maximal: 280000,
},
[ClnClient.serviceName]: {
minimal: '23.05',
maximal: '24.08.2',
minimal: '24.08',
maximal: '24.11',
},
[ClnClient.serviceNameHold]: {
minimal: '0.2.0',
Expand Down
Loading

0 comments on commit 99f44a7

Please sign in to comment.