diff --git a/.github/workflows/buildService.yml b/.github/workflows/buildService.yml index 299c90c..a2a6633 100644 --- a/.github/workflows/buildService.yml +++ b/.github/workflows/buildService.yml @@ -19,6 +19,12 @@ jobs: - name: Checkout services repository uses: actions/checkout@v4 + - name: Debug + run: | + pwd + ls -alR + + - name: Build the service package id: build run: | @@ -28,7 +34,6 @@ jobs: PACKAGE_ID=$(yq -oy ".id" manifest.*) echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV shell: bash - - name: Upload .s9pk uses: actions/upload-artifact@v4 with: diff --git a/Dockerfile b/Dockerfile index 327defd..27f0c5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lightninglabs/lnd:v0.17.4-beta +FROM lightninglabs/lnd:v0.17.5-beta ARG ARCH RUN apk add --no-cache \ diff --git a/Makefile b/Makefile index 56e7fa6..02435db 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ASSET_PATHS := $(shell find ./assets/*) -CONFIGURATOR_SRC := $(shell find ./configurator/src) configurator/Cargo.toml configurator/Cargo.lock -HEALTH_CHECK_SRC := $(shell find ./health-check/src) health-check/Cargo.toml health-check/Cargo.lock +CONFIGURATOR_SRC := $(shell find ./configurator -name target -prune -o -type f -print) configurator/Cargo.toml configurator/Cargo.lock +HEALTH_CHECK_SRC := $(shell find ./health-check -name target -prune -o -type f -print) health-check/Cargo.toml health-check/Cargo.lock PKG_VERSION := $(shell yq e ".version" manifest.yaml) PKG_ID := $(shell yq e ".id" manifest.yaml) @@ -45,20 +45,20 @@ docker-images/aarch64.tar: Dockerfile docker_entrypoint.sh configurator/target/a docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --platform=linux/arm64 --build-arg ARCH=aarch64 -o type=docker,dest=docker-images/aarch64.tar . configurator/target/aarch64-unknown-linux-musl/release/configurator: $(CONFIGURATOR_SRC) - docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:aarch64-musl cargo build --release - docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:aarch64-musl musl-strip target/aarch64-unknown-linux-musl/release/configurator + docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:aarch64-musl cargo build --release + docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:aarch64-musl musl-strip target/aarch64-unknown-linux-musl/release/configurator health-check/target/aarch64-unknown-linux-musl/release/health-check: $(HEALTH_CHECK_SRC) - docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:aarch64-musl cargo build --release - docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:aarch64-musl musl-strip target/aarch64-unknown-linux-musl/release/health-check + docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:aarch64-musl cargo build --release + docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:aarch64-musl musl-strip target/aarch64-unknown-linux-musl/release/health-check configurator/target/x86_64-unknown-linux-musl/release/configurator: $(CONFIGURATOR_SRC) - docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:x86_64-musl cargo build --release - docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:x86_64-musl musl-strip target/x86_64-unknown-linux-musl/release/configurator + docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:x86_64-musl cargo build --release + docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:x86_64-musl musl-strip target/x86_64-unknown-linux-musl/release/configurator health-check/target/x86_64-unknown-linux-musl/release/health-check: $(HEALTH_CHECK_SRC) - docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:x86_64-musl cargo build --release - docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:x86_64-musl musl-strip target/x86_64-unknown-linux-musl/release/health-check + docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:x86_64-musl cargo build --release + docker run --rm -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/health-check:/home/rust/src messense/rust-musl-cross:x86_64-musl musl-strip target/x86_64-unknown-linux-musl/release/health-check scripts/embassy.js: scripts/**/*.ts deno bundle scripts/embassy.ts scripts/embassy.js diff --git a/manifest.yaml b/manifest.yaml index 9ff5f8f..6642fcf 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,10 +1,9 @@ id: lnd title: LND -version: 0.17.4 +version: 0.17.5 release-notes: |- - * Update upstream to 0.17.4 [Release Notes](https://github.com/lightningnetwork/lnd/releases/tag/v0.17.4-beta) - * Add warnings for migration actions - * Fix Backup restore to retry when LND still starting up + * Update upstream to 0.17.5 [Release Notes](https://github.com/lightningnetwork/lnd/releases/tag/v0.17.5-beta) + * Bump Bitcoin dependency to <29.0.0 license: mit wrapper-repo: "https://github.com/Start9Labs/lnd-startos" upstream-repo: "https://github.com/lightningnetwork/lnd" @@ -61,7 +60,8 @@ volumes: alerts: install: | READ CAREFULLY! LND and the Lightning Network are considered beta software. Please use with caution and do not risk more money than you are willing to lose. We encourage frequent backups, particularly after opening or closing channels. If for any reason, you need to restore LND from a backup, your on-chain wallet will be restored. Any channels in the backup will be closed and their funds returned to your on-chain wallet, minus fees. It may also take some time for this process to occur. Any channels opened after the last backup CANNOT be recovered by backup restore. - uninstall: "READ CAREFULLY! Uninstalling LND will result in permanent loss of data, including its private keys for its on-chain wallet and all channel states. Please make a backup if you have any funds in your on-chain wallet or in any channels. Recovering from backup will restore your on-chain wallet, but due to the architecture of the Lightning Network, your channels cannot be recovered. All channels included in the backup will be closed and their funds returned to your on-chain wallet, minus fees". Any channels opened after the last backup CANNOT be recovered by backup restore + uninstall: | + "READ CAREFULLY! Uninstalling LND will result in permanent loss of data, including its private keys for its on-chain wallet and all channel states. Please make a backup if you have any funds in your on-chain wallet or in any channels. Recovering from backup will restore your on-chain wallet, but due to the architecture of the Lightning Network, your channels cannot be recovered. All channels included in the backup will be closed and their funds returned to your on-chain wallet, minus fees". Any channels opened after the last backup CANNOT be recovered by backup restore restore: | READ CAREFULLY! Any channels opened since the last backup will be forgotten and may linger indefinitely, and channels contained in the backup will be closed and their funds returned to your on-chain wallet, minus fees. After all recoverable funds are available in your on-chain wallet, all funds should be swept to a different wallet. NEVER use a restored LND wallet to open new channels. If you would like to use LND after a backup restore you will first need to sweep all on-chain funds to a different wallet, next LND can be safely uninstalled, and finally LND can be installed fresh from the marketplace. interfaces: @@ -100,7 +100,7 @@ interfaces: - http dependencies: bitcoind: - version: ">=0.21.1.2 <27.0.0" + version: ">=0.21.1.2 <29.0.0" requirement: type: "opt-out" how: "Can alternatively use Neutrino" diff --git a/scripts/services/migrations.ts b/scripts/services/migrations.ts index 656b2e1..5d777a6 100644 --- a/scripts/services/migrations.ts +++ b/scripts/services/migrations.ts @@ -211,5 +211,5 @@ export const migration: T.ExpectedExports.migration = compat.migrations }, }, }, - "0.17.4", + "0.17.5", );