Skip to content

Restore splice coverage in chanmon_consistency fuzz target #4634

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
TheBlueMatt merged 3 commits into from
May 22, 2026
Merged

Restore splice coverage in chanmon_consistency fuzz target #4634

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
90621cf
Manually exit quiescence in fuzzing upon disconnect
wpaulino May 22, 2026
836bc38
Restore splice fuzzing by default
wpaulino May 22, 2026
f0ce340
Fix fuzz build warnings
wpaulino May 22, 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: 0 additions & 1 deletion fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,5 @@ check-cfg = [
"cfg(fuzzing)",
"cfg(secp256k1_fuzz)",
"cfg(hashes_fuzz)",
"cfg(splicing)",
"cfg(chacha20_poly1305_fuzz)"
]
93 changes: 52 additions & 41 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,10 +720,11 @@ impl SignerProvider for KeyProvider {

// Since this fuzzer is only concerned with live-channel operations, we don't need to worry about
// any signer operations that come after a force close.
const SUPPORTED_SIGNER_OPS: [SignerOp; 3] = [
const SUPPORTED_SIGNER_OPS: [SignerOp; 4] = [
SignerOp::SignCounterpartyCommitment,
SignerOp::GetPerCommitmentPoint,
SignerOp::ReleaseCommitmentSecret,
SignerOp::SignSpliceSharedInput,
];

impl KeyProvider {
Expand Down Expand Up @@ -769,19 +770,19 @@ type ChanMan<'a> = ChannelManager<
>;

#[inline]
fn assert_action_timeout_awaiting_response(action: &msgs::ErrorAction) {
fn assert_disconnect_action(action: &msgs::ErrorAction) -> (&msgs::WarningMessage, bool) {
// Since sending/receiving messages may be delayed, `timer_tick_occurred` may cause a node to
// disconnect their counterparty if they're expecting a timely response.
assert!(
matches!(
action,
msgs::ErrorAction::DisconnectPeerWithWarning { msg }
if msg.data.contains("Disconnecting due to timeout awaiting response")
|| msg.data.contains("already sent splice_locked, cannot RBF")
),
"Expected timeout disconnect, got: {:?}",
action,
);
if let msgs::ErrorAction::DisconnectPeerWithWarning { ref msg } = action {
let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF");
if !msg.data.contains("Disconnecting due to timeout awaiting response") && !is_quiescent_msg
{
panic!("Unexpected disconnect case: {}", msg.data);
}
(msg, is_quiescent_msg)
} else {
panic!("Expected disconnect, got: {:?}", action);
}
}

#[derive(Clone, Copy, PartialEq)]
Expand Down Expand Up @@ -1286,7 +1287,7 @@ impl EventQueues {
*node_id == a_id
},
MessageSendEvent::HandleError { ref action, ref node_id } => {
assert_action_timeout_awaiting_response(action);
assert_disconnect_action(action);
if Some(*node_id) == expect_drop_id {
panic!(
"peer_disconnected should drop msgs bound for the disconnected peer"
Expand Down Expand Up @@ -1335,7 +1336,7 @@ impl EventQueues {
MessageSendEvent::BroadcastChannelUpdate { .. } => {},
MessageSendEvent::SendChannelUpdate { .. } => {},
MessageSendEvent::HandleError { ref action, .. } => {
assert_action_timeout_awaiting_response(action);
assert_disconnect_action(action);
},
_ => panic!("Unhandled message event"),
}
Expand All @@ -1354,7 +1355,7 @@ impl EventQueues {
MessageSendEvent::BroadcastChannelUpdate { .. } => {},
MessageSendEvent::SendChannelUpdate { .. } => {},
MessageSendEvent::HandleError { ref action, .. } => {
assert_action_timeout_awaiting_response(action);
assert_disconnect_action(action);
},
_ => panic!("Unhandled message event"),
}
Expand Down Expand Up @@ -2645,8 +2646,16 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
nodes[dest_idx].handle_splice_locked(source_node_id, msg);
None
},
MessageSendEvent::HandleError { ref action, .. } => {
assert_action_timeout_awaiting_response(action);
MessageSendEvent::HandleError { ref action, ref node_id, .. } => {
let (msg, is_quiescent) = assert_disconnect_action(action);
let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "warning");
if is_quiescent {
nodes[node_idx].node.exit_quiescence(node_id, &msg.channel_id).unwrap();
Copy link
Copy Markdown
Collaborator

@TheBlueMatt TheBlueMatt May 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we just actually disconnect in this case and drop the manual exit_quiescence method?

Copy link
Copy Markdown
Contributor Author

@wpaulino wpaulino May 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually use exit_quiescence in production code now. I chose to use it here rather than disconnecting because we're in the middle of the fuzz settle loop and wanted to avoid taking on more complexity.

nodes[dest_idx]
.node
.exit_quiescence(&source_node_id, &msg.channel_id)
.unwrap();
}
None
},
MessageSendEvent::SendChannelReady { .. }
Expand Down Expand Up @@ -3117,59 +3126,35 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
0x89 => harness.nodes[2].reset_fee_estimate(),

0xa0 => {
if !cfg!(splicing) {
break 'fuzz_loop;
}
let cp_node_id = harness.nodes[1].get_our_node_id();
harness.nodes[0].splice_in(&cp_node_id, &harness.chan_a_id());
},
0xa1 => {
if !cfg!(splicing) {
break 'fuzz_loop;
}
let cp_node_id = harness.nodes[0].get_our_node_id();
harness.nodes[1].splice_in(&cp_node_id, &harness.chan_a_id());
},
0xa2 => {
if !cfg!(splicing) {
break 'fuzz_loop;
}
let cp_node_id = harness.nodes[2].get_our_node_id();
harness.nodes[1].splice_in(&cp_node_id, &harness.chan_b_id());
},
0xa3 => {
if !cfg!(splicing) {
break 'fuzz_loop;
}
let cp_node_id = harness.nodes[1].get_our_node_id();
harness.nodes[2].splice_in(&cp_node_id, &harness.chan_b_id());
},

0xa4 => {
if !cfg!(splicing) {
break 'fuzz_loop;
}
let cp_node_id = harness.nodes[1].get_our_node_id();
harness.nodes[0].splice_out(&cp_node_id, &harness.chan_a_id());
},
0xa5 => {
if !cfg!(splicing) {
break 'fuzz_loop;
}
let cp_node_id = harness.nodes[0].get_our_node_id();
harness.nodes[1].splice_out(&cp_node_id, &harness.chan_a_id());
},
0xa6 => {
if !cfg!(splicing) {
break 'fuzz_loop;
}
let cp_node_id = harness.nodes[2].get_our_node_id();
harness.nodes[1].splice_out(&cp_node_id, &harness.chan_b_id());
},
0xa7 => {
if !cfg!(splicing) {
break 'fuzz_loop;
}
let cp_node_id = harness.nodes[1].get_our_node_id();
harness.nodes[2].splice_out(&cp_node_id, &harness.chan_b_id());
},
Expand Down Expand Up @@ -3298,6 +3283,32 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
.enable_op_for_all_signers(SignerOp::ReleaseCommitmentSecret);
harness.nodes[2].signer_unblocked(None);
},
0xcf => {
harness.nodes[0]
.keys_manager
.enable_op_for_all_signers(SignerOp::SignSpliceSharedInput);
harness.nodes[0].signer_unblocked(None);
},
0xd0 => {
harness.nodes[1]
.keys_manager
.enable_op_for_all_signers(SignerOp::SignSpliceSharedInput);
let filter = Some((harness.nodes[0].get_our_node_id(), harness.chan_a_id()));
harness.nodes[1].signer_unblocked(filter);
},
0xd1 => {
harness.nodes[1]
.keys_manager
.enable_op_for_all_signers(SignerOp::SignSpliceSharedInput);
let filter = Some((harness.nodes[2].get_our_node_id(), harness.chan_b_id()));
harness.nodes[1].signer_unblocked(filter);
},
0xd2 => {
harness.nodes[2]
.keys_manager
.enable_op_for_all_signers(SignerOp::SignSpliceSharedInput);
harness.nodes[2].signer_unblocked(None);
},

0xf0 => harness.ab_link.complete_monitor_updates_for_node(
0,
Expand Down
1 change: 0 additions & 1 deletion fuzz/src/lsps_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use bitcoin::hashes::{sha256, Hash};
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
use bitcoin::Network;

use lightning::chain::Filter;
use lightning::chain::{chainmonitor, BlockLocator};
use lightning::ln::channelmanager::{ChainParameters, ChannelManager};
use lightning::ln::peer_handler::CustomMessageHandler;
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/outbound_payment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use crate::util::errors::APIError;
use crate::util::logger::{Logger, WithContext};
use crate::util::ser::ReadableArgs;
#[cfg(feature = "std")]
#[cfg(all(feature = "std", not(fuzzing)))]
use crate::util::time::Instant;

use core::fmt::{self, Display, Formatter};
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/peer_channel_encryptor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ impl PeerChannelEncryptor {
/// Encrypts the given message, returning the encrypted version.
/// panics if the length of `message`, once encoded, is greater than 65535 or if the Noise
/// handshake has not finished.
pub fn encrypt_message<T: wire::Type>(&mut self, message: wire::Message<T>) -> Vec<u8> {
pub(crate) fn encrypt_message<T: wire::Type>(&mut self, message: wire::Message<T>) -> Vec<u8> {
// Allocate a buffer with 2KB, fitting most common messages. Reserve the first 16+2 bytes
// for the 2-byte message type prefix and its MAC.
let mut res = VecWriter(Vec::with_capacity(MSG_BUF_ALLOC_SIZE));
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/routing/gossip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ use core::{cmp, fmt};

pub use lightning_types::routing::RoutingFees;

#[cfg(feature = "std")]
#[cfg(all(feature = "std", not(fuzzing)))]
use std::time::{SystemTime, UNIX_EPOCH};

/// We remove stale channel directional info two weeks after the last update, per BOLT 7's
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/util/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//! A simple module which either re-exports [`std::time::Instant`] or a mocked version of it for
//! tests.
#[cfg(not(test))]
#[cfg(all(not(test), not(fuzzing)))]
pub use std::time::Instant;
#[cfg(test)]
pub use test::Instant;
Expand Down
Loading