Skip to content

[0.2] Backport #4158 and bump versions to -beta1 #4159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 0.2
Choose a base branch
from
Open

[0.2] Backport #4158 and bump versions to -beta1 #4159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac8aa68
Move V2 channel opens behind a cfg flag again
TheBlueMatt Oct 10, 2025
d3b3d1e
Drop now-removed `doc_auto_cfg` feature
TheBlueMatt Oct 10, 2025
010f054
Bump crates to -beta1
TheBlueMatt Oct 10, 2025
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
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ check-cfg = [
"cfg(require_route_graph_test)",
"cfg(simple_close)",
"cfg(peer_storage)",
"cfg(dual_funding)",
]
2 changes: 2 additions & 0 deletions ci/ci-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,5 @@ RUSTFLAGS="--cfg=simple_close" cargo test --verbose --color always -p lightning
RUSTFLAGS="--cfg=lsps1_service" cargo test --verbose --color always -p lightning-liquidity
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=peer_storage" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=dual_funding" cargo test --verbose --color always -p lightning
16 changes: 8 additions & 8 deletions lightning-background-processor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-background-processor"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["Valentine Wallace <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning"
Expand All @@ -22,17 +22,17 @@ std = ["lightning/std", "lightning-liquidity/std", "bitcoin-io/std", "bitcoin_ha
bitcoin = { version = "0.32.2", default-features = false }
bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
lightning = { version = "0.2.0", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false }
lightning = { version = "0.2.0-beta1", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0-beta1", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0-beta1", path = "../lightning-liquidity", default-features = false }
possiblyrandom = { version = "0.2", path = "../possiblyrandom", default-features = false }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
lightning = { version = "0.2.0", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister" }
lightning = { version = "0.2.0-beta1", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0-beta1", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0-beta1", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0-beta1", path = "../lightning-persister" }

[lints]
workspace = true
6 changes: 3 additions & 3 deletions lightning-block-sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-block-sync"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["Jeffrey Czyz", "Matt Corallo"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning"
Expand All @@ -19,13 +19,13 @@ rpc-client = [ "serde_json", "chunked_transfer" ]

[dependencies]
bitcoin = "0.32.2"
lightning = { version = "0.2.0", path = "../lightning" }
lightning = { version = "0.2.0-beta1", path = "../lightning" }
tokio = { version = "1.35", features = [ "io-util", "net", "time", "rt" ], optional = true }
serde_json = { version = "1.0", optional = true }
chunked_transfer = { version = "1.4", optional = true }

[dev-dependencies]
lightning = { version = "0.2.0", path = "../lightning", features = ["_test_utils"] }
lightning = { version = "0.2.0-beta1", path = "../lightning", features = ["_test_utils"] }
tokio = { version = "1.35", features = [ "macros", "rt" ] }

[lints]
Expand Down
4 changes: 2 additions & 2 deletions lightning-custom-message/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-custom-message"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["Jeffrey Czyz"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning"
Expand All @@ -15,7 +15,7 @@ rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
bitcoin = "0.32.2"
lightning = { version = "0.2.0", path = "../lightning" }
lightning = { version = "0.2.0-beta1", path = "../lightning" }

[lints]
workspace = true
8 changes: 4 additions & 4 deletions lightning-dns-resolver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[package]
name = "lightning-dns-resolver"
version = "0.3.0+git"
version = "0.3.0-beta1"
authors = ["Matt Corallo"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning/"
description = "A crate which implements DNSSEC resolution for lightning clients over bLIP 32 using `tokio` and the `dnssec-prover` crate."
edition = "2021"

[dependencies]
lightning = { version = "0.2.0", path = "../lightning", default-features = false }
lightning-types = { version = "0.3.0", path = "../lightning-types", default-features = false }
lightning = { version = "0.2.0-beta1", path = "../lightning", default-features = false }
lightning-types = { version = "0.3.0-beta1", path = "../lightning-types", default-features = false }
dnssec-prover = { version = "0.6", default-features = false, features = [ "std", "tokio" ] }
tokio = { version = "1.0", default-features = false, features = ["rt"] }

[dev-dependencies]
bitcoin = { version = "0.32" }
tokio = { version = "1.0", default-features = false, features = ["macros", "time"] }
lightning = { version = "0.2.0", path = "../lightning", features = ["dnssec", "_test_utils"] }
lightning = { version = "0.2.0-beta1", path = "../lightning", features = ["dnssec", "_test_utils"] }
4 changes: 2 additions & 2 deletions lightning-invoice/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "lightning-invoice"
description = "Data structures to parse and serialize BOLT11 lightning invoices"
version = "0.34.0+git"
version = "0.34.0-beta1"
authors = ["Sebastian Geisler <[email protected]>"]
documentation = "https://docs.rs/lightning-invoice/"
license = "MIT OR Apache-2.0"
Expand All @@ -19,7 +19,7 @@ std = []

[dependencies]
bech32 = { version = "0.11.0", default-features = false }
lightning-types = { version = "0.3.0", path = "../lightning-types", default-features = false }
lightning-types = { version = "0.3.0-beta1", path = "../lightning-types", default-features = false }
serde = { version = "1.0", optional = true, default-features = false, features = ["alloc"] }
bitcoin = { version = "0.32.2", default-features = false, features = ["secp-recovery"] }

Expand Down
16 changes: 8 additions & 8 deletions lightning-liquidity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-liquidity"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["John Cantrell <[email protected]>", "Elias Rohrer <[email protected]>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand All @@ -21,10 +21,10 @@ backtrace = ["dep:backtrace"]
_test_utils = []

[dependencies]
lightning = { version = "0.2.0", path = "../lightning", default-features = false }
lightning-types = { version = "0.3.0", path = "../lightning-types", default-features = false }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice", default-features = false, features = ["serde"] }
lightning-macros = { version = "0.2", path = "../lightning-macros" }
lightning = { version = "0.2.0-beta1", path = "../lightning", default-features = false }
lightning-types = { version = "0.3.0-beta1", path = "../lightning-types", default-features = false }
lightning-invoice = { version = "0.34.0-beta1", path = "../lightning-invoice", default-features = false, features = ["serde"] }
lightning-macros = { version = "0.2.0-beta1", path = "../lightning-macros" }

bitcoin = { version = "0.32.2", default-features = false, features = ["serde"] }

Expand All @@ -34,9 +34,9 @@ serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
backtrace = { version = "0.3", optional = true }

[dev-dependencies]
lightning = { version = "0.2.0", path = "../lightning", default-features = false, features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice", default-features = false, features = ["serde", "std"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister", default-features = false }
lightning = { version = "0.2.0-beta1", path = "../lightning", default-features = false, features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0-beta1", path = "../lightning-invoice", default-features = false, features = ["serde", "std"] }
lightning-persister = { version = "0.2.0-beta1", path = "../lightning-persister", default-features = false }

proptest = "1.0.0"
tokio = { version = "1.35", default-features = false, features = [ "rt-multi-thread", "time", "sync", "macros" ] }
Expand Down
2 changes: 1 addition & 1 deletion lightning-macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-macros"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["Elias Rohrer"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning/"
Expand Down
6 changes: 3 additions & 3 deletions lightning-net-tokio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-net-tokio"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["Matt Corallo"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning/"
Expand All @@ -16,12 +16,12 @@ rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
bitcoin = "0.32.2"
lightning = { version = "0.2.0", path = "../lightning" }
lightning = { version = "0.2.0-beta1", path = "../lightning" }
tokio = { version = "1.35", features = [ "rt", "sync", "net", "time" ] }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
lightning = { version = "0.2.0", path = "../lightning", features = ["_test_utils"] }
lightning = { version = "0.2.0-beta1", path = "../lightning", features = ["_test_utils"] }

[lints]
workspace = true
6 changes: 3 additions & 3 deletions lightning-persister/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-persister"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["Valentine Wallace", "Matt Corallo"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning"
Expand All @@ -18,7 +18,7 @@ tokio = ["dep:tokio"]

[dependencies]
bitcoin = "0.32.2"
lightning = { version = "0.2.0", path = "../lightning" }
lightning = { version = "0.2.0-beta1", path = "../lightning" }
tokio = { version = "1.35", optional = true, default-features = false, features = ["rt-multi-thread"] }

[target.'cfg(windows)'.dependencies]
Expand All @@ -28,7 +28,7 @@ windows-sys = { version = "0.48.0", default-features = false, features = ["Win32
criterion = { version = "0.4", optional = true, default-features = false }

[dev-dependencies]
lightning = { version = "0.2.0", path = "../lightning", features = ["_test_utils"] }
lightning = { version = "0.2.0-beta1", path = "../lightning", features = ["_test_utils"] }
bitcoin = { version = "0.32.2", default-features = false }
tokio = { version = "1.35", default-features = false, features = ["macros"] }

Expand Down
6 changes: 3 additions & 3 deletions lightning-rapid-gossip-sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-rapid-gossip-sync"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["Arik Sosman <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning"
Expand All @@ -14,7 +14,7 @@ default = ["std"]
std = ["bitcoin-io/std", "bitcoin_hashes/std"]

[dependencies]
lightning = { version = "0.2.0", path = "../lightning", default-features = false }
lightning = { version = "0.2.0-beta1", path = "../lightning", default-features = false }
bitcoin = { version = "0.32.2", default-features = false }
bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
Expand All @@ -23,7 +23,7 @@ bitcoin-io = { version = "0.1.2", default-features = false }
criterion = { version = "0.4", optional = true, default-features = false }

[dev-dependencies]
lightning = { version = "0.2.0", path = "../lightning", features = ["_test_utils"] }
lightning = { version = "0.2.0-beta1", path = "../lightning", features = ["_test_utils"] }

[lints]
workspace = true
8 changes: 4 additions & 4 deletions lightning-transaction-sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-transaction-sync"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["Elias Rohrer"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning"
Expand Down Expand Up @@ -31,15 +31,15 @@ electrum-rustls = ["electrum"]
electrum-rustls-ring = ["_electrum", "electrum-client/use-rustls-ring"]

[dependencies]
lightning = { version = "0.2.0", path = "../lightning", default-features = false, features = ["std"] }
lightning-macros = { version = "0.2", path = "../lightning-macros", default-features = false }
lightning = { version = "0.2.0-beta1", path = "../lightning", default-features = false, features = ["std"] }
lightning-macros = { version = "0.2.0-beta1", path = "../lightning-macros", default-features = false }
bitcoin = { version = "0.32.2", default-features = false }
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.12", default-features = false, optional = true }
electrum-client = { version = "0.24.0", optional = true, default-features = false, features = ["proxy"] }

[dev-dependencies]
lightning = { version = "0.2.0", path = "../lightning", default-features = false, features = ["std", "_test_utils"] }
lightning = { version = "0.2.0-beta1", path = "../lightning", default-features = false, features = ["std", "_test_utils"] }
tokio = { version = "1.35.0", features = ["macros"] }

[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion lightning-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning-types"
version = "0.3.0+git"
version = "0.3.0-beta1"
authors = ["Matt Corallo"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning/"
Expand Down
12 changes: 6 additions & 6 deletions lightning/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lightning"
version = "0.2.0+git"
version = "0.2.0-beta1"
authors = ["Matt Corallo"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/lightningdevkit/rust-lightning/"
Expand Down Expand Up @@ -32,9 +32,9 @@ grind_signatures = []
default = ["std", "grind_signatures"]

[dependencies]
lightning-types = { version = "0.3.0", path = "../lightning-types", default-features = false }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice", default-features = false }
lightning-macros = { version = "0.2", path = "../lightning-macros" }
lightning-types = { version = "0.3.0-beta1", path = "../lightning-types", default-features = false }
lightning-invoice = { version = "0.34.0-beta1", path = "../lightning-invoice", default-features = false }
lightning-macros = { version = "0.2.0-beta1", path = "../lightning-macros" }

bech32 = { version = "0.11.0", default-features = false }
bitcoin = { version = "0.32.2", default-features = false, features = ["secp-recovery"] }
Expand All @@ -51,8 +51,8 @@ inventory = { version = "0.3", optional = true }

[dev-dependencies]
regex = "1.5.6"
lightning-types = { version = "0.3.0", path = "../lightning-types", features = ["_test_utils"] }
lightning-macros = { path = "../lightning-macros" }
lightning-types = { version = "0.3.0-beta1", path = "../lightning-types", features = ["_test_utils"] }
lightning-macros = { version = "0.2.0-beta1", path = "../lightning-macros" }
parking_lot = { version = "0.12", default-features = false }

[dev-dependencies.bitcoin]
Expand Down
1 change: 0 additions & 1 deletion lightning/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
// that don't do anything but annoy us and cant actually ever be resolved.
#![allow(bare_trait_objects)]
#![allow(ellipsis_inclusive_range_patterns)]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]

#[cfg(all(fuzzing, test))]
Expand Down
1 change: 1 addition & 0 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15603,6 +15603,7 @@ pub fn provided_init_features(config: &UserConfig) -> InitFeatures {
if config.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx {
features.set_anchors_zero_fee_htlc_tx_optional();
}
#[cfg(dual_funding)]
if config.enable_dual_funded_channels {
features.set_dual_fund_optional();
}
Expand Down
39 changes: 27 additions & 12 deletions lightning/src/util/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,7 @@ pub struct UserConfig {
/// [`ChannelManager::send_payment_for_bolt12_invoice`]: crate::ln::channelmanager::ChannelManager::send_payment_for_bolt12_invoice
/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
pub manually_handle_bolt12_invoices: bool,
#[cfg(dual_funding)]
/// If this is set to `true`, dual-funded channels will be enabled.
///
/// Default value: `false`
Expand Down Expand Up @@ -981,6 +982,7 @@ impl Default for UserConfig {
manually_accept_inbound_channels: false,
accept_intercept_htlcs: false,
manually_handle_bolt12_invoices: false,
#[cfg(dual_funding)]
enable_dual_funded_channels: false,
enable_htlc_hold: false,
hold_outbound_htlcs_at_next_hop: false,
Expand All @@ -995,19 +997,32 @@ impl Default for UserConfig {
#[cfg(fuzzing)]
impl Readable for UserConfig {
fn read<R: crate::io::Read>(reader: &mut R) -> Result<Self, crate::ln::msgs::DecodeError> {
let channel_handshake_config = Readable::read(reader)?;
let channel_handshake_limits = Readable::read(reader)?;
let channel_config = Readable::read(reader)?;
let accept_forwards_to_priv_channels = Readable::read(reader)?;
let accept_inbound_channels = Readable::read(reader)?;
let manually_accept_inbound_channels = Readable::read(reader)?;
let accept_intercept_htlcs = Readable::read(reader)?;
let manually_handle_bolt12_invoices = Readable::read(reader)?;
let _enable_dual_funded_channels: bool = Readable::read(reader)?;
let hold_outbound_htlcs_at_next_hop = Readable::read(reader)?;
let enable_htlc_hold = Readable::read(reader)?;
let reject_inbound_splices = Readable::read(reader)?;
Ok(Self {
channel_handshake_config: Readable::read(reader)?,
channel_handshake_limits: Readable::read(reader)?,
channel_config: Readable::read(reader)?,
accept_forwards_to_priv_channels: Readable::read(reader)?,
accept_inbound_channels: Readable::read(reader)?,
manually_accept_inbound_channels: Readable::read(reader)?,
accept_intercept_htlcs: Readable::read(reader)?,
manually_handle_bolt12_invoices: Readable::read(reader)?,
enable_dual_funded_channels: Readable::read(reader)?,
hold_outbound_htlcs_at_next_hop: Readable::read(reader)?,
enable_htlc_hold: Readable::read(reader)?,
reject_inbound_splices: Readable::read(reader)?,
channel_handshake_config,
channel_handshake_limits,
channel_config,
accept_forwards_to_priv_channels,
accept_inbound_channels,
manually_accept_inbound_channels,
accept_intercept_htlcs,
manually_handle_bolt12_invoices,
#[cfg(dual_funding)]
enable_dual_funded_channels: _enable_dual_funded_channels,
hold_outbound_htlcs_at_next_hop,
enable_htlc_hold,
reject_inbound_splices,
})
}
}
Expand Down