diff --git a/.github/scripts/setup.sh b/.github/scripts/setup.sh index 6e3e50cc8bc1..1e074763be7b 100755 --- a/.github/scripts/setup.sh +++ b/.github/scripts/setup.sh @@ -30,11 +30,13 @@ sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \ libicu-dev \ libpq-dev \ libprotobuf-c-dev \ + libsodium-dev \ libsqlite3-dev \ libssl-dev \ libtool \ libxml2-utils \ locales \ + lowdown \ net-tools \ postgresql \ python-pkg-resources \ diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index eee34d9379a6..773cd3258288 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -40,6 +40,7 @@ jobs: bash \ gettext \ sqlite3 \ + libsodium \ lowdown \ pkgconf \ jq \ @@ -60,7 +61,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 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/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index de198b3cc678..78fc45adccc5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -196,7 +196,6 @@ jobs: run: | bash -x .github/scripts/setup.sh sudo apt-get update -qq - sudo apt-get install -y -qq lowdown # We're going to check BOLT quotes, so get the latest version git clone https://github.com/lightning/bolts.git ../${BOLTDIR} diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index 99f8a3dc3088..71ca8e9d235f 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -37,7 +37,7 @@ jobs: run: | export PATH="/usr/local/opt:/Users/runner/.local/bin:/opt/homebrew/bin/python3.10/bin:$PATH" - brew install gnu-sed autoconf automake libtool protobuf openssl + brew install gnu-sed autoconf automake libtool protobuf openssl lowdown libsodium # https://github.com/grpc/grpc/issues/31737#issuecomment-1323796842 export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 diff --git a/.gitmodules b/.gitmodules index 4788bedb3fd4..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 @@ -14,7 +11,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/Cargo.lock b/Cargo.lock index 75f85c53a514..8e995fcc18e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3126,8 +3126,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", @@ -3138,8 +3137,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", @@ -3150,8 +3148,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", @@ -3169,8 +3166,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/Dockerfile b/Dockerfile index fa9db35e9691..db9e2691c892 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,25 +43,6 @@ RUN gpg --quiet --import gpg/* && \ RUN tar xzf ${BITCOIN_TARBALL} --strip-components=1 -ARG LITECOIN_VERSION=0.16.3 -ARG LITECOIN_BASE_URL=https://download.litecoin.org/litecoin-${LITECOIN_VERSION} -ARG LITECOIN_URL=${LITECOIN_BASE_URL}/linux -ARG LITECOIN_TARBALL=litecoin-${LITECOIN_VERSION}-${target_arch}.tar.gz - -WORKDIR /opt/litecoin - -ADD ${LITECOIN_URL}/${LITECOIN_TARBALL} . -ADD ${LITECOIN_URL}/${LITECOIN_TARBALL}.asc . -ADD ${LITECOIN_BASE_URL}/SHA256SUMS.asc . -COPY contrib/keys/litecoin/ gpg/ - -RUN gpg --quiet --import gpg/* && \ - gpg --verify SHA256SUMS.asc && \ - gpg --verify ${LITECOIN_TARBALL}.asc ${LITECOIN_TARBALL} && \ - sha256sum -c SHA256SUMS.asc --ignore-missing - -RUN tar xzf ${LITECOIN_TARBALL} --strip-components=1 - FROM base-host AS base-builder RUN apt-get update && \ @@ -185,7 +166,6 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* COPY --from=downloader /opt/bitcoin/bin/bitcoin-cli /usr/bin/ -COPY --from=downloader /opt/litecoin/bin/litecoin-cli /usr/bin/ COPY --from=builder /tmp/lightning_install/ /usr/local/ COPY tools/docker-entrypoint.sh /entrypoint.sh @@ -197,4 +177,4 @@ ENV LIGHTNINGD_NETWORK=bitcoin EXPOSE 9735 9835 VOLUME ["/root/.lightning"] -ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/entrypoint.sh"] diff --git a/bitcoin/chainparams.c b/bitcoin/chainparams.c index 9d2883ba1def..9ce3b05202a9 100644 --- a/bitcoin/chainparams.c +++ b/bitcoin/chainparams.c @@ -162,58 +162,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 8bbf29b4c49b..8346e5ba77b8 100644 --- a/common/configdir.c +++ b/common/configdir.c @@ -341,7 +341,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/configure b/configure index 5e480e9b6f48..f69dc1573a3b 100755 --- a/configure +++ b/configure @@ -518,10 +518,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 @@ -615,7 +614,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" @@ -631,6 +629,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/devtools/gossipwith.c b/devtools/gossipwith.c index a0e55ab996cb..827c1a68dac6 100644 --- a/devtools/gossipwith.c +++ b/devtools/gossipwith.c @@ -369,8 +369,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/Makefile b/doc/Makefile index c4c2192abfa4..c3f178f7e28c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -202,16 +202,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/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/doc/getting-started/getting-started/installation.md b/doc/getting-started/getting-started/installation.md index 045bfbc0d3e6..dfc064f08b91 100644 --- a/doc/getting-started/getting-started/installation.md +++ b/doc/getting-started/getting-started/installation.md @@ -83,7 +83,7 @@ Get dependencies: sudo apt-get update sudo apt-get install -y \ jq autoconf automake build-essential git libtool libsqlite3-dev libffi-dev \ - python3 python3-pip net-tools zlib1g-dev libsodium-dev gettext + python3 python3-pip net-tools zlib1g-dev libsodium-dev gettext lowdown pip3 install --upgrade pip curl -LsSf https://astral.sh/uv/install.sh | sh ``` @@ -121,8 +121,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 @@ -239,7 +237,7 @@ lightningd --network=testnet OS version: FreeBSD 11.1-RELEASE or above ```shell -pkg install git python py39-pip gmake libtool gmp sqlite3 postgresql13-client gettext autotools +pkg install git python py39-pip gmake libtool gmp sqlite3 postgresql13-client gettext autotools lowdown libsodium https://github.com/ElementsProject/lightning.git pip install --upgrade pip pip3 install mako @@ -331,7 +329,7 @@ make Assuming you have Xcode and Homebrew installed. Install dependencies: ```shell -brew install autoconf automake libtool python3 gnu-sed gettext libsodium protobuf +brew install autoconf automake libtool python3 gnu-sed gettext libsodium protobuf lowdown export PATH="/usr/local/opt:$PATH" ``` 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/external/Makefile b/external/Makefile index 7ca251205191..839cbac2c6d2 100644 --- a/external/Makefile +++ b/external/Makefile @@ -1,14 +1,9 @@ SUBMODULES = \ - external/libsodium \ external/libwally-core \ external/gheap \ external/jsmn \ external/libbacktrace -ifeq ($(HAVE_LOWDOWN),0) -SUBMODULES += external/lowdown -endif - TOP := ../.. ifdef BUILD CROSSCOMPILE_OPTS := --host="$(MAKE_HOST)" --build="$(BUILD)" @@ -17,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 \ @@ -29,13 +23,9 @@ 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 -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/ \ @@ -44,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 @@ -67,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,10 +91,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 @@ -129,7 +99,5 @@ external-clean: $(RM) -rf $(TARGET_DIR) 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/hsmd/libhsmd.c b/hsmd/libhsmd.c index f459f03f1577..883b52d4d206 100644 --- a/hsmd/libhsmd.c +++ b/hsmd/libhsmd.c @@ -2367,8 +2367,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/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"] } diff --git a/tools/build-release.sh b/tools/build-release.sh index 1280d7999f15..7a96a22a80ca 100755 --- a/tools/build-release.sh +++ b/tools/build-release.sh @@ -141,11 +141,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 diff --git a/tools/reckless b/tools/reckless index 33ef0fa2a338..5358a3fcb8be 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: