Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,3 @@ jobs:
- uses: rustsec/audit-check@v1.4.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ignore: "RUSTSEC-2021-0145"
# RUSTSEC-2021-0145 pertains `atty`, which is a depencency of
# `criterion`. While the latter removed the depencency in its
# newest version, it would also require a higher `rustc`. We
# therefore avoid bumping it to allow benchmarking with our
# `rustc` 1.63 MSRV.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ jobs:
fuzz_sanity:
runs-on: self-hosted
env:
TOOLCHAIN: 1.75
TOOLCHAIN: 1.85.0
steps:
- name: Checkout source code
uses: actions/checkout@v4
Expand All @@ -232,7 +232,7 @@ jobs:
fuzz:
runs-on: self-hosted
env:
TOOLCHAIN: 1.75
TOOLCHAIN: 1.85.0
steps:
- name: Checkout source code
uses: actions/checkout@v4
Expand Down Expand Up @@ -317,7 +317,7 @@ jobs:
rustfmt:
runs-on: ubuntu-latest
env:
TOOLCHAIN: 1.75.0
TOOLCHAIN: 1.85.0
steps:
- name: Checkout source code
uses: actions/checkout@v4
Expand All @@ -336,7 +336,7 @@ jobs:
tor-connect:
runs-on: ubuntu-latest
env:
TOOLCHAIN: 1.75.0
TOOLCHAIN: 1.85.0
steps:
- name: Checkout source code
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
|| fromJSON('["self-hosted"]') }}
toolchain: >-
${{ github.event_name == 'push' && github.ref == 'refs/heads/main'
&& fromJSON('["stable","beta","1.75.0"]')
|| fromJSON('["1.75.0"]') }}
&& fromJSON('["stable","beta","1.85.0"]')
|| fromJSON('["1.85.0"]') }}
exclude:
- platform: windows-latest
toolchain: 1.75.0
toolchain: 1.85.0
- platform: windows-latest
toolchain: beta
- platform: macos-latest
Expand All @@ -40,7 +40,7 @@ jobs:
shell: bash
run: echo "RUSTFLAGS=-C linker=rust-lld" >> "$GITHUB_ENV"
- name: Set RUSTFLAGS to deny warnings
if: "matrix.toolchain == '1.75.0'"
if: "matrix.toolchain == '1.85.0'"
run: echo "RUSTFLAGS=-D warnings" >> "$GITHUB_ENV"
- name: Install no-std-check dependencies for ARM Embedded
if: matrix.platform == 'self-hosted'
Expand Down
4 changes: 2 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ See [README.md](README.md) for the workspace layout and [ARCH.md](ARCH.md) for s
## Development Rules

- Always ensure tests pass before committing. To this end, you should run
`cargo +1.75.0 test` for all affected crates and/or features. Upon completion
`cargo +1.85.0 test` for all affected crates and/or features. Upon completion
of the full task you might prompt the user whether they want you to run the
full CI tests via `./ci/ci-tests.sh`. Note however that this script will run
for a very long time, so please don't timeout when you do.
- Run `cargo +1.75.0 fmt --all` before committing code changes. If rust 1.75.0 is
- Run `cargo +1.85.0 fmt --all` before committing code changes. If rust 1.85.0 is
not installed, skip this step.
- Never add new dependencies unless explicitly requested
- Please always disclose the use of any AI tools in commit messages and PR descriptions using a `Co-Authored-By:` line.
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ be covered by functional tests.
When refactoring, structure your PR to make it easy to review and don't
hesitate to split it into multiple small, focused PRs.

The Minimum Supported Rust Version (MSRV) currently is 1.75.0 (enforced by
The Minimum Supported Rust Version (MSRV) currently is 1.85.0 (enforced by
our GitHub Actions). We support reading serialized LDK objects written by any
version of LDK 0.0.99 and above. We support LDK versions 0.0.113 and above
reading serialized LDK objects written by modern LDK. Any expected issues with
Expand Down Expand Up @@ -124,7 +124,7 @@ display fine at any tab-length display setting. We use `rustfmt` to establish
uniform coding standards throughout the codebase. Please run

```bash
cargo +1.75.0 fmt
cargo +1.85.0 fmt
```

before committing and pushing any changes, as compliance will also be checked
Expand Down
4 changes: 2 additions & 2 deletions bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "lightning-bench"
version = "0.0.1"
authors = ["Matt Corallo"]
edition = "2021"
edition = "2024"

[[bench]]
name = "bench"
Expand All @@ -12,7 +12,7 @@ harness = false
lightning = { path = "../lightning", features = ["_test_utils", "criterion"] }
lightning-persister = { path = "../lightning-persister", features = ["criterion"] }
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync", features = ["criterion"] }
criterion = { version = "0.4", default-features = false }
criterion = { version = "0.5", default-features = false }

[profile.release]
opt-level = 3
Expand Down
11 changes: 0 additions & 11 deletions ci/ci-tests-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
# Source this file; do not execute it directly.
# shellcheck disable=SC2002,SC2207

RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')

# Some crates require pinning to meet our MSRV even for our downstream users,
# which we do here.
# Further crates which appear only as dev-dependencies are pinned further down.
Expand All @@ -14,13 +12,4 @@ function PIN_RELEASE_DEPS {

PIN_RELEASE_DEPS # pin the release dependencies in our main workspace
Comment thread
tnull marked this conversation as resolved.

# The backtrace v0.3.75 crate relies on rustc 1.82
[ "$RUSTC_MINOR_VERSION" -lt 82 ] && cargo update -p backtrace --precise "0.3.74" --quiet

# Starting with version 1.2.0, the `idna_adapter` crate has an MSRV of rustc 1.81.0.
[ "$RUSTC_MINOR_VERSION" -lt 81 ] && cargo update -p idna_adapter --precise "1.1.0" --quiet

# Starting with version 0.27.8, the `hyper-rustls` crate has an MSRV of rustc 1.85.0.
[ "$RUSTC_MINOR_VERSION" -lt 85 ] && cargo update -p hyper-rustls --precise "0.27.7" --quiet

export RUST_BACKTRACE=1
2 changes: 1 addition & 1 deletion ext-functional-test-demo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ext-functional-tester"
version = "0.1.0"
edition = "2021"
edition = "2024"

[features]
test-broken = []
Expand Down
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "lightning-fuzz"
version = "0.0.1"
authors = ["Automatically generated"]
publish = false
edition = "2021"
edition = "2024"

[dependencies]
lightning = { path = "../lightning", features = ["regex", "_test_utils"] }
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz-fake-hashes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "lightning-fuzz-fake-hashes"
version = "0.0.1"
authors = ["Automatically generated"]
publish = false
edition = "2021"
edition = "2024"

[package.metadata]
cargo-fuzz = true
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz-real-hashes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "lightning-fuzz-real-hashes"
version = "0.0.1"
authors = ["Automatically generated"]
publish = false
edition = "2021"
edition = "2024"

[package.metadata]
cargo-fuzz = true
Expand Down
2 changes: 1 addition & 1 deletion fuzz/src/base32.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub fn base32_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
do_test(data);
}

#[no_mangle]
#[unsafe(no_mangle)]
pub extern "C" fn base32_run(data: *const u8, datalen: usize) {
do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
}
2 changes: 1 addition & 1 deletion fuzz/src/bech32_parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub fn bech32_parse_test<Out: test_logger::Output>(data: &[u8], out: Out) {
do_test(data, out);
}

#[no_mangle]
#[unsafe(no_mangle)]
pub extern "C" fn bech32_parse_run(data: *const u8, datalen: usize) {
do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, test_logger::DevNull {});
}
2 changes: 1 addition & 1 deletion fuzz/src/bolt11_deser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub fn bolt11_deser_test<Out: test_logger::Output>(data: &[u8], out: Out) {
do_test(data, out);
}

#[no_mangle]
#[unsafe(no_mangle)]
pub extern "C" fn bolt11_deser_run(data: *const u8, datalen: usize) {
do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, test_logger::DevNull {});
}
Loading
Loading