From b1c29ca526934c185c250c18e3c9445f666061a3 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 3 Sep 2025 13:24:01 +0930 Subject: [PATCH 1/5] tools: insist on lowdown for zipfile. On GitHub where we build the zipfile, it exists, so we don't check out the submodule. If you do, your zipfile won't match! Signed-off-by: Rusty Russell --- tools/build-release.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build-release.sh b/tools/build-release.sh index fb6478903039..af21551648e9 100755 --- a/tools/build-release.sh +++ b/tools/build-release.sh @@ -127,6 +127,8 @@ if [ "$WITHOUT_ZIP" = "false" ]; then # submodcheck needs to know if we have lowdown touch config.vars ./configure --reconfigure + # If you don't have lowdown, your zip file will include it: we assume everyone has it now! + grep -q "HAVE_LOWDOWN=1" config.vars || (echo "Please install lowdown" >&2; exit 1) # If it's a completely clean directory, we need submodules! make submodcheck From 45397b49d3b1433fee345bc4c000a43b313afff3 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 3 Sep 2025 13:56:19 +0930 Subject: [PATCH 2/5] clnrest: change utoipa to my GH branch with daywalker90's deterministic PR merged. Signed-off-by: Rusty Russell Changelog-Fixed: Build: release builds with tools/build-release.sh are deterministic again. --- Cargo.lock | 12 ++++-------- plugins/rest-plugin/Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6582b976f554..64ecac495114 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3125,8 +3125,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utoipa" version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fcc29c80c21c31608227e0912b2d7fddba57ad76b606890627ba8ee7964e993" +source = "git+https://github.com/rustyrussell/utoipa.git#26f4908b092a4a746cbec935e05165852ea01289" dependencies = [ "indexmap 2.10.0", "serde", @@ -3137,8 +3136,7 @@ dependencies = [ [[package]] name = "utoipa-gen" version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d79d08d92ab8af4c5e8a6da20c47ae3f61a0f1dabc1997cdf2d082b757ca08b" +source = "git+https://github.com/rustyrussell/utoipa.git#26f4908b092a4a746cbec935e05165852ea01289" dependencies = [ "proc-macro2", "quote", @@ -3149,8 +3147,7 @@ dependencies = [ [[package]] name = "utoipa-swagger-ui" version = "9.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d047458f1b5b65237c2f6dc6db136945667f40a7668627b3490b9513a3d43a55" +source = "git+https://github.com/rustyrussell/utoipa.git#26f4908b092a4a746cbec935e05165852ea01289" dependencies = [ "axum 0.8.4", "base64 0.22.1", @@ -3168,8 +3165,7 @@ dependencies = [ [[package]] name = "utoipa-swagger-ui-vendored" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2eebbbfe4093922c2b6734d7c679ebfebd704a0d7e56dfcb0d05818ce28977d" +source = "git+https://github.com/rustyrussell/utoipa.git#26f4908b092a4a746cbec935e05165852ea01289" [[package]] name = "valuable" diff --git a/plugins/rest-plugin/Cargo.toml b/plugins/rest-plugin/Cargo.toml index 32b74a4f0b3d..09b38fae837f 100644 --- a/plugins/rest-plugin/Cargo.toml +++ b/plugins/rest-plugin/Cargo.toml @@ -26,12 +26,12 @@ rcgen = "0.13" hyper = "1" tower= "0.5" tower-http = { version = "0.6", features = ["cors", "set-header"] } -utoipa = { version = "5", features = ['axum_extras'] } +utoipa = { git = "https://github.com/rustyrussell/utoipa.git", features = ['axum_extras'] } log-panics = "2" socketioxide = "0.15" cln-plugin = { version = "0.5", path = "../../plugins" } cln-rpc = { version = "0.5", path = "../../cln-rpc" } -utoipa-swagger-ui = { version = "9.0.0", features = ["vendored", "axum"] } +utoipa-swagger-ui = { git = "https://github.com/rustyrussell/utoipa.git", features = ["vendored", "axum"] } From 4d21c4393ef641240bd633cb253882e022818d39 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 4 Sep 2025 13:13:22 +0930 Subject: [PATCH 3/5] external/lowdown: remove. Every distribution we have packages this now. Changelog-Changed: Build: lowdown is now required (we no longer bundle our own). Signed-off-by: Rusty Russell --- .github/workflows/bsd.yml | 2 +- .gitmodules | 4 ---- configure | 8 +++----- doc/Makefile | 9 --------- doc/getting-started/getting-started/installation.md | 2 -- external/Makefile | 13 ------------- tools/build-release.sh | 5 ----- 7 files changed, 4 insertions(+), 39 deletions(-) diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index eee34d9379a6..630bed94fc12 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -60,7 +60,7 @@ jobs: git clone https://github.com/lightning/bolts.git ../bolts # fatal: unsafe repository ('/Users/runner/work/lightning/lightning' is owned by someone else) git config --global --add safe.directory `pwd` - for d in libsodium libwally-core gheap jsmn libbacktrace lowdown; do git config --global --add safe.directory `pwd`/external/$d; done + for d in libsodium libwally-core gheap jsmn libbacktrace; do git config --global --add safe.directory `pwd`/external/$d; done git submodule update --init --recursive ./configure CC="$CC" --disable-valgrind diff --git a/.gitmodules b/.gitmodules index 4788bedb3fd4..a23dfd76b15d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,7 +14,3 @@ [submodule "external/gheap"] path = external/gheap url = https://github.com/valyala/gheap -[submodule "external/lowdown"] - path = external/lowdown - url = https://github.com/kristapsdz/lowdown.git - ignore = dirty diff --git a/configure b/configure index ebfe22afc08a..809d275aa202 100755 --- a/configure +++ b/configure @@ -519,10 +519,9 @@ else HAVE_PYTHON3_MAKO=0 fi -if check_command 'lowdown' lowdown; then - HAVE_LOWDOWN=1 -else - HAVE_LOWDOWN=0 +if ! check_command 'lowdown' lowdown; then + echo "*** We need lowdown!" >&2 + exit 1 fi if echo | check_command sha256sum sha256sum; then @@ -572,7 +571,6 @@ add_var ASAN "$ASAN" add_var UBSAN "$UBSAN" add_var TEST_NETWORK "$TEST_NETWORK" add_var HAVE_PYTHON3_MAKO "$HAVE_PYTHON3_MAKO" -add_var HAVE_LOWDOWN "$HAVE_LOWDOWN" add_var SHA256SUM "$SHA256SUM" add_var FUZZING "$FUZZING" add_var RUST "$RUST" diff --git a/doc/Makefile b/doc/Makefile index 7c8acd36e86c..fbe718f92885 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -201,16 +201,7 @@ RBRACKET=) $(MARKDOWNPAGES_WITH_EXT): doc/%.7.md: doc/schemas/%.json tools/fromschema.py @tools/fromschema.py --markdownfile=$@ $< > $@.tmp && mv $@.tmp $@ -# If we need to build lowdown, make tools/md2man.sh depend on it. -# That way it's not used in SHA256STAMP (which only uses direct -# dependencies), but make will be forced to build it. -ifeq ($(HAVE_LOWDOWN),0) -LOWDOWN := $(TARGET_DIR)/lowdown-build/bin/lowdown -tools/md2man.sh: $(LOWDOWN) - touch $@ -else LOWDOWN := lowdown -endif # For versions in documentation, we don't change with every git version, to # save build time. We build them on new tags or keep them on pre-next-release version. diff --git a/doc/getting-started/getting-started/installation.md b/doc/getting-started/getting-started/installation.md index c7199120350e..ca05c8166761 100644 --- a/doc/getting-started/getting-started/installation.md +++ b/doc/getting-started/getting-started/installation.md @@ -115,8 +115,6 @@ sudo apt-get install -y valgrind libpq-dev shellcheck cppcheck \ libsecp256k1-dev lowdown ``` -If you can't install `lowdown`, a version will be built in-tree. - If you want to build the Rust plugins (cln-grpc, clnrest, cln-bip353 and wss-proxy): ```shell diff --git a/external/Makefile b/external/Makefile index 7ca251205191..311c94bc8e75 100644 --- a/external/Makefile +++ b/external/Makefile @@ -5,10 +5,6 @@ SUBMODULES = \ external/jsmn \ external/libbacktrace -ifeq ($(HAVE_LOWDOWN),0) -SUBMODULES += external/lowdown -endif - TOP := ../.. ifdef BUILD CROSSCOMPILE_OPTS := --host="$(MAKE_HOST)" --build="$(BUILD)" @@ -32,10 +28,6 @@ LIBBACKTRACE_HEADERS := external/libbacktrace/backtrace.h EXTERNAL_HEADERS := $(LIBSODIUM_HEADERS) $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS) $(GHEAP_HEADERS) $(LIBBACKTRACE_HEADERS) EXTERNAL_LIBS := ${TARGET_DIR}/libwallycore.a ${TARGET_DIR}/libsecp256k1.a ${TARGET_DIR}/libjsmn.a ${TARGET_DIR}/libbacktrace.a -ifeq ($(HAVE_LOWDOWN),0) -EXTERNAL_HEADERS += external/lowdown/lowdown.h -endif - EXTERNAL_INCLUDE_FLAGS := \ -I external/libwally-core/include/ \ -I external/libwally-core/src/secp256k1/include/ \ @@ -117,10 +109,6 @@ $(TARGET_DIR)/libbacktrace.a: external/libbacktrace/backtrace.h cd $(TARGET_DIR)/libbacktrace-build && $(TOP)/libbacktrace/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --prefix=/ --libdir=/ && $(MAKE) $(MAKE) -C $(TARGET_DIR)/libbacktrace-build DESTDIR=$$(pwd)/$(TARGET_DIR) install-exec -$(TARGET_DIR)/lowdown-build/bin/lowdown: external/lowdown/lowdown.h - cd external/lowdown && CC="$(CC)" CFLAGS="$(FUZZFLAGS)" ./configure LDFLAGS="$(FUZZFLAGS)" PREFIX=`pwd`/$(TOP)/$(TARGET_DIR)/lowdown-build/ - $(MAKE) -C external/lowdown install - distclean: external-distclean clean: external-clean @@ -130,6 +118,5 @@ external-clean: external-distclean: make -C external/libsodium distclean || true - if [ -f external/lowdown/Makefile.configure ]; then $(MAKE) -C external/lowdown distclean; fi $(RM) -rf ${TARGET_DIR}/libbacktrace-build ${TARGET_DIR}/libsodium-build ${TARGET_DIR}/libwally-core-build ${TARGET_DIR}/jsmn-build $(RM) -r `git status --ignored --porcelain external/libwally-core | grep '^!! ' | cut -c3-` diff --git a/tools/build-release.sh b/tools/build-release.sh index af21551648e9..8cc9a30cf9ee 100755 --- a/tools/build-release.sh +++ b/tools/build-release.sh @@ -124,11 +124,6 @@ echo "Current Timestamp: $DATE" mkdir -p "$RELEASEDIR" if [ "$WITHOUT_ZIP" = "false" ]; then - # submodcheck needs to know if we have lowdown - touch config.vars - ./configure --reconfigure - # If you don't have lowdown, your zip file will include it: we assume everyone has it now! - grep -q "HAVE_LOWDOWN=1" config.vars || (echo "Please install lowdown" >&2; exit 1) # If it's a completely clean directory, we need submodules! make submodcheck From e7cd0002c5db6c0288a9515f070fa5602a7b5184 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 4 Sep 2025 13:14:18 +0930 Subject: [PATCH 4/5] external/libsodium: remove We shipped our own because Ubuntu xenial (16.4) had an ancient one. Changelog-Changed: Build: libsodium version >= 1.0.4 now required (released 2015-06-11) Signed-off-by: Rusty Russell --- .github/workflows/bsd.yml | 2 +- .gitmodules | 3 --- configure | 5 +++++ .../contribute-to-core-lightning.md | 1 - external/Makefile | 21 +------------------ 5 files changed, 7 insertions(+), 25 deletions(-) diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index 630bed94fc12..eee8ab1b11e8 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -60,7 +60,7 @@ jobs: git clone https://github.com/lightning/bolts.git ../bolts # fatal: unsafe repository ('/Users/runner/work/lightning/lightning' is owned by someone else) git config --global --add safe.directory `pwd` - for d in libsodium libwally-core gheap jsmn libbacktrace; do git config --global --add safe.directory `pwd`/external/$d; done + for d in libwally-core gheap jsmn libbacktrace; do git config --global --add safe.directory `pwd`/external/$d; done git submodule update --init --recursive ./configure CC="$CC" --disable-valgrind diff --git a/.gitmodules b/.gitmodules index a23dfd76b15d..734acd9efcca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "daemon/jsmn"] path = external/jsmn url = https://github.com/zserge/jsmn -[submodule "libsodium"] - path = external/libsodium - url = https://github.com/jedisct1/libsodium.git [submodule "external/libbacktrace"] path = external/libbacktrace url = https://github.com/ianlancetaylor/libbacktrace.git diff --git a/configure b/configure index 809d275aa202..d1da16f3824b 100755 --- a/configure +++ b/configure @@ -585,6 +585,11 @@ while IFS='=' read VAR VAL; do eval $VAR=\"$VAL\" done < $CONFIG_VAR_FILE.$$ +if [ "$HAVE_GOOD_LIBSODIUM" != 1 ]; then + echo "*** We need a libsodium >= 1.0.4 (released 2015-06-11)." >&2 + exit 1 +fi + if [ "$HAVE_SQLITE3" = 0 -a "$HAVE_POSTGRES" = 0 ]; then # I have no database yet I must schema!) echo "*** We need a database, but neither sqlite3 nor postgres found" >&2 diff --git a/doc/contribute-to-core-lightning/contribute-to-core-lightning.md b/doc/contribute-to-core-lightning/contribute-to-core-lightning.md index 5e83adc3428a..0c5d2320f02f 100644 --- a/doc/contribute-to-core-lightning/contribute-to-core-lightning.md +++ b/doc/contribute-to-core-lightning/contribute-to-core-lightning.md @@ -24,7 +24,6 @@ Here's a list of parts, with notes: - external/ - external libraries from other sources - libbacktrace - library to provide backtraces when things go wrong. - - libsodium - encryption library (should be replaced soon with built-in) - libwally-core - bitcoin helper library - secp256k1 - bitcoin curve encryption library within libwally-core - jsmn - tiny JSON parsing helper diff --git a/external/Makefile b/external/Makefile index 311c94bc8e75..839cbac2c6d2 100644 --- a/external/Makefile +++ b/external/Makefile @@ -1,5 +1,4 @@ SUBMODULES = \ - external/libsodium \ external/libwally-core \ external/gheap \ external/jsmn \ @@ -13,7 +12,6 @@ else TARGET_DIR := external/build-$(shell ${CC} -dumpmachine) endif -LIBSODIUM_HEADERS := external/libsodium/src/libsodium/include/sodium.h LIBWALLY_HEADERS := external/libwally-core/include/wally_bip32.h \ external/libwally-core/include/wally_core.h \ external/libwally-core/include/wally_psbt.h \ @@ -25,7 +23,7 @@ JSMN_HEADERS := external/jsmn/jsmn.h GHEAP_HEADERS := external/gheap/gheap.h LIBBACKTRACE_HEADERS := external/libbacktrace/backtrace.h -EXTERNAL_HEADERS := $(LIBSODIUM_HEADERS) $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS) $(GHEAP_HEADERS) $(LIBBACKTRACE_HEADERS) +EXTERNAL_HEADERS := $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS) $(GHEAP_HEADERS) $(LIBBACKTRACE_HEADERS) EXTERNAL_LIBS := ${TARGET_DIR}/libwallycore.a ${TARGET_DIR}/libsecp256k1.a ${TARGET_DIR}/libjsmn.a ${TARGET_DIR}/libbacktrace.a EXTERNAL_INCLUDE_FLAGS := \ @@ -36,14 +34,7 @@ EXTERNAL_INCLUDE_FLAGS := \ -I external/gheap/ \ -I ${TARGET_DIR}/libbacktrace-build -ifneq ($(HAVE_GOOD_LIBSODIUM),1) -EXTERNAL_INCLUDE_FLAGS += -I external/libsodium/src/libsodium/include \ - -I external/libsodium/src/libsodium/include/sodium \ - -I $(TARGET_DIR)/libsodium-build/src/libsodium/include -EXTERNAL_LIBS += ${TARGET_DIR}/libsodium.a -else LDLIBS += $(SODIUM_LDLIBS) -endif ifeq ($(HAVE_ZLIB),1) LDLIBS += -lz @@ -59,15 +50,6 @@ endif $(EXTERNAL_HEADERS): submodcheck -# We build libsodium, since Ubuntu xenial has one too old. -$(TARGET_DIR)/libsodium.a: $(TARGET_DIR)/libsodium-build/src/libsodium/libsodium.la - $(MAKE) -C $(TARGET_DIR)/libsodium-build DESTDIR=$$(pwd)/$(TARGET_DIR) install-exec - -$(TARGET_DIR)/libsodium-build/src/libsodium/libsodium.la: external/libsodium/src/libsodium/include/sodium.h - cd external/libsodium && ./autogen.sh - mkdir -p ${TARGET_DIR}/libsodium-build - cd $(TARGET_DIR)/libsodium-build && $(TOP)/libsodium/configure CC="$(CC)" CFLAGS="$(FUZZFLAGS)" LDFLAGS="$(FUZZFLAGS)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --prefix=/ --libdir=/ && $(MAKE) - # libsecp included in libwally. # Wildcards here are magic. See http://stackoverflow.com/questions/2973445/gnu-makefile-rule-generating-a-few-targets-from-a-single-source-file $(TARGET_DIR)/libsecp256k1.% $(TARGET_DIR)/libwallycore.%: $(TARGET_DIR)/libwally-core-build/src/secp256k1/libsecp256k1.la $(TARGET_DIR)/libwally-core-build/src/libwallycore.la @@ -117,6 +99,5 @@ external-clean: $(RM) -rf $(TARGET_DIR) external-distclean: - make -C external/libsodium distclean || true $(RM) -rf ${TARGET_DIR}/libbacktrace-build ${TARGET_DIR}/libsodium-build ${TARGET_DIR}/libwally-core-build ${TARGET_DIR}/jsmn-build $(RM) -r `git status --ignored --porcelain external/libwally-core | grep '^!! ' | cut -c3-` From cc3e43d2e3afe5d4198fe7e888b051ae050f3397 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 4 Sep 2025 13:14:18 +0930 Subject: [PATCH 5/5] Remove litecoin support. No idea if it works, we don't test it and nobody runs it. I guess not. Signed-off-by: Rusty Russell Changelog-Removed: Config: non-functioning litecoin support (who knew we even had that?) --- Dockerfile | 10 ------- bitcoin/chainparams.c | 52 ------------------------------------- common/configdir.c | 2 +- devtools/gossipwith.c | 3 +-- doc/lightning-reckless.1.md | 2 +- hsmd/libhsmd.c | 3 +-- tools/reckless | 2 +- 7 files changed, 5 insertions(+), 69 deletions(-) diff --git a/Dockerfile b/Dockerfile index e80f3b8eb109..dedad242e4d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,15 +45,6 @@ RUN mkdir /opt/bitcoin && cd /opt/bitcoin \ && tar -xzvf $BITCOIN_TARBALL $BD/ --strip-components=1 \ && rm $BITCOIN_TARBALL -ENV LITECOIN_VERSION 0.16.3 -ENV LITECOIN_URL https://download.litecoin.org/litecoin-${LITECOIN_VERSION}/linux/litecoin-${LITECOIN_VERSION}-${TARBALL_ARCH_FINAL}.tar.gz - -# install litecoin binaries -RUN mkdir /opt/litecoin && cd /opt/litecoin \ - && wget -qO litecoin.tar.gz "$LITECOIN_URL" \ - && tar -xzvf litecoin.tar.gz litecoin-$LITECOIN_VERSION/bin/litecoin-cli --strip-components=1 --exclude=*-qt \ - && rm litecoin.tar.gz - FROM --platform=${DEFAULT_TARGETPLATFORM} ${BASE_DISTRO} AS base-builder RUN apt-get update -qq && \ apt-get install -qq -y --no-install-recommends \ @@ -264,7 +255,6 @@ RUN --mount=type=bind,from=builder,source=/var/libpq,target=/var/libpq,rw \ COPY --from=builder /tmp/lightning_install/ /usr/local/ COPY --from=builder-python /root/.venvs/cln/lib/python3.11/site-packages /usr/local/lib/python3.11/dist-packages/ COPY --from=downloader /opt/bitcoin/bin /usr/bin -COPY --from=downloader /opt/litecoin/bin /usr/bin COPY tools/docker-entrypoint.sh entrypoint.sh EXPOSE 9735 9835 diff --git a/bitcoin/chainparams.c b/bitcoin/chainparams.c index 572f8b16747e..85528f5ab621 100644 --- a/bitcoin/chainparams.c +++ b/bitcoin/chainparams.c @@ -163,58 +163,6 @@ const struct chainparams networks[] = { .bip32_key_version = {.bip32_pubkey_version = BIP32_VER_TEST_PUBLIC, .bip32_privkey_version = BIP32_VER_TEST_PRIVATE}, .is_elements = false}, - {.network_name = "litecoin", - .onchain_hrp = "ltc", - .lightning_hrp = "ltc", - .bip70_name = "main", - .genesis_blockhash = {{{.u.u8 = {0xe2, 0xbf, 0x04, 0x7e, 0x7e, 0x5a, 0x19, - 0x1a, 0xa4, 0xef, 0x34, 0xd3, 0x14, 0x97, - 0x9d, 0xc9, 0x98, 0x6e, 0x0f, 0x19, 0x25, - 0x1e, 0xda, 0xba, 0x59, 0x40, 0xfd, 0x1f, - 0xe3, 0x65, 0xa7, 0x12}}}}, - .rpc_port = 9332, - .ln_port = 9735, - .cli = "litecoin-cli", - .cli_args = NULL, - .cli_min_supported_version = 150000, - .dust_limit = { 100000 }, - .max_funding = AMOUNT_SAT_INIT(60 * ((1 << 24) - 1)), - .max_payment = AMOUNT_MSAT_INIT(60 * 0xFFFFFFFFULL), - .max_supply = AMOUNT_SAT_INIT(2100000000000000), - .when_lightning_became_cool = 1320000, - .p2pkh_version = 48, - .p2sh_version = 50, - .testnet = false, - .fee_asset_tag = NULL, - .bip32_key_version = {.bip32_pubkey_version = BIP32_VER_MAIN_PUBLIC, - .bip32_privkey_version = BIP32_VER_MAIN_PRIVATE}, - .is_elements = false}, - {.network_name = "litecoin-testnet", - .onchain_hrp = "tltc", - .lightning_hrp = "tltc", - .bip70_name = "test", - .genesis_blockhash = {{{.u.u8 = {0xa0, 0x29, 0x3e, 0x4e, 0xeb, 0x3d, 0xa6, - 0xe6, 0xf5, 0x6f, 0x81, 0xed, 0x59, 0x5f, - 0x57, 0x88, 0x0d, 0x1a, 0x21, 0x56, 0x9e, - 0x13, 0xee, 0xfd, 0xd9, 0x51, 0x28, 0x4b, - 0x5a, 0x62, 0x66, 0x49}}}}, - .rpc_port = 19332, - .ln_port = 9735, - .cli = "litecoin-cli", - .cli_args = "-testnet", - .cli_min_supported_version = 150000, - .dust_limit = { 100000 }, - .max_funding = AMOUNT_SAT_INIT(60 * ((1 << 24) - 1)), - .max_payment = AMOUNT_MSAT_INIT(60 * 0xFFFFFFFFULL), - .max_supply = AMOUNT_SAT_INIT(2100000000000000), - .when_lightning_became_cool = 1, - .p2pkh_version = 111, - .p2sh_version = 58, - .testnet = true, - .fee_asset_tag = NULL, - .bip32_key_version = {.bip32_pubkey_version = BIP32_VER_TEST_PUBLIC, - .bip32_privkey_version = BIP32_VER_TEST_PRIVATE}, - .is_elements = false}, {.network_name = "liquid-regtest", .onchain_hrp = "ert", .lightning_hrp = "ert", diff --git a/common/configdir.c b/common/configdir.c index 248c8e73e010..63354d1d9488 100644 --- a/common/configdir.c +++ b/common/configdir.c @@ -342,7 +342,7 @@ struct configvar **initial_config_opts(const tal_t *ctx, opt_register_early_arg("--network", opt_set_network, opt_show_network, NULL, "Select the network parameters (bitcoin, testnet," - " signet, regtest, litecoin or litecoin-testnet)"); + " signet, or regtest)"); opt_register_early_noarg("--testnet", opt_set_specific_network, "testnet", "Alias for --network=testnet"); diff --git a/devtools/gossipwith.c b/devtools/gossipwith.c index f506787cd4e3..4361d57b2cb7 100644 --- a/devtools/gossipwith.c +++ b/devtools/gossipwith.c @@ -375,8 +375,7 @@ int main(int argc, char *argv[]) opt_register_arg("--network", opt_set_network, opt_show_network, NULL, "Select the network parameters (bitcoin, testnet, signet," - " regtest, liquid, liquid-regtest, litecoin or" - " litecoin-testnet)"); + " regtest, liquid, or liquid-regtest)"); opt_register_noarg("--must-get-max-messages", opt_set_bool, &no_early_close, "Fail with exit code 1 unless we reach maximum messages"); opt_register_noarg("--help|-h", opt_usage_and_exit, diff --git a/doc/lightning-reckless.1.md b/doc/lightning-reckless.1.md index d8820bd10533..3642465077a4 100644 --- a/doc/lightning-reckless.1.md +++ b/doc/lightning-reckless.1.md @@ -85,7 +85,7 @@ Available option flags: request additional debug output **--network**=*network* - specify bitcoin, regtest, liquid, liquid-regtest, litecoin, signet, + specify bitcoin, regtest, liquid, liquid-regtest, signet, or testnet networks. (default: bitcoin) NOTES diff --git a/hsmd/libhsmd.c b/hsmd/libhsmd.c index c013ec4aec55..55be60db2589 100644 --- a/hsmd/libhsmd.c +++ b/hsmd/libhsmd.c @@ -2347,8 +2347,7 @@ u8 *hsmd_init(struct secret hsm_secret, const u64 hsmd_version, /* Fill in the BIP32 tree for bitcoin addresses. */ /* In libwally-core, the version BIP32_VER_TEST_PRIVATE is for testnet/regtest, - * and BIP32_VER_MAIN_PRIVATE is for mainnet. For litecoin, we also set it like - * bitcoin else.*/ + * and BIP32_VER_MAIN_PRIVATE is for mainnet. */ do { hkdf_sha256(bip32_seed, sizeof(bip32_seed), &salt, sizeof(salt), diff --git a/tools/reckless b/tools/reckless index 2bfb68bde643..21c8e42adfa4 100755 --- a/tools/reckless +++ b/tools/reckless @@ -2033,7 +2033,7 @@ if __name__ == '__main__': NETWORK = 'regtest' if args.regtest else 'bitcoin' SUPPORTED_NETWORKS = ['bitcoin', 'regtest', 'liquid', 'liquid-regtest', - 'litecoin', 'signet', 'testnet', 'testnet4'] + 'signet', 'testnet', 'testnet4'] if args.version: report_version() elif args.cmd1 is None: