Re-pin rust-lightning to zeus-0.2 (v0.2.5 + Zeus patches) - #5
Open
kaloudis wants to merge 3 commits into
Open
Conversation
Move the fork off the stale lsps7-for-ldk-node-close-fix branch (a Dec 2025 snapshot of upstream main missing every 0.2.1-0.2.5 fix, including the 0.2.3 'Through the Loupe' and 0.2.5 'MegaScan' security batches) onto ZeusLN/rust-lightning zeus-0.2, which is upstream 0.2 branch head (= v0.2.5) plus the same five Zeus patches: - LSPS7 (Channel Lease Extensions) client handler - cooperative close feerate floor bypass - BOLT11 route hints override (+ tests) Since v0.2.5 predates upstream #4175 (impl-Future trait methods), this also reverts 84bf2a5 ("Update to new upstream rust-lightning with impl Futures") and adapts the pieces written after it: - DualStore's async KVStore impl returns boxed futures again - builder passes Arc-wrapped DualStore to build_with_store - test helpers updated for LDK 0.2.5 test API (check_closed_event is_check_discard_funding arg) and the fork's 3-arg bolt11 send The pre-existing integration-test compile breakage (bolt11 send call sites in tests/ and benches/, present since the retry-timeout param was added) is untouched except where the revert crossed it.
Append the trailing per-call retry-timeout argument (None) at every bolt11/bolt12/spontaneous send call site in tests/ and benches/. These targets stopped compiling when the configurable payment retry timeout parameter was added; with this, cargo check --all-targets is green again.
Merged
17 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Moves the fork off
ZeusLN/rust-lightningbranchlsps7-for-ldk-node-close-fix(a December 2025 snapshot of upstreammain, six days after the 0.2.0 release) onto the newzeus-0.2branch, which is upstream's0.2release branch head (= v0.2.5) plus the same five Zeus patches rebased on top:Why
The old pin predates every 0.2.1-0.2.5 fix, including both upstream security batches:
Because mobile artifacts build with
panic = 'abort'(release-smaller profile), every one of the missing "no longer panics" fixes is a hard app abort for ZEUS users. #4717 in particular is remotely triggerable by getting a user to pay a crafted invoice (paste / QR / LNURL).Tracking upstream's maintained
0.2release branch also makes future security backports a fast-forward instead of another main-snapshot rebase.How
zeus-0.2branch pushed to ZeusLN/rust-lightning: v0.2.5 + the 5 rebased commits,cargo test -p lightning(1205 tests),-p lightning-liquidity(101 tests incl. LSPS7) all greencargo check --all-targetsis green againTesting
cargo check --all-targets: cleancargo test --lib: 23/23 pass