Skip to content

Commit

Permalink
Update/v24.02.2 (#127)
Browse files Browse the repository at this point in the history
* Update lightning submodule to v24.02.2 and refactor clams config/properties

* remove clams config and interface pending further testing

* bump bitcoin dependency version to <0.29.0
Dominion5254 authored May 2, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 59c6384 commit 3481f56
Showing 7 changed files with 68 additions and 89 deletions.
4 changes: 2 additions & 2 deletions docker_entrypoint.sh
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ export RPC_TOR_ADDRESS=$(yq e '.rpc-tor-address' /root/.lightning/start9/config.
export UI_TOR_ADDRESS=$(yq e '.web-ui-tor-address' /root/.lightning/start9/config.yaml)
export UI_LAN_ADDRESS=$(echo "$UI_TOR_ADDRESS" | sed 's/\.onion/\.local/')
export REST_TOR_ADDRESS=$(yq e '.rest-tor-address' /root/.lightning/start9/config.yaml)
export CLAMS_WEBSOCKET_TOR_ADDRESS=$(yq e '.clams-websocket-tor-address' /root/.lightning/start9/config.yaml)
# export CLAMS_WEBSOCKET_TOR_ADDRESS=$(yq e '.clams-websocket-tor-address' /root/.lightning/start9/config.yaml)
export WATCHTOWER_TOR_ADDRESS=$(yq e '.watchtower-tor-address' /root/.lightning/start9/config.yaml)
export TOWERS_DATA_DIR=/root/.lightning/.watchtower
export REST_LAN_ADDRESS=$(echo "$REST_TOR_ADDRESS" | sed 's/\.onion/\.local/')
@@ -82,7 +82,7 @@ mkdir -p /root/.lightning/public
echo $PEER_TOR_ADDRESS > /root/.lightning/start9/peerTorAddress
echo $RPC_TOR_ADDRESS > /root/.lightning/start9/rpcTorAddress
echo $REST_TOR_ADDRESS > /root/.lightning/start9/restTorAddress
echo $CLAMS_WEBSOCKET_TOR_ADDRESS > /root/.lightning/start9/clamsRemoteWebsocketTorAddress
# echo $CLAMS_WEBSOCKET_TOR_ADDRESS > /root/.lightning/start9/clamsRemoteWebsocketTorAddress
echo $WATCHTOWER_TOR_ADDRESS > /root/.lightning/start9/watchtowerTorAddress

sh /root/.lightning/start9/waitForStart.sh
2 changes: 1 addition & 1 deletion lightning
42 changes: 19 additions & 23 deletions manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
id: c-lightning
version: 24.02.1
version: 24.02.2
title: Core Lightning
license: BSD-MIT
wrapper-repo: https://github.com/Start9Labs/cln-startos
upstream-repo: https://github.com/ElementsProject/lightning
support-site: https://github.com/ElementsProject/lightning/issues
marketing-site: https://blockstream.com/lightning
release-notes: |-
* Update lightning to 24.02.1 - [Release Notes](https://github.com/ElementsProject/lightning/releases/tag/v24.02.1)
* Add Experimental 'Splicing' config option
* Replace archived 'Rebalance' plugin with 'Sling'
* Remove archived 'Summary' plugin
* Fix WT-Client bug
* Add action to rescan the blockchain from a specified blockheight or depth
* Update lightning to 24.02.2 - [Release Notes](https://github.com/ElementsProject/lightning/releases/tag/v24.02.2)
* Bump Bitcoin dependency version
build: ["make"]
description:
short: "An implementation of the Lightning Network protocol by Blockstream."
@@ -174,24 +170,24 @@ interfaces:
protocols:
- tcp
- http
websocket:
name: Clams Websocket
description: Websocket endpoint for Clams Remote.
tor-config:
port-mapping:
7272: "7272"
lan-config:
7272:
ssl: true
internal: 7272
ui: false
protocols:
- tcp
- http
- ws
# websocket:
# name: Clams Websocket
# description: Websocket endpoint for Clams Remote.
# tor-config:
# port-mapping:
# 7272: "7272"
# lan-config:
# 7272:
# ssl: true
# internal: 7272
# ui: false
# protocols:
# - tcp
# - http
# - ws
dependencies:
bitcoind:
version: ">=0.21.1.2 <27.0.0"
version: ">=0.21.1.2 <29.0.0"
requirement:
type: required
description: Used as a blockchain backend.
31 changes: 16 additions & 15 deletions scripts/procedures/getConfig.ts
Original file line number Diff line number Diff line change
@@ -46,15 +46,15 @@ export const [getConfig, setConfigMatcher] = compat.getConfigAndMatcher({
target: "tor-address",
interface: "clnrest",
},
"clams-websocket-tor-address": {
name: "Websocket Tor Address",
description: "The Tor address of the CLN websocket service.",
type: "pointer",
subtype: "package",
"package-id": "c-lightning",
target: "tor-address",
interface: "websocket",
},
// "clams-websocket-tor-address": {
// name: "Websocket Tor Address",
// description: "The Tor address of the CLN websocket service.",
// type: "pointer",
// subtype: "package",
// "package-id": "c-lightning",
// target: "tor-address",
// interface: "websocket",
// },
"watchtower-tor-address": {
name: "TEoS Watchtower API Address",
description: "The Tor address of the TEoS Watchtower API",
@@ -261,13 +261,14 @@ export const [getConfig, setConfigMatcher] = compat.getConfigAndMatcher({
name: "Tor Only",
description: "Only use tor connections. This increases privacy, at the cost of some performance and reliability. <b>Default: False</b>",
default: false,

},
"clams_remote_websocket": {
type: "boolean",
name: "Clams Remote",
description: "Accept incoming connections on port 7272, allowing Clams Remote to connect to Core Lightning.",
default: false,
},
// "clams-remote-websocket": {
// type: "boolean",
// name: "Clams Remote",
// description: "Accept incoming connections on port 7272, allowing Clams Remote to connect to Core Lightning.",
// default: false,
// },
"fee-base": {
type: "number",
name: "Routing Base Fee",
2 changes: 1 addition & 1 deletion scripts/procedures/migrations.ts
Original file line number Diff line number Diff line change
@@ -319,7 +319,7 @@ export const migration: T.ExpectedExports.migration =
},
},
},
"24.02.1",
"24.02.2",
);

function generateRandomString(length: number) {
69 changes: 26 additions & 43 deletions scripts/procedures/properties.ts
Original file line number Diff line number Diff line change
@@ -86,14 +86,14 @@ export const properties: T.ExpectedExports.properties = async (
) {
return noPropertiesFound;
}
if (
(await util.exists(effects, {
volumeId: "main",
path: "start9/clamsRemoteWebsocketTorAddress",
})) === false
) {
return noPropertiesFound;
}
// if (
// (await util.exists(effects, {
// volumeId: "main",
// path: "start9/clamsRemoteWebsocketTorAddress",
// })) === false
// ) {
// return noPropertiesFound;
// }
if (
(await util.exists(effects, {
volumeId: "main",
@@ -121,12 +121,12 @@ export const properties: T.ExpectedExports.properties = async (
path: "start9/restTorAddress",
})
.then((x) => x.trim());
const clamsRemoteWebsocketTorAddress = await effects
.readFile({
volumeId: "main",
path: "start9/clamsRemoteWebsocketTorAddress",
})
.then((x) => x.trim());
// const clamsRemoteWebsocketTorAddress = await effects
// .readFile({
// volumeId: "main",
// path: "start9/clamsRemoteWebsocketTorAddress",
// })
// .then((x) => x.trim());
const watchtowerTorAddress = await effects
.readFile({
volumeId: "main",
@@ -147,26 +147,6 @@ export const properties: T.ExpectedExports.properties = async (
volumeId: "main",
})
);
const websocketProperties: T.PackagePropertiesV2 = !config.advanced.clams_remote_websocket
? {}
: {
"Clams Remote Websocket Onion": {
type: "string",
value: `${clamsRemoteWebsocketTorAddress}`,
description: "The onion endpoint for your CLN websocket service for use with Clams Remote.",
copyable: true,
qr: false,
masked: true,
},
"Clams Remote Websocket Port": {
type: "string",
value: "7272",
description: "The service endpoint for your CLN websocket service for use with Clams Remote.",
copyable: true,
qr: false,
masked: false,
}
};

const restProperties: T.PackagePropertiesV2 = !config.advanced.plugins.rest
? {}
@@ -373,15 +353,18 @@ export const properties: T.ExpectedExports.properties = async (
qr: true,
masked: true,
},
"Clams Remote Websocket URI": {
type: "string",
value: `${nodeInfo.id}@${clamsRemoteWebsocketTorAddress}:7272`,
description:
"The URI needed by Clams Remote to connect to Core Lightning's websocket interface.",
copyable: true,
qr: true,
masked: true,
},
// ...(config.advanced["clams-remote-websocket"]
// ? {"Clams Remote Websocket URI": {
// type: "string",
// value: `${nodeInfo.id}@${clamsRemoteWebsocketTorAddress}:7272`,
// description:
// "The URI needed by Clams Remote to connect to Core Lightning's websocket interface.",
// copyable: true,
// qr: true,
// masked: true,
// }
// }
// : {}),
"UI Password": {
type: "string",
value: config["ui-password"],
7 changes: 3 additions & 4 deletions scripts/procedures/setConfig.ts
Original file line number Diff line number Diff line change
@@ -292,9 +292,9 @@ function configMaker(alias: Alias, config: SetConfig) {
const enableCLNRestPlugin = config.advanced.plugins.clnrest
? "clnrest-port=3010\nclnrest-host=0.0.0.0\n"
: "";
const enableClamsRemoteWebsocket = config.advanced.clams_remote_websocket
? "bind-addr=ws::7272\n"
: "";
// const enableClamsRemoteWebsocket = config.advanced["clams-remote-websocket"]
// ? "bind-addr=ws::7272\n"
// : "";
const enableClbossPlugin =
config.advanced.plugins.clboss.enabled === "enabled"
? "plugin=/usr/local/libexec/c-lightning/plugins/clboss"
@@ -314,7 +314,6 @@ bitcoin-rpcconnect=${bitcoin_rpc_host}
bitcoin-rpcport=${bitcoin_rpc_port}
bind-addr=0.0.0.0:9735
${enableClamsRemoteWebsocket}
announce-addr=${config["peer-tor-address"]}:9735
proxy={proxy}
always-use-proxy=${config.advanced["tor-only"]}

0 comments on commit 3481f56

Please sign in to comment.