Skip to content

Add splice cleanup invariants#4699

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

Closed
joostjager wants to merge 13 commits into from
Closed

Add splice cleanup invariants #4699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3d855ac
Store splice contributions with their negotiated candidates
jkczyz Jun 12, 2026
fa5e506
Expose pending splice details in ChannelDetails
jkczyz Jun 12, 2026
9283e00
Test cross-version serialization of pending splices
jkczyz Jun 16, 2026
8ac6fae
Reject splicing a channel with a splice inherited from a prior LDK ve…
jkczyz Jun 17, 2026
0c00583
Add pending changelog entry for PR 4687
jkczyz Jun 18, 2026
2c5f92c
Only emit Event::SpliceNegotiated when contributing
wpaulino Jun 17, 2026
72563af
Always emit SpliceNegotiationFailed when contributing
wpaulino Jun 16, 2026
175b58d
Allow invalid contribution error upon quiescence
wpaulino Jun 17, 2026
1313db2
Prefer tx_abort over disconnection for splice negotiation errors
wpaulino Jun 16, 2026
b04dab4
Prefer tx_abort over disconnection for inability to RBF
wpaulino Jun 17, 2026
0df779c
Check channel is live while handling counterparty tx_init_rbf
wpaulino Jun 17, 2026
efff2f8
Add splice confirmation fuzz checks
joostjager Jun 18, 2026
96cc8f2
Add stale splice negotiation fuzz invariant
joostjager Jun 19, 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
59 changes: 56 additions & 3 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,10 @@ impl ChainState {
self.utxos.contains(outpoint)
}

fn is_confirmed_txid(&self, txid: &Txid) -> bool {
self.confirmed_txids.contains(txid)
}

fn confirmed_output(&self, outpoint: &BitcoinOutPoint) -> Option<&TxOut> {
if !self.confirmed_txids.contains(&outpoint.txid) {
return None;
Expand DownExpand Up@@ -936,7 +940,8 @@ fn assert_disconnect_action(action: &msgs::ErrorAction) -> (&msgs::WarningMessag
// 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.
if let msgs::ErrorAction::DisconnectPeerWithWarning { ref msg } = action {
let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF");
let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF")
|| msg.data.contains("contribution no longer valid at quiescence");
if !msg.data.contains("Disconnecting due to timeout awaiting response") && !is_quiescent_msg
{
panic!("Unexpected disconnect case: {}", msg.data);
Expand DownExpand Up@@ -2220,6 +2225,33 @@ fn build_node_config(chan_type: ChanType) -> UserConfig {
config
}

fn assert_no_stale_splice_negotiation(
node: &HarnessNode<'_>, channel_id: &ChannelId, counterparty_node_id: &PublicKey, context: &str,
) {
let Some(channel) = node.list_channels().into_iter().find(|channel| {
channel.channel_id == *channel_id && channel.counterparty.node_id == *counterparty_node_id
}) else {
return;
};
let Some(details) = channel.splice_details else { return };

assert!(
details.negotiation.is_none(),
"{} left active splice negotiation behind: {:?}",
context,
details
);
assert!(
details.queued_contribution.is_some()
|| !details.candidates.is_empty()
|| details.confirmed_candidate.is_some()
|| details.received_splice_locked_txid.is_some(),
"{} left empty splice details behind: {:?}",
context,
details
);
}

fn assert_test_invariants(nodes: &[HarnessNode<'_>; 3]) {
assert_eq!(nodes[0].list_channels().len(), 3);
assert_eq!(nodes[1].list_channels().len(), 6);
Expand DownExpand Up@@ -2851,7 +2883,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
fn process_msg_event<Out: Output + MaybeSend + MaybeSync>(
node_idx: usize, source_node_id: PublicKey, event: MessageSendEvent,
corrupt_forward: bool, limit_events: ProcessMessages, nodes: &[HarnessNode<'_>; 3],
out: &Out,
chain_state: &ChainState, out: &Out,
) -> Option<MessageSendEvent> {
match event {
MessageSendEvent::UpdateHTLCs { node_id, channel_id, updates } => {
Expand DownExpand Up@@ -2914,6 +2946,12 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
MessageSendEvent::SendTxAbort { ref node_id, ref msg } => {
let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "tx_abort");
nodes[dest_idx].handle_tx_abort(source_node_id, msg);
assert_no_stale_splice_negotiation(
&nodes[dest_idx],
&msg.channel_id,
&source_node_id,
"tx_abort receive",
);
None
},
MessageSendEvent::SendTxInitRbf { ref node_id, ref msg } => {
Expand DownExpand Up@@ -2943,6 +2981,11 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
},
MessageSendEvent::SendSpliceLocked { ref node_id, ref msg } => {
let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "splice_locked");
assert!(
chain_state.is_confirmed_txid(&msg.splice_txid),
"splice_locked referenced unconfirmed txid {}",
msg.splice_txid
);
nodes[dest_idx].handle_splice_locked(source_node_id, msg);
None
},
Expand DownExpand Up@@ -2974,6 +3017,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
}

let nodes = &self.nodes;
let chain_state = &self.chain_state;
let out = &self.out;
let queues = &mut self.queues;
let mut events = queues.take_for_node(node_idx);
Expand All@@ -2994,6 +3038,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
corrupt_forward,
limit_events,
nodes,
chain_state,
out,
);
if limit_events != ProcessMessages::AllMessages {
Expand DownExpand Up@@ -3050,7 +3095,15 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
events::Event::PaymentPathSuccessful { .. } => {},
events::Event::PaymentPathFailed { .. } => {},
events::Event::PaymentForwarded { .. } if node_idx == 1 => {},
events::Event::ChannelReady { .. } => {},
events::Event::ChannelReady { funding_txo, .. } => {
if let Some(funding_txo) = funding_txo {
assert!(
chain_state.is_confirmed_txid(&funding_txo.txid),
"ChannelReady referenced unconfirmed funding txid {}",
funding_txo.txid
);
}
},
events::Event::HTLCHandlingFailed { .. } => {},
events::Event::FundingTransactionReadyForSigning {
channel_id,
Expand Down
1 change: 1 addition & 0 deletions fuzz/src/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
pending_inbound_htlcs: Vec::new(),
pending_outbound_htlcs: Vec::new(),
current_dust_exposure_msat: None,
splice_details: None,
});
}
Some(&$first_hops_vec[..])
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add splice cleanup invariants by joostjager · Pull Request #4699 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add splice cleanup invariants#4699

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

 Closed

joostjager
wants to merge
13
commits into

from

 Closed


Add splice cleanup invariants
#4699
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3d855ac

Store splice contributions with their negotiated candidates


jkczyz Jun 12, 2026
fa5e506

Expose pending splice details in ChannelDetails


jkczyz Jun 12, 2026
9283e00

Test cross-version serialization of pending splices


jkczyz Jun 16, 2026
8ac6fae

Reject splicing a channel with a splice inherited from a prior LDK ve…


jkczyz Jun 17, 2026
0c00583

Add pending changelog entry for PR 4687


jkczyz Jun 18, 2026
2c5f92c

Only emit Event::SpliceNegotiated when contributing


wpaulino Jun 17, 2026
72563af

Always emit SpliceNegotiationFailed when contributing


wpaulino Jun 16, 2026
175b58d

Allow invalid contribution error upon quiescence


wpaulino Jun 17, 2026
1313db2

Prefer tx_abort over disconnection for splice negotiation errors


wpaulino Jun 16, 2026
b04dab4

Prefer tx_abort over disconnection for inability to RBF


wpaulino Jun 17, 2026
0df779c

Check channel is live while handling counterparty tx_init_rbf


wpaulino Jun 17, 2026
efff2f8

Add splice confirmation fuzz checks


joostjager Jun 18, 2026
96cc8f2

Add stale splice negotiation fuzz invariant


joostjager Jun 19, 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


59 changes: 56 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,10 @@ impl ChainState {
 self.utxos.contains(outpoint)
	}

	fn is_confirmed_txid(&self, txid: &Txid) -> bool {
 self.confirmed_txids.contains(txid)
	}

	fn confirmed_output(&self, outpoint: &BitcoinOutPoint) -> Option<&TxOut> {
 if !self.confirmed_txids.contains(&outpoint.txid) {
 return None;
Expand DownExpand Up@@ -936,7 +940,8 @@ fn assert_disconnect_action(action: &msgs::ErrorAction) -> (&msgs::WarningMessag
	// 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.
	if let msgs::ErrorAction::DisconnectPeerWithWarning { ref msg } = action {
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF");
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF")
 || msg.data.contains("contribution no longer valid at quiescence");
 if !msg.data.contains("Disconnecting due to timeout awaiting response") && !is_quiescent_msg
 {
 panic!("Unexpected disconnect case: {}", msg.data);
Expand DownExpand Up@@ -2220,6 +2225,33 @@ fn build_node_config(chan_type: ChanType) -> UserConfig {
	config
}

fn assert_no_stale_splice_negotiation(
	node: &HarnessNode<'_>, channel_id: &ChannelId, counterparty_node_id: &PublicKey, context: &str,
) {
	let Some(channel) = node.list_channels().into_iter().find(|channel| {
 channel.channel_id == *channel_id && channel.counterparty.node_id == *counterparty_node_id
	}) else {
 return;
	};
	let Some(details) = channel.splice_details else { return };

	assert!(
 details.negotiation.is_none(),
 "{} left active splice negotiation behind: {:?}",
 context,
 details
	);
	assert!(
 details.queued_contribution.is_some()
 || !details.candidates.is_empty()
 || details.confirmed_candidate.is_some()
 || details.received_splice_locked_txid.is_some(),
 "{} left empty splice details behind: {:?}",
 context,
 details
	);
}

fn assert_test_invariants(nodes: &[HarnessNode<'_>; 3]) {
	assert_eq!(nodes[0].list_channels().len(), 3);
	assert_eq!(nodes[1].list_channels().len(), 6);
Expand DownExpand Up@@ -2851,7 +2883,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 fn process_msg_event<Out: Output + MaybeSend + MaybeSync>(
 node_idx: usize, source_node_id: PublicKey, event: MessageSendEvent,
 corrupt_forward: bool, limit_events: ProcessMessages, nodes: &[HarnessNode<'_>; 3],
 out: &Out,
chain_state: &ChainState, out: &Out,
 ) -> Option<MessageSendEvent> {
 match event {
 MessageSendEvent::UpdateHTLCs { node_id, channel_id, updates } => {
Expand DownExpand Up@@ -2914,6 +2946,12 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 MessageSendEvent::SendTxAbort { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "tx_abort");
 nodes[dest_idx].handle_tx_abort(source_node_id, msg);
 assert_no_stale_splice_negotiation(
 &nodes[dest_idx],
 &msg.channel_id,
 &source_node_id,
 "tx_abort receive",
 );
 None
 },
 MessageSendEvent::SendTxInitRbf { ref node_id, ref msg } => {
Expand DownExpand Up@@ -2943,6 +2981,11 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 MessageSendEvent::SendSpliceLocked { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "splice_locked");
 assert!(
 chain_state.is_confirmed_txid(&msg.splice_txid),
 "splice_locked referenced unconfirmed txid {}",
 msg.splice_txid
 );
 nodes[dest_idx].handle_splice_locked(source_node_id, msg);
 None
 },
Expand DownExpand Up@@ -2974,6 +3017,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }

 let nodes = &self.nodes;
 let chain_state = &self.chain_state;
 let out = &self.out;
 let queues = &mut self.queues;
 let mut events = queues.take_for_node(node_idx);
Expand All@@ -2994,6 +3038,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 corrupt_forward,
 limit_events,
 nodes,
 chain_state,
 out,
 );
 if limit_events != ProcessMessages::AllMessages {
Expand DownExpand Up@@ -3050,7 +3095,15 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 events::Event::PaymentPathSuccessful { .. } => {},
 events::Event::PaymentPathFailed { .. } => {},
 events::Event::PaymentForwarded { .. } if node_idx == 1 => {},
 events::Event::ChannelReady { .. } => {},
 events::Event::ChannelReady { funding_txo, .. } => {
 if let Some(funding_txo) = funding_txo {
 assert!(
 chain_state.is_confirmed_txid(&funding_txo.txid),
 "ChannelReady referenced unconfirmed funding txid {}",
 funding_txo.txid
 );
 }
 },
 events::Event::HTLCHandlingFailed { .. } => {},
 events::Event::FundingTransactionReadyForSigning {
 channel_id,
Expand Down

1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 pending_inbound_htlcs: Vec::new(),
 pending_outbound_htlcs: Vec::new(),
 current_dust_exposure_msat: None,
 splice_details: None,
 });
 }
 Some(&$first_hops_vec[..])
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add splice cleanup invariants by joostjager · Pull Request #4699 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add splice cleanup invariants#4699

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

 Closed

joostjager
wants to merge
13
commits into

from

 Closed


Add splice cleanup invariants
#4699
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3d855ac

Store splice contributions with their negotiated candidates


jkczyz Jun 12, 2026
fa5e506

Expose pending splice details in ChannelDetails


jkczyz Jun 12, 2026
9283e00

Test cross-version serialization of pending splices


jkczyz Jun 16, 2026
8ac6fae

Reject splicing a channel with a splice inherited from a prior LDK ve…


jkczyz Jun 17, 2026
0c00583

Add pending changelog entry for PR 4687


jkczyz Jun 18, 2026
2c5f92c

Only emit Event::SpliceNegotiated when contributing


wpaulino Jun 17, 2026
72563af

Always emit SpliceNegotiationFailed when contributing


wpaulino Jun 16, 2026
175b58d

Allow invalid contribution error upon quiescence


wpaulino Jun 17, 2026
1313db2

Prefer tx_abort over disconnection for splice negotiation errors


wpaulino Jun 16, 2026
b04dab4

Prefer tx_abort over disconnection for inability to RBF


wpaulino Jun 17, 2026
0df779c

Check channel is live while handling counterparty tx_init_rbf


wpaulino Jun 17, 2026
efff2f8

Add splice confirmation fuzz checks


joostjager Jun 18, 2026
96cc8f2

Add stale splice negotiation fuzz invariant


joostjager Jun 19, 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


59 changes: 56 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,10 @@ impl ChainState {
 self.utxos.contains(outpoint)
	}

	fn is_confirmed_txid(&self, txid: &Txid) -> bool {
 self.confirmed_txids.contains(txid)
	}

	fn confirmed_output(&self, outpoint: &BitcoinOutPoint) -> Option<&TxOut> {
 if !self.confirmed_txids.contains(&outpoint.txid) {
 return None;
Expand DownExpand Up@@ -936,7 +940,8 @@ fn assert_disconnect_action(action: &msgs::ErrorAction) -> (&msgs::WarningMessag
	// 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.
	if let msgs::ErrorAction::DisconnectPeerWithWarning { ref msg } = action {
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF");
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF")
 || msg.data.contains("contribution no longer valid at quiescence");
 if !msg.data.contains("Disconnecting due to timeout awaiting response") && !is_quiescent_msg
 {
 panic!("Unexpected disconnect case: {}", msg.data);
Expand DownExpand Up@@ -2220,6 +2225,33 @@ fn build_node_config(chan_type: ChanType) -> UserConfig {
	config
}

fn assert_no_stale_splice_negotiation(
	node: &HarnessNode<'_>, channel_id: &ChannelId, counterparty_node_id: &PublicKey, context: &str,
) {
	let Some(channel) = node.list_channels().into_iter().find(|channel| {
 channel.channel_id == *channel_id && channel.counterparty.node_id == *counterparty_node_id
	}) else {
 return;
	};
	let Some(details) = channel.splice_details else { return };

	assert!(
 details.negotiation.is_none(),
 "{} left active splice negotiation behind: {:?}",
 context,
 details
	);
	assert!(
 details.queued_contribution.is_some()
 || !details.candidates.is_empty()
 || details.confirmed_candidate.is_some()
 || details.received_splice_locked_txid.is_some(),
 "{} left empty splice details behind: {:?}",
 context,
 details
	);
}

fn assert_test_invariants(nodes: &[HarnessNode<'_>; 3]) {
	assert_eq!(nodes[0].list_channels().len(), 3);
	assert_eq!(nodes[1].list_channels().len(), 6);
Expand DownExpand Up@@ -2851,7 +2883,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 fn process_msg_event<Out: Output + MaybeSend + MaybeSync>(
 node_idx: usize, source_node_id: PublicKey, event: MessageSendEvent,
 corrupt_forward: bool, limit_events: ProcessMessages, nodes: &[HarnessNode<'_>; 3],
 out: &Out,
chain_state: &ChainState, out: &Out,
 ) -> Option<MessageSendEvent> {
 match event {
 MessageSendEvent::UpdateHTLCs { node_id, channel_id, updates } => {
Expand DownExpand Up@@ -2914,6 +2946,12 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 MessageSendEvent::SendTxAbort { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "tx_abort");
 nodes[dest_idx].handle_tx_abort(source_node_id, msg);
 assert_no_stale_splice_negotiation(
 &nodes[dest_idx],
 &msg.channel_id,
 &source_node_id,
 "tx_abort receive",
 );
 None
 },
 MessageSendEvent::SendTxInitRbf { ref node_id, ref msg } => {
Expand DownExpand Up@@ -2943,6 +2981,11 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 MessageSendEvent::SendSpliceLocked { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "splice_locked");
 assert!(
 chain_state.is_confirmed_txid(&msg.splice_txid),
 "splice_locked referenced unconfirmed txid {}",
 msg.splice_txid
 );
 nodes[dest_idx].handle_splice_locked(source_node_id, msg);
 None
 },
Expand DownExpand Up@@ -2974,6 +3017,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }

 let nodes = &self.nodes;
 let chain_state = &self.chain_state;
 let out = &self.out;
 let queues = &mut self.queues;
 let mut events = queues.take_for_node(node_idx);
Expand All@@ -2994,6 +3038,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 corrupt_forward,
 limit_events,
 nodes,
 chain_state,
 out,
 );
 if limit_events != ProcessMessages::AllMessages {
Expand DownExpand Up@@ -3050,7 +3095,15 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 events::Event::PaymentPathSuccessful { .. } => {},
 events::Event::PaymentPathFailed { .. } => {},
 events::Event::PaymentForwarded { .. } if node_idx == 1 => {},
 events::Event::ChannelReady { .. } => {},
 events::Event::ChannelReady { funding_txo, .. } => {
 if let Some(funding_txo) = funding_txo {
 assert!(
 chain_state.is_confirmed_txid(&funding_txo.txid),
 "ChannelReady referenced unconfirmed funding txid {}",
 funding_txo.txid
 );
 }
 },
 events::Event::HTLCHandlingFailed { .. } => {},
 events::Event::FundingTransactionReadyForSigning {
 channel_id,
Expand Down

1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 pending_inbound_htlcs: Vec::new(),
 pending_outbound_htlcs: Vec::new(),
 current_dust_exposure_msat: None,
 splice_details: None,
 });
 }
 Some(&$first_hops_vec[..])
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add splice cleanup invariants by joostjager · Pull Request #4699 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add splice cleanup invariants#4699

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

 Closed

joostjager
wants to merge
13
commits into

from

 Closed


Add splice cleanup invariants
#4699
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3d855ac

Store splice contributions with their negotiated candidates


jkczyz Jun 12, 2026
fa5e506

Expose pending splice details in ChannelDetails


jkczyz Jun 12, 2026
9283e00

Test cross-version serialization of pending splices


jkczyz Jun 16, 2026
8ac6fae

Reject splicing a channel with a splice inherited from a prior LDK ve…


jkczyz Jun 17, 2026
0c00583

Add pending changelog entry for PR 4687


jkczyz Jun 18, 2026
2c5f92c

Only emit Event::SpliceNegotiated when contributing


wpaulino Jun 17, 2026
72563af

Always emit SpliceNegotiationFailed when contributing


wpaulino Jun 16, 2026
175b58d

Allow invalid contribution error upon quiescence


wpaulino Jun 17, 2026
1313db2

Prefer tx_abort over disconnection for splice negotiation errors


wpaulino Jun 16, 2026
b04dab4

Prefer tx_abort over disconnection for inability to RBF


wpaulino Jun 17, 2026
0df779c

Check channel is live while handling counterparty tx_init_rbf


wpaulino Jun 17, 2026
efff2f8

Add splice confirmation fuzz checks


joostjager Jun 18, 2026
96cc8f2

Add stale splice negotiation fuzz invariant


joostjager Jun 19, 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


59 changes: 56 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,10 @@ impl ChainState {
 self.utxos.contains(outpoint)
	}

	fn is_confirmed_txid(&self, txid: &Txid) -> bool {
 self.confirmed_txids.contains(txid)
	}

	fn confirmed_output(&self, outpoint: &BitcoinOutPoint) -> Option<&TxOut> {
 if !self.confirmed_txids.contains(&outpoint.txid) {
 return None;
Expand DownExpand Up@@ -936,7 +940,8 @@ fn assert_disconnect_action(action: &msgs::ErrorAction) -> (&msgs::WarningMessag
	// 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.
	if let msgs::ErrorAction::DisconnectPeerWithWarning { ref msg } = action {
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF");
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF")
 || msg.data.contains("contribution no longer valid at quiescence");
 if !msg.data.contains("Disconnecting due to timeout awaiting response") && !is_quiescent_msg
 {
 panic!("Unexpected disconnect case: {}", msg.data);
Expand DownExpand Up@@ -2220,6 +2225,33 @@ fn build_node_config(chan_type: ChanType) -> UserConfig {
	config
}

fn assert_no_stale_splice_negotiation(
	node: &HarnessNode<'_>, channel_id: &ChannelId, counterparty_node_id: &PublicKey, context: &str,
) {
	let Some(channel) = node.list_channels().into_iter().find(|channel| {
 channel.channel_id == *channel_id && channel.counterparty.node_id == *counterparty_node_id
	}) else {
 return;
	};
	let Some(details) = channel.splice_details else { return };

	assert!(
 details.negotiation.is_none(),
 "{} left active splice negotiation behind: {:?}",
 context,
 details
	);
	assert!(
 details.queued_contribution.is_some()
 || !details.candidates.is_empty()
 || details.confirmed_candidate.is_some()
 || details.received_splice_locked_txid.is_some(),
 "{} left empty splice details behind: {:?}",
 context,
 details
	);
}

fn assert_test_invariants(nodes: &[HarnessNode<'_>; 3]) {
	assert_eq!(nodes[0].list_channels().len(), 3);
	assert_eq!(nodes[1].list_channels().len(), 6);
Expand DownExpand Up@@ -2851,7 +2883,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 fn process_msg_event<Out: Output + MaybeSend + MaybeSync>(
 node_idx: usize, source_node_id: PublicKey, event: MessageSendEvent,
 corrupt_forward: bool, limit_events: ProcessMessages, nodes: &[HarnessNode<'_>; 3],
 out: &Out,
chain_state: &ChainState, out: &Out,
 ) -> Option<MessageSendEvent> {
 match event {
 MessageSendEvent::UpdateHTLCs { node_id, channel_id, updates } => {
Expand DownExpand Up@@ -2914,6 +2946,12 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 MessageSendEvent::SendTxAbort { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "tx_abort");
 nodes[dest_idx].handle_tx_abort(source_node_id, msg);
 assert_no_stale_splice_negotiation(
 &nodes[dest_idx],
 &msg.channel_id,
 &source_node_id,
 "tx_abort receive",
 );
 None
 },
 MessageSendEvent::SendTxInitRbf { ref node_id, ref msg } => {
Expand DownExpand Up@@ -2943,6 +2981,11 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 MessageSendEvent::SendSpliceLocked { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "splice_locked");
 assert!(
 chain_state.is_confirmed_txid(&msg.splice_txid),
 "splice_locked referenced unconfirmed txid {}",
 msg.splice_txid
 );
 nodes[dest_idx].handle_splice_locked(source_node_id, msg);
 None
 },
Expand DownExpand Up@@ -2974,6 +3017,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }

 let nodes = &self.nodes;
 let chain_state = &self.chain_state;
 let out = &self.out;
 let queues = &mut self.queues;
 let mut events = queues.take_for_node(node_idx);
Expand All@@ -2994,6 +3038,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 corrupt_forward,
 limit_events,
 nodes,
 chain_state,
 out,
 );
 if limit_events != ProcessMessages::AllMessages {
Expand DownExpand Up@@ -3050,7 +3095,15 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 events::Event::PaymentPathSuccessful { .. } => {},
 events::Event::PaymentPathFailed { .. } => {},
 events::Event::PaymentForwarded { .. } if node_idx == 1 => {},
 events::Event::ChannelReady { .. } => {},
 events::Event::ChannelReady { funding_txo, .. } => {
 if let Some(funding_txo) = funding_txo {
 assert!(
 chain_state.is_confirmed_txid(&funding_txo.txid),
 "ChannelReady referenced unconfirmed funding txid {}",
 funding_txo.txid
 );
 }
 },
 events::Event::HTLCHandlingFailed { .. } => {},
 events::Event::FundingTransactionReadyForSigning {
 channel_id,
Expand Down

1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 pending_inbound_htlcs: Vec::new(),
 pending_outbound_htlcs: Vec::new(),
 current_dust_exposure_msat: None,
 splice_details: None,
 });
 }
 Some(&$first_hops_vec[..])
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add splice cleanup invariants by joostjager · Pull Request #4699 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add splice cleanup invariants#4699

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

 Closed

joostjager
wants to merge
13
commits into

from

 Closed


Add splice cleanup invariants
#4699
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3d855ac

Store splice contributions with their negotiated candidates


jkczyz Jun 12, 2026
fa5e506

Expose pending splice details in ChannelDetails


jkczyz Jun 12, 2026
9283e00

Test cross-version serialization of pending splices


jkczyz Jun 16, 2026
8ac6fae

Reject splicing a channel with a splice inherited from a prior LDK ve…


jkczyz Jun 17, 2026
0c00583

Add pending changelog entry for PR 4687


jkczyz Jun 18, 2026
2c5f92c

Only emit Event::SpliceNegotiated when contributing


wpaulino Jun 17, 2026
72563af

Always emit SpliceNegotiationFailed when contributing


wpaulino Jun 16, 2026
175b58d

Allow invalid contribution error upon quiescence


wpaulino Jun 17, 2026
1313db2

Prefer tx_abort over disconnection for splice negotiation errors


wpaulino Jun 16, 2026
b04dab4

Prefer tx_abort over disconnection for inability to RBF


wpaulino Jun 17, 2026
0df779c

Check channel is live while handling counterparty tx_init_rbf


wpaulino Jun 17, 2026
efff2f8

Add splice confirmation fuzz checks


joostjager Jun 18, 2026
96cc8f2

Add stale splice negotiation fuzz invariant


joostjager Jun 19, 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


59 changes: 56 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,10 @@ impl ChainState {
 self.utxos.contains(outpoint)
	}

	fn is_confirmed_txid(&self, txid: &Txid) -> bool {
 self.confirmed_txids.contains(txid)
	}

	fn confirmed_output(&self, outpoint: &BitcoinOutPoint) -> Option<&TxOut> {
 if !self.confirmed_txids.contains(&outpoint.txid) {
 return None;
Expand DownExpand Up@@ -936,7 +940,8 @@ fn assert_disconnect_action(action: &msgs::ErrorAction) -> (&msgs::WarningMessag
	// 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.
	if let msgs::ErrorAction::DisconnectPeerWithWarning { ref msg } = action {
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF");
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF")
 || msg.data.contains("contribution no longer valid at quiescence");
 if !msg.data.contains("Disconnecting due to timeout awaiting response") && !is_quiescent_msg
 {
 panic!("Unexpected disconnect case: {}", msg.data);
Expand DownExpand Up@@ -2220,6 +2225,33 @@ fn build_node_config(chan_type: ChanType) -> UserConfig {
	config
}

fn assert_no_stale_splice_negotiation(
	node: &HarnessNode<'_>, channel_id: &ChannelId, counterparty_node_id: &PublicKey, context: &str,
) {
	let Some(channel) = node.list_channels().into_iter().find(|channel| {
 channel.channel_id == *channel_id && channel.counterparty.node_id == *counterparty_node_id
	}) else {
 return;
	};
	let Some(details) = channel.splice_details else { return };

	assert!(
 details.negotiation.is_none(),
 "{} left active splice negotiation behind: {:?}",
 context,
 details
	);
	assert!(
 details.queued_contribution.is_some()
 || !details.candidates.is_empty()
 || details.confirmed_candidate.is_some()
 || details.received_splice_locked_txid.is_some(),
 "{} left empty splice details behind: {:?}",
 context,
 details
	);
}

fn assert_test_invariants(nodes: &[HarnessNode<'_>; 3]) {
	assert_eq!(nodes[0].list_channels().len(), 3);
	assert_eq!(nodes[1].list_channels().len(), 6);
Expand DownExpand Up@@ -2851,7 +2883,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 fn process_msg_event<Out: Output + MaybeSend + MaybeSync>(
 node_idx: usize, source_node_id: PublicKey, event: MessageSendEvent,
 corrupt_forward: bool, limit_events: ProcessMessages, nodes: &[HarnessNode<'_>; 3],
 out: &Out,
chain_state: &ChainState, out: &Out,
 ) -> Option<MessageSendEvent> {
 match event {
 MessageSendEvent::UpdateHTLCs { node_id, channel_id, updates } => {
Expand DownExpand Up@@ -2914,6 +2946,12 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 MessageSendEvent::SendTxAbort { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "tx_abort");
 nodes[dest_idx].handle_tx_abort(source_node_id, msg);
 assert_no_stale_splice_negotiation(
 &nodes[dest_idx],
 &msg.channel_id,
 &source_node_id,
 "tx_abort receive",
 );
 None
 },
 MessageSendEvent::SendTxInitRbf { ref node_id, ref msg } => {
Expand DownExpand Up@@ -2943,6 +2981,11 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 MessageSendEvent::SendSpliceLocked { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "splice_locked");
 assert!(
 chain_state.is_confirmed_txid(&msg.splice_txid),
 "splice_locked referenced unconfirmed txid {}",
 msg.splice_txid
 );
 nodes[dest_idx].handle_splice_locked(source_node_id, msg);
 None
 },
Expand DownExpand Up@@ -2974,6 +3017,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }

 let nodes = &self.nodes;
 let chain_state = &self.chain_state;
 let out = &self.out;
 let queues = &mut self.queues;
 let mut events = queues.take_for_node(node_idx);
Expand All@@ -2994,6 +3038,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 corrupt_forward,
 limit_events,
 nodes,
 chain_state,
 out,
 );
 if limit_events != ProcessMessages::AllMessages {
Expand DownExpand Up@@ -3050,7 +3095,15 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 events::Event::PaymentPathSuccessful { .. } => {},
 events::Event::PaymentPathFailed { .. } => {},
 events::Event::PaymentForwarded { .. } if node_idx == 1 => {},
 events::Event::ChannelReady { .. } => {},
 events::Event::ChannelReady { funding_txo, .. } => {
 if let Some(funding_txo) = funding_txo {
 assert!(
 chain_state.is_confirmed_txid(&funding_txo.txid),
 "ChannelReady referenced unconfirmed funding txid {}",
 funding_txo.txid
 );
 }
 },
 events::Event::HTLCHandlingFailed { .. } => {},
 events::Event::FundingTransactionReadyForSigning {
 channel_id,
Expand Down

1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 pending_inbound_htlcs: Vec::new(),
 pending_outbound_htlcs: Vec::new(),
 current_dust_exposure_msat: None,
 splice_details: None,
 });
 }
 Some(&$first_hops_vec[..])
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add splice cleanup invariants by joostjager · Pull Request #4699 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add splice cleanup invariants#4699

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

 Closed

joostjager
wants to merge
13
commits into

from

 Closed


Add splice cleanup invariants
#4699
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3d855ac

Store splice contributions with their negotiated candidates


jkczyz Jun 12, 2026
fa5e506

Expose pending splice details in ChannelDetails


jkczyz Jun 12, 2026
9283e00

Test cross-version serialization of pending splices


jkczyz Jun 16, 2026
8ac6fae

Reject splicing a channel with a splice inherited from a prior LDK ve…


jkczyz Jun 17, 2026
0c00583

Add pending changelog entry for PR 4687


jkczyz Jun 18, 2026
2c5f92c

Only emit Event::SpliceNegotiated when contributing


wpaulino Jun 17, 2026
72563af

Always emit SpliceNegotiationFailed when contributing


wpaulino Jun 16, 2026
175b58d

Allow invalid contribution error upon quiescence


wpaulino Jun 17, 2026
1313db2

Prefer tx_abort over disconnection for splice negotiation errors


wpaulino Jun 16, 2026
b04dab4

Prefer tx_abort over disconnection for inability to RBF


wpaulino Jun 17, 2026
0df779c

Check channel is live while handling counterparty tx_init_rbf


wpaulino Jun 17, 2026
efff2f8

Add splice confirmation fuzz checks


joostjager Jun 18, 2026
96cc8f2

Add stale splice negotiation fuzz invariant


joostjager Jun 19, 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


59 changes: 56 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,10 @@ impl ChainState {
 self.utxos.contains(outpoint)
	}

	fn is_confirmed_txid(&self, txid: &Txid) -> bool {
 self.confirmed_txids.contains(txid)
	}

	fn confirmed_output(&self, outpoint: &BitcoinOutPoint) -> Option<&TxOut> {
 if !self.confirmed_txids.contains(&outpoint.txid) {
 return None;
Expand DownExpand Up@@ -936,7 +940,8 @@ fn assert_disconnect_action(action: &msgs::ErrorAction) -> (&msgs::WarningMessag
	// 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.
	if let msgs::ErrorAction::DisconnectPeerWithWarning { ref msg } = action {
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF");
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF")
 || msg.data.contains("contribution no longer valid at quiescence");
 if !msg.data.contains("Disconnecting due to timeout awaiting response") && !is_quiescent_msg
 {
 panic!("Unexpected disconnect case: {}", msg.data);
Expand DownExpand Up@@ -2220,6 +2225,33 @@ fn build_node_config(chan_type: ChanType) -> UserConfig {
	config
}

fn assert_no_stale_splice_negotiation(
	node: &HarnessNode<'_>, channel_id: &ChannelId, counterparty_node_id: &PublicKey, context: &str,
) {
	let Some(channel) = node.list_channels().into_iter().find(|channel| {
 channel.channel_id == *channel_id && channel.counterparty.node_id == *counterparty_node_id
	}) else {
 return;
	};
	let Some(details) = channel.splice_details else { return };

	assert!(
 details.negotiation.is_none(),
 "{} left active splice negotiation behind: {:?}",
 context,
 details
	);
	assert!(
 details.queued_contribution.is_some()
 || !details.candidates.is_empty()
 || details.confirmed_candidate.is_some()
 || details.received_splice_locked_txid.is_some(),
 "{} left empty splice details behind: {:?}",
 context,
 details
	);
}

fn assert_test_invariants(nodes: &[HarnessNode<'_>; 3]) {
	assert_eq!(nodes[0].list_channels().len(), 3);
	assert_eq!(nodes[1].list_channels().len(), 6);
Expand DownExpand Up@@ -2851,7 +2883,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 fn process_msg_event<Out: Output + MaybeSend + MaybeSync>(
 node_idx: usize, source_node_id: PublicKey, event: MessageSendEvent,
 corrupt_forward: bool, limit_events: ProcessMessages, nodes: &[HarnessNode<'_>; 3],
 out: &Out,
chain_state: &ChainState, out: &Out,
 ) -> Option<MessageSendEvent> {
 match event {
 MessageSendEvent::UpdateHTLCs { node_id, channel_id, updates } => {
Expand DownExpand Up@@ -2914,6 +2946,12 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 MessageSendEvent::SendTxAbort { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "tx_abort");
 nodes[dest_idx].handle_tx_abort(source_node_id, msg);
 assert_no_stale_splice_negotiation(
 &nodes[dest_idx],
 &msg.channel_id,
 &source_node_id,
 "tx_abort receive",
 );
 None
 },
 MessageSendEvent::SendTxInitRbf { ref node_id, ref msg } => {
Expand DownExpand Up@@ -2943,6 +2981,11 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 MessageSendEvent::SendSpliceLocked { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "splice_locked");
 assert!(
 chain_state.is_confirmed_txid(&msg.splice_txid),
 "splice_locked referenced unconfirmed txid {}",
 msg.splice_txid
 );
 nodes[dest_idx].handle_splice_locked(source_node_id, msg);
 None
 },
Expand DownExpand Up@@ -2974,6 +3017,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }

 let nodes = &self.nodes;
 let chain_state = &self.chain_state;
 let out = &self.out;
 let queues = &mut self.queues;
 let mut events = queues.take_for_node(node_idx);
Expand All@@ -2994,6 +3038,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 corrupt_forward,
 limit_events,
 nodes,
 chain_state,
 out,
 );
 if limit_events != ProcessMessages::AllMessages {
Expand DownExpand Up@@ -3050,7 +3095,15 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 events::Event::PaymentPathSuccessful { .. } => {},
 events::Event::PaymentPathFailed { .. } => {},
 events::Event::PaymentForwarded { .. } if node_idx == 1 => {},
 events::Event::ChannelReady { .. } => {},
 events::Event::ChannelReady { funding_txo, .. } => {
 if let Some(funding_txo) = funding_txo {
 assert!(
 chain_state.is_confirmed_txid(&funding_txo.txid),
 "ChannelReady referenced unconfirmed funding txid {}",
 funding_txo.txid
 );
 }
 },
 events::Event::HTLCHandlingFailed { .. } => {},
 events::Event::FundingTransactionReadyForSigning {
 channel_id,
Expand Down

1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 pending_inbound_htlcs: Vec::new(),
 pending_outbound_htlcs: Vec::new(),
 current_dust_exposure_msat: None,
 splice_details: None,
 });
 }
 Some(&$first_hops_vec[..])
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add splice cleanup invariants by joostjager · Pull Request #4699 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add splice cleanup invariants#4699

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

 Closed

joostjager
wants to merge
13
commits into

from

 Closed


Add splice cleanup invariants
#4699
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3d855ac

Store splice contributions with their negotiated candidates


jkczyz Jun 12, 2026
fa5e506

Expose pending splice details in ChannelDetails


jkczyz Jun 12, 2026
9283e00

Test cross-version serialization of pending splices


jkczyz Jun 16, 2026
8ac6fae

Reject splicing a channel with a splice inherited from a prior LDK ve…


jkczyz Jun 17, 2026
0c00583

Add pending changelog entry for PR 4687


jkczyz Jun 18, 2026
2c5f92c

Only emit Event::SpliceNegotiated when contributing


wpaulino Jun 17, 2026
72563af

Always emit SpliceNegotiationFailed when contributing


wpaulino Jun 16, 2026
175b58d

Allow invalid contribution error upon quiescence


wpaulino Jun 17, 2026
1313db2

Prefer tx_abort over disconnection for splice negotiation errors


wpaulino Jun 16, 2026
b04dab4

Prefer tx_abort over disconnection for inability to RBF


wpaulino Jun 17, 2026
0df779c

Check channel is live while handling counterparty tx_init_rbf


wpaulino Jun 17, 2026
efff2f8

Add splice confirmation fuzz checks


joostjager Jun 18, 2026
96cc8f2

Add stale splice negotiation fuzz invariant


joostjager Jun 19, 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


59 changes: 56 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,10 @@ impl ChainState {
 self.utxos.contains(outpoint)
	}

	fn is_confirmed_txid(&self, txid: &Txid) -> bool {
 self.confirmed_txids.contains(txid)
	}

	fn confirmed_output(&self, outpoint: &BitcoinOutPoint) -> Option<&TxOut> {
 if !self.confirmed_txids.contains(&outpoint.txid) {
 return None;
Expand DownExpand Up@@ -936,7 +940,8 @@ fn assert_disconnect_action(action: &msgs::ErrorAction) -> (&msgs::WarningMessag
	// 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.
	if let msgs::ErrorAction::DisconnectPeerWithWarning { ref msg } = action {
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF");
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF")
 || msg.data.contains("contribution no longer valid at quiescence");
 if !msg.data.contains("Disconnecting due to timeout awaiting response") && !is_quiescent_msg
 {
 panic!("Unexpected disconnect case: {}", msg.data);
Expand DownExpand Up@@ -2220,6 +2225,33 @@ fn build_node_config(chan_type: ChanType) -> UserConfig {
	config
}

fn assert_no_stale_splice_negotiation(
	node: &HarnessNode<'_>, channel_id: &ChannelId, counterparty_node_id: &PublicKey, context: &str,
) {
	let Some(channel) = node.list_channels().into_iter().find(|channel| {
 channel.channel_id == *channel_id && channel.counterparty.node_id == *counterparty_node_id
	}) else {
 return;
	};
	let Some(details) = channel.splice_details else { return };

	assert!(
 details.negotiation.is_none(),
 "{} left active splice negotiation behind: {:?}",
 context,
 details
	);
	assert!(
 details.queued_contribution.is_some()
 || !details.candidates.is_empty()
 || details.confirmed_candidate.is_some()
 || details.received_splice_locked_txid.is_some(),
 "{} left empty splice details behind: {:?}",
 context,
 details
	);
}

fn assert_test_invariants(nodes: &[HarnessNode<'_>; 3]) {
	assert_eq!(nodes[0].list_channels().len(), 3);
	assert_eq!(nodes[1].list_channels().len(), 6);
Expand DownExpand Up@@ -2851,7 +2883,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 fn process_msg_event<Out: Output + MaybeSend + MaybeSync>(
 node_idx: usize, source_node_id: PublicKey, event: MessageSendEvent,
 corrupt_forward: bool, limit_events: ProcessMessages, nodes: &[HarnessNode<'_>; 3],
 out: &Out,
chain_state: &ChainState, out: &Out,
 ) -> Option<MessageSendEvent> {
 match event {
 MessageSendEvent::UpdateHTLCs { node_id, channel_id, updates } => {
Expand DownExpand Up@@ -2914,6 +2946,12 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 MessageSendEvent::SendTxAbort { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "tx_abort");
 nodes[dest_idx].handle_tx_abort(source_node_id, msg);
 assert_no_stale_splice_negotiation(
 &nodes[dest_idx],
 &msg.channel_id,
 &source_node_id,
 "tx_abort receive",
 );
 None
 },
 MessageSendEvent::SendTxInitRbf { ref node_id, ref msg } => {
Expand DownExpand Up@@ -2943,6 +2981,11 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 MessageSendEvent::SendSpliceLocked { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "splice_locked");
 assert!(
 chain_state.is_confirmed_txid(&msg.splice_txid),
 "splice_locked referenced unconfirmed txid {}",
 msg.splice_txid
 );
 nodes[dest_idx].handle_splice_locked(source_node_id, msg);
 None
 },
Expand DownExpand Up@@ -2974,6 +3017,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }

 let nodes = &self.nodes;
 let chain_state = &self.chain_state;
 let out = &self.out;
 let queues = &mut self.queues;
 let mut events = queues.take_for_node(node_idx);
Expand All@@ -2994,6 +3038,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 corrupt_forward,
 limit_events,
 nodes,
 chain_state,
 out,
 );
 if limit_events != ProcessMessages::AllMessages {
Expand DownExpand Up@@ -3050,7 +3095,15 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 events::Event::PaymentPathSuccessful { .. } => {},
 events::Event::PaymentPathFailed { .. } => {},
 events::Event::PaymentForwarded { .. } if node_idx == 1 => {},
 events::Event::ChannelReady { .. } => {},
 events::Event::ChannelReady { funding_txo, .. } => {
 if let Some(funding_txo) = funding_txo {
 assert!(
 chain_state.is_confirmed_txid(&funding_txo.txid),
 "ChannelReady referenced unconfirmed funding txid {}",
 funding_txo.txid
 );
 }
 },
 events::Event::HTLCHandlingFailed { .. } => {},
 events::Event::FundingTransactionReadyForSigning {
 channel_id,
Expand Down

1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 pending_inbound_htlcs: Vec::new(),
 pending_outbound_htlcs: Vec::new(),
 current_dust_exposure_msat: None,
 splice_details: None,
 });
 }
 Some(&$first_hops_vec[..])
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add splice cleanup invariants by joostjager · Pull Request #4699 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add splice cleanup invariants#4699

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

 Closed

joostjager
wants to merge
13
commits into

from

 Closed


Add splice cleanup invariants
#4699
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3d855ac

Store splice contributions with their negotiated candidates


jkczyz Jun 12, 2026
fa5e506

Expose pending splice details in ChannelDetails


jkczyz Jun 12, 2026
9283e00

Test cross-version serialization of pending splices


jkczyz Jun 16, 2026
8ac6fae

Reject splicing a channel with a splice inherited from a prior LDK ve…


jkczyz Jun 17, 2026
0c00583

Add pending changelog entry for PR 4687


jkczyz Jun 18, 2026
2c5f92c

Only emit Event::SpliceNegotiated when contributing


wpaulino Jun 17, 2026
72563af

Always emit SpliceNegotiationFailed when contributing


wpaulino Jun 16, 2026
175b58d

Allow invalid contribution error upon quiescence


wpaulino Jun 17, 2026
1313db2

Prefer tx_abort over disconnection for splice negotiation errors


wpaulino Jun 16, 2026
b04dab4

Prefer tx_abort over disconnection for inability to RBF


wpaulino Jun 17, 2026
0df779c

Check channel is live while handling counterparty tx_init_rbf


wpaulino Jun 17, 2026
efff2f8

Add splice confirmation fuzz checks


joostjager Jun 18, 2026
96cc8f2

Add stale splice negotiation fuzz invariant


joostjager Jun 19, 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


59 changes: 56 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,10 @@ impl ChainState {
 self.utxos.contains(outpoint)
	}

	fn is_confirmed_txid(&self, txid: &Txid) -> bool {
 self.confirmed_txids.contains(txid)
	}

	fn confirmed_output(&self, outpoint: &BitcoinOutPoint) -> Option<&TxOut> {
 if !self.confirmed_txids.contains(&outpoint.txid) {
 return None;
Expand DownExpand Up@@ -936,7 +940,8 @@ fn assert_disconnect_action(action: &msgs::ErrorAction) -> (&msgs::WarningMessag
	// 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.
	if let msgs::ErrorAction::DisconnectPeerWithWarning { ref msg } = action {
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF");
 let is_quiescent_msg = msg.data.contains("already sent splice_locked, cannot RBF")
 || msg.data.contains("contribution no longer valid at quiescence");
 if !msg.data.contains("Disconnecting due to timeout awaiting response") && !is_quiescent_msg
 {
 panic!("Unexpected disconnect case: {}", msg.data);
Expand DownExpand Up@@ -2220,6 +2225,33 @@ fn build_node_config(chan_type: ChanType) -> UserConfig {
	config
}

fn assert_no_stale_splice_negotiation(
	node: &HarnessNode<'_>, channel_id: &ChannelId, counterparty_node_id: &PublicKey, context: &str,
) {
	let Some(channel) = node.list_channels().into_iter().find(|channel| {
 channel.channel_id == *channel_id && channel.counterparty.node_id == *counterparty_node_id
	}) else {
 return;
	};
	let Some(details) = channel.splice_details else { return };

	assert!(
 details.negotiation.is_none(),
 "{} left active splice negotiation behind: {:?}",
 context,
 details
	);
	assert!(
 details.queued_contribution.is_some()
 || !details.candidates.is_empty()
 || details.confirmed_candidate.is_some()
 || details.received_splice_locked_txid.is_some(),
 "{} left empty splice details behind: {:?}",
 context,
 details
	);
}

fn assert_test_invariants(nodes: &[HarnessNode<'_>; 3]) {
	assert_eq!(nodes[0].list_channels().len(), 3);
	assert_eq!(nodes[1].list_channels().len(), 6);
Expand DownExpand Up@@ -2851,7 +2883,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 fn process_msg_event<Out: Output + MaybeSend + MaybeSync>(
 node_idx: usize, source_node_id: PublicKey, event: MessageSendEvent,
 corrupt_forward: bool, limit_events: ProcessMessages, nodes: &[HarnessNode<'_>; 3],
 out: &Out,
chain_state: &ChainState, out: &Out,
 ) -> Option<MessageSendEvent> {
 match event {
 MessageSendEvent::UpdateHTLCs { node_id, channel_id, updates } => {
Expand DownExpand Up@@ -2914,6 +2946,12 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 MessageSendEvent::SendTxAbort { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "tx_abort");
 nodes[dest_idx].handle_tx_abort(source_node_id, msg);
 assert_no_stale_splice_negotiation(
 &nodes[dest_idx],
 &msg.channel_id,
 &source_node_id,
 "tx_abort receive",
 );
 None
 },
 MessageSendEvent::SendTxInitRbf { ref node_id, ref msg } => {
Expand DownExpand Up@@ -2943,6 +2981,11 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 MessageSendEvent::SendSpliceLocked { ref node_id, ref msg } => {
 let dest_idx = log_peer_message(node_idx, node_id, nodes, out, "splice_locked");
 assert!(
 chain_state.is_confirmed_txid(&msg.splice_txid),
 "splice_locked referenced unconfirmed txid {}",
 msg.splice_txid
 );
 nodes[dest_idx].handle_splice_locked(source_node_id, msg);
 None
 },
Expand DownExpand Up@@ -2974,6 +3017,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }

 let nodes = &self.nodes;
 let chain_state = &self.chain_state;
 let out = &self.out;
 let queues = &mut self.queues;
 let mut events = queues.take_for_node(node_idx);
Expand All@@ -2994,6 +3038,7 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 corrupt_forward,
 limit_events,
 nodes,
 chain_state,
 out,
 );
 if limit_events != ProcessMessages::AllMessages {
Expand DownExpand Up@@ -3050,7 +3095,15 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 events::Event::PaymentPathSuccessful { .. } => {},
 events::Event::PaymentPathFailed { .. } => {},
 events::Event::PaymentForwarded { .. } if node_idx == 1 => {},
 events::Event::ChannelReady { .. } => {},
 events::Event::ChannelReady { funding_txo, .. } => {
 if let Some(funding_txo) = funding_txo {
 assert!(
 chain_state.is_confirmed_txid(&funding_txo.txid),
 "ChannelReady referenced unconfirmed funding txid {}",
 funding_txo.txid
 );
 }
 },
 events::Event::HTLCHandlingFailed { .. } => {},
 events::Event::FundingTransactionReadyForSigning {
 channel_id,
Expand Down

1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 pending_inbound_htlcs: Vec::new(),
 pending_outbound_htlcs: Vec::new(),
 current_dust_exposure_msat: None,
 splice_details: None,
 });
 }
 Some(&$first_hops_vec[..])
Expand Down
Loading