Skip to content

fuzz: skip broken splicing paths and handle broadcast channel updates #4561

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

Merged
jkczyz merged 2 commits into from
Apr 14, 2026
+30 −0
Merged

fuzz: skip broken splicing paths and handle broadcast channel updates #4561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3029bf4
fuzz: handle BroadcastChannelUpdate in chanmon
joostjager Apr 14, 2026
9f59b33
fuzz: gate splice opcodes on cfg(splicing)
joostjager Apr 14, 2026
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 fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@ check-cfg = [
"cfg(fuzzing)",
"cfg(secp256k1_fuzz)",
"cfg(hashes_fuzz)",
"cfg(splicing)",
]
29 changes: 29 additions & 0 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,9 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
let (node_c, mut monitor_c, keys_manager_c, logger_c) = make_node!(2, fee_est_c, broadcast_c);

let mut nodes = [node_a, node_b, node_c];
#[allow(unused_variables)]
let loggers = [logger_a, logger_b, logger_c];
#[allow(unused_variables)]
let fee_estimators = [Arc::clone(&fee_est_a), Arc::clone(&fee_est_b), Arc::clone(&fee_est_c)];

// Connect peers first, then create channels
Expand Down Expand Up @@ -1608,6 +1610,7 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
},
MessageSendEvent::SendChannelReady { .. } => continue,
MessageSendEvent::SendAnnouncementSignatures { .. } => continue,
MessageSendEvent::BroadcastChannelUpdate { .. } => continue,
MessageSendEvent::SendChannelUpdate { ref node_id, .. } => {
if Some(*node_id) == expect_drop_id { panic!("peer_disconnected should drop msgs bound for the disconnected peer"); }
*node_id == a_id
Expand Down Expand Up @@ -1894,6 +1897,7 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
MessageSendEvent::SendStfu { .. } => {},
MessageSendEvent::SendChannelReady { .. } => {},
MessageSendEvent::SendAnnouncementSignatures { .. } => {},
MessageSendEvent::BroadcastChannelUpdate { .. } => {},
MessageSendEvent::SendChannelUpdate { .. } => {},
MessageSendEvent::HandleError { ref action, .. } => {
assert_action_timeout_awaiting_response(action);
Expand All @@ -1916,6 +1920,7 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
MessageSendEvent::SendStfu { .. } => {},
MessageSendEvent::SendChannelReady { .. } => {},
MessageSendEvent::SendAnnouncementSignatures { .. } => {},
MessageSendEvent::BroadcastChannelUpdate { .. } => {},
MessageSendEvent::SendChannelUpdate { .. } => {},
MessageSendEvent::HandleError { ref action, .. } => {
assert_action_timeout_awaiting_response(action);
Expand Down Expand Up @@ -2423,52 +2428,76 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
},

0xa0 => {
if !cfg!(splicing) {
test_return!();
}
let cp_node_id = nodes[1].get_our_node_id();
let wallet = WalletSync::new(&wallets[0], Arc::clone(&loggers[0]));
let feerate_sat_per_kw = fee_estimators[0].feerate_sat_per_kw();
splice_in(&nodes[0], &cp_node_id, &chan_a_id, &wallet, feerate_sat_per_kw);
},
0xa1 => {
if !cfg!(splicing) {
test_return!();
}
let cp_node_id = nodes[0].get_our_node_id();
let wallet = WalletSync::new(&wallets[1], Arc::clone(&loggers[1]));
let feerate_sat_per_kw = fee_estimators[1].feerate_sat_per_kw();
splice_in(&nodes[1], &cp_node_id, &chan_a_id, &wallet, feerate_sat_per_kw);
},
0xa2 => {
if !cfg!(splicing) {
test_return!();
}
let cp_node_id = nodes[2].get_our_node_id();
let wallet = WalletSync::new(&wallets[1], Arc::clone(&loggers[1]));
let feerate_sat_per_kw = fee_estimators[1].feerate_sat_per_kw();
splice_in(&nodes[1], &cp_node_id, &chan_b_id, &wallet, feerate_sat_per_kw);
},
0xa3 => {
if !cfg!(splicing) {
test_return!();
}
let cp_node_id = nodes[1].get_our_node_id();
let wallet = WalletSync::new(&wallets[2], Arc::clone(&loggers[2]));
let feerate_sat_per_kw = fee_estimators[2].feerate_sat_per_kw();
splice_in(&nodes[2], &cp_node_id, &chan_b_id, &wallet, feerate_sat_per_kw);
},

0xa4 => {
if !cfg!(splicing) {
test_return!();
}
let cp_node_id = nodes[1].get_our_node_id();
let wallet = &wallets[0];
let logger = Arc::clone(&loggers[0]);
let feerate_sat_per_kw = fee_estimators[0].feerate_sat_per_kw();
splice_out(&nodes[0], &cp_node_id, &chan_a_id, wallet, logger, feerate_sat_per_kw);
},
0xa5 => {
if !cfg!(splicing) {
test_return!();
}
let cp_node_id = nodes[0].get_our_node_id();
let wallet = &wallets[1];
let logger = Arc::clone(&loggers[1]);
let feerate_sat_per_kw = fee_estimators[1].feerate_sat_per_kw();
splice_out(&nodes[1], &cp_node_id, &chan_a_id, wallet, logger, feerate_sat_per_kw);
},
0xa6 => {
if !cfg!(splicing) {
test_return!();
}
let cp_node_id = nodes[2].get_our_node_id();
let wallet = &wallets[1];
let logger = Arc::clone(&loggers[1]);
let feerate_sat_per_kw = fee_estimators[1].feerate_sat_per_kw();
splice_out(&nodes[1], &cp_node_id, &chan_b_id, wallet, logger, feerate_sat_per_kw);
},
0xa7 => {
if !cfg!(splicing) {
test_return!();
}
let cp_node_id = nodes[1].get_our_node_id();
let wallet = &wallets[2];
let logger = Arc::clone(&loggers[2]);
Expand Down
Loading