Gate interactive commitment_signed on user approval during reestablish#4629

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 1 commit into from
May 22, 2026
Merged

Gate interactive commitment_signed on user approval during reestablish #4629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 24 additions & 22 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10581,30 +10581,32 @@ where
self.context.expecting_peer_commitment_signed = true;
}

// - if it has not received `tx_signatures` for that funding transaction:
// - if the `commitment_signed` bit is set in `retransmit_flags`:
if !session.has_received_tx_signatures()
&& next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
{
// - MUST retransmit its `commitment_signed` for that funding transaction.
retransmit_funding_commit_sig = Some(next_funding.txid);
}
if !session.has_holder_witnesses() {
log_debug!(logger, "Waiting for funding transaction signatures to be provided");
} else {
// - if it has not received `tx_signatures` for that funding transaction:
// - if the `commitment_signed` bit is set in `retransmit_flags`:
if !session.has_received_tx_signatures()
&& next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
{
// - MUST retransmit its `commitment_signed` for that funding transaction.
retransmit_funding_commit_sig = Some(next_funding.txid);
}

// - if it has already received `commitment_signed` and it should sign first
// - MUST send its `tx_signatures` for that funding transaction.
//
// - if it has already received `tx_signatures` for that funding transaction:
// - MUST send its `tx_signatures` for that funding transaction.
if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
if self.is_awaiting_monitor_update() {
log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
} else if self.context.signer_pending_funding {
log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
} else {
tx_signatures = Some(holder_tx_signatures);
// - if it has already received `commitment_signed` and it should sign first
// - MUST send its `tx_signatures` for that funding transaction.
//
// - if it has already received `tx_signatures` for that funding transaction:
// - MUST send its `tx_signatures` for that funding transaction.
if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
if self.is_awaiting_monitor_update() {
log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
} else if self.context.signer_pending_funding {
log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
} else {
tx_signatures = Some(holder_tx_signatures);
}
}
} else if !session.has_holder_witnesses() {
log_debug!(logger, "Waiting for funding transaction signatures to be provided");
}
} else {
// We'll just send a `tx_abort` here if we don't have a signing session for this channel
Expand Down
71 changes: 71 additions & 0 deletions lightning/src/ln/splicing_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2676,6 +2676,77 @@ fn test_splice_locked_waits_for_channel_reestablish() {
send_payment(&nodes[0], &[&nodes[1]], 1_000_000);
}

#[test]
fn test_splice_reestablish_waits_for_holder_tx_signatures_before_commitment_signed() {
let chanmon_cfgs = create_chanmon_cfgs(2);
let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);

let node_id_0 = nodes[0].node.get_our_node_id();
let node_id_1 = nodes[1].node.get_our_node_id();

let initial_channel_value_sat = 100_000;
let (_, _, channel_id, _) =
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, initial_channel_value_sat, 0);

let outputs = vec![TxOut {
value: Amount::from_sat(initial_channel_value_sat / 4),
script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
}];
let initiator_contribution =
initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs).unwrap();
negotiate_splice_tx(&nodes[0], &nodes[1], channel_id, initiator_contribution);

let signing_event = get_event!(nodes[0], Event::FundingTransactionReadyForSigning);
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());

// Drop the acceptor's initial `commitment_signed`. On reconnection, node 0's
// `channel_reestablish` should request it again, while node 1's `channel_reestablish` should
// not make node 0 retransmit a `commitment_signed` before holder transaction signatures are
// available.
let _ = get_htlc_update_msgs(&nodes[1], &node_id_0);
nodes[0].node.peer_disconnected(node_id_1);
nodes[1].node.peer_disconnected(node_id_0);

let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.send_announcement_sigs = (true, true);
reconnect_args.send_interactive_tx_commit_sig = (true, false);
reconnect_nodes(reconnect_args);

assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

let unsigned_transaction = if let Event::FundingTransactionReadyForSigning {
unsigned_transaction,
..
} = signing_event
{
unsigned_transaction
} else {
panic!("Expected FundingTransactionReadyForSigning event");
};
let tx = nodes[0].wallet_source.sign_tx(unsigned_transaction).unwrap();
nodes[0].node.funding_transaction_signed(&channel_id, &node_id_1, tx).unwrap();
check_added_monitors(&nodes[0], 1);

let initiator_commit_sig = get_htlc_update_msgs(&nodes[0], &node_id_1);
nodes[1]
.node
.handle_commitment_signed_batch_test(node_id_0, &initiator_commit_sig.commitment_signed);
check_added_monitors(&nodes[1], 1);

let acceptor_tx_signatures =
get_event_msg!(nodes[1], MessageSendEvent::SendTxSignatures, node_id_0);
nodes[0].node.handle_tx_signatures(node_id_1, &acceptor_tx_signatures);
let initiator_tx_signatures =
get_event_msg!(nodes[0], MessageSendEvent::SendTxSignatures, node_id_1);
nodes[1].node.handle_tx_signatures(node_id_0, &initiator_tx_signatures);

expect_splice_pending_event(&nodes[0], &node_id_1);
expect_splice_pending_event(&nodes[1], &node_id_0);
}

#[test]
fn test_splice_confirms_on_both_sides_while_disconnected() {
// Regression test: when a splice transaction confirms on both sides while peers are
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Gate interactive commitment_signed on user approval during reestablish#4629

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 1 commit into

from

May 22, 2026
 Merged


Gate interactive commitment_signed on user approval during reestablish
#4629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


46 changes: 24 additions & 22 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10581,30 +10581,32 @@ where
 self.context.expecting_peer_commitment_signed = true;
 }

 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }
 if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 } else {
 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }

 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 }
 }
 } else if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 }
 } else {
 // We'll just send a `tx_abort` here if we don't have a signing session for this channel
Expand Down

71 changes: 71 additions & 0 deletions
lightning/src/ln/splicing_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2676,6 +2676,77 @@ fn test_splice_locked_waits_for_channel_reestablish() {
	send_payment(&nodes[0], &[&nodes[1]], 1_000_000);
}

#[test]
fn test_splice_reestablish_waits_for_holder_tx_signatures_before_commitment_signed() {
	let chanmon_cfgs = create_chanmon_cfgs(2);
	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);

	let node_id_0 = nodes[0].node.get_our_node_id();
	let node_id_1 = nodes[1].node.get_our_node_id();

	let initial_channel_value_sat = 100_000;
	let (_, _, channel_id, _) =
 create_announced_chan_between_nodes_with_value(&nodes, 0, 1, initial_channel_value_sat, 0);

	let outputs = vec![TxOut {
 value: Amount::from_sat(initial_channel_value_sat / 4),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}];
	let initiator_contribution =
 initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs).unwrap();
	negotiate_splice_tx(&nodes[0], &nodes[1], channel_id, initiator_contribution);

	let signing_event = get_event!(nodes[0], Event::FundingTransactionReadyForSigning);
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());

	// Drop the acceptor's initial `commitment_signed`. On reconnection, node 0's
	// `channel_reestablish` should request it again, while node 1's `channel_reestablish` should
	// not make node 0 retransmit a `commitment_signed` before holder transaction signatures are
	// available.
	let _ = get_htlc_update_msgs(&nodes[1], &node_id_0);
	nodes[0].node.peer_disconnected(node_id_1);
	nodes[1].node.peer_disconnected(node_id_0);

	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_announcement_sigs = (true, true);
	reconnect_args.send_interactive_tx_commit_sig = (true, false);
	reconnect_nodes(reconnect_args);

	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

	let unsigned_transaction = if let Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
 ..
	} = signing_event
	{
 unsigned_transaction
	} else {
 panic!("Expected FundingTransactionReadyForSigning event");
	};
	let tx = nodes[0].wallet_source.sign_tx(unsigned_transaction).unwrap();
	nodes[0].node.funding_transaction_signed(&channel_id, &node_id_1, tx).unwrap();
	check_added_monitors(&nodes[0], 1);

	let initiator_commit_sig = get_htlc_update_msgs(&nodes[0], &node_id_1);
	nodes[1]
 .node
 .handle_commitment_signed_batch_test(node_id_0, &initiator_commit_sig.commitment_signed);
	check_added_monitors(&nodes[1], 1);

	let acceptor_tx_signatures =
 get_event_msg!(nodes[1], MessageSendEvent::SendTxSignatures, node_id_0);
	nodes[0].node.handle_tx_signatures(node_id_1, &acceptor_tx_signatures);
	let initiator_tx_signatures =
 get_event_msg!(nodes[0], MessageSendEvent::SendTxSignatures, node_id_1);
	nodes[1].node.handle_tx_signatures(node_id_0, &initiator_tx_signatures);

	expect_splice_pending_event(&nodes[0], &node_id_1);
	expect_splice_pending_event(&nodes[1], &node_id_0);
}

#[test]
fn test_splice_confirms_on_both_sides_while_disconnected() {
	// Regression test: when a splice transaction confirms on both sides while peers are
Expand Down
Loading

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

Skip to content
Gate interactive commitment_signed on user approval during reestablish#4629

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 1 commit into

from

May 22, 2026
 Merged


Gate interactive commitment_signed on user approval during reestablish
#4629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


46 changes: 24 additions & 22 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10581,30 +10581,32 @@ where
 self.context.expecting_peer_commitment_signed = true;
 }

 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }
 if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 } else {
 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }

 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 }
 }
 } else if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 }
 } else {
 // We'll just send a `tx_abort` here if we don't have a signing session for this channel
Expand Down

71 changes: 71 additions & 0 deletions
lightning/src/ln/splicing_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2676,6 +2676,77 @@ fn test_splice_locked_waits_for_channel_reestablish() {
	send_payment(&nodes[0], &[&nodes[1]], 1_000_000);
}

#[test]
fn test_splice_reestablish_waits_for_holder_tx_signatures_before_commitment_signed() {
	let chanmon_cfgs = create_chanmon_cfgs(2);
	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);

	let node_id_0 = nodes[0].node.get_our_node_id();
	let node_id_1 = nodes[1].node.get_our_node_id();

	let initial_channel_value_sat = 100_000;
	let (_, _, channel_id, _) =
 create_announced_chan_between_nodes_with_value(&nodes, 0, 1, initial_channel_value_sat, 0);

	let outputs = vec![TxOut {
 value: Amount::from_sat(initial_channel_value_sat / 4),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}];
	let initiator_contribution =
 initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs).unwrap();
	negotiate_splice_tx(&nodes[0], &nodes[1], channel_id, initiator_contribution);

	let signing_event = get_event!(nodes[0], Event::FundingTransactionReadyForSigning);
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());

	// Drop the acceptor's initial `commitment_signed`. On reconnection, node 0's
	// `channel_reestablish` should request it again, while node 1's `channel_reestablish` should
	// not make node 0 retransmit a `commitment_signed` before holder transaction signatures are
	// available.
	let _ = get_htlc_update_msgs(&nodes[1], &node_id_0);
	nodes[0].node.peer_disconnected(node_id_1);
	nodes[1].node.peer_disconnected(node_id_0);

	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_announcement_sigs = (true, true);
	reconnect_args.send_interactive_tx_commit_sig = (true, false);
	reconnect_nodes(reconnect_args);

	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

	let unsigned_transaction = if let Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
 ..
	} = signing_event
	{
 unsigned_transaction
	} else {
 panic!("Expected FundingTransactionReadyForSigning event");
	};
	let tx = nodes[0].wallet_source.sign_tx(unsigned_transaction).unwrap();
	nodes[0].node.funding_transaction_signed(&channel_id, &node_id_1, tx).unwrap();
	check_added_monitors(&nodes[0], 1);

	let initiator_commit_sig = get_htlc_update_msgs(&nodes[0], &node_id_1);
	nodes[1]
 .node
 .handle_commitment_signed_batch_test(node_id_0, &initiator_commit_sig.commitment_signed);
	check_added_monitors(&nodes[1], 1);

	let acceptor_tx_signatures =
 get_event_msg!(nodes[1], MessageSendEvent::SendTxSignatures, node_id_0);
	nodes[0].node.handle_tx_signatures(node_id_1, &acceptor_tx_signatures);
	let initiator_tx_signatures =
 get_event_msg!(nodes[0], MessageSendEvent::SendTxSignatures, node_id_1);
	nodes[1].node.handle_tx_signatures(node_id_0, &initiator_tx_signatures);

	expect_splice_pending_event(&nodes[0], &node_id_1);
	expect_splice_pending_event(&nodes[1], &node_id_0);
}

#[test]
fn test_splice_confirms_on_both_sides_while_disconnected() {
	// Regression test: when a splice transaction confirms on both sides while peers are
Expand Down
Loading

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

Skip to content
Gate interactive commitment_signed on user approval during reestablish#4629

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 1 commit into

from

May 22, 2026
 Merged


Gate interactive commitment_signed on user approval during reestablish
#4629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


46 changes: 24 additions & 22 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10581,30 +10581,32 @@ where
 self.context.expecting_peer_commitment_signed = true;
 }

 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }
 if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 } else {
 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }

 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 }
 }
 } else if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 }
 } else {
 // We'll just send a `tx_abort` here if we don't have a signing session for this channel
Expand Down

71 changes: 71 additions & 0 deletions
lightning/src/ln/splicing_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2676,6 +2676,77 @@ fn test_splice_locked_waits_for_channel_reestablish() {
	send_payment(&nodes[0], &[&nodes[1]], 1_000_000);
}

#[test]
fn test_splice_reestablish_waits_for_holder_tx_signatures_before_commitment_signed() {
	let chanmon_cfgs = create_chanmon_cfgs(2);
	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);

	let node_id_0 = nodes[0].node.get_our_node_id();
	let node_id_1 = nodes[1].node.get_our_node_id();

	let initial_channel_value_sat = 100_000;
	let (_, _, channel_id, _) =
 create_announced_chan_between_nodes_with_value(&nodes, 0, 1, initial_channel_value_sat, 0);

	let outputs = vec![TxOut {
 value: Amount::from_sat(initial_channel_value_sat / 4),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}];
	let initiator_contribution =
 initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs).unwrap();
	negotiate_splice_tx(&nodes[0], &nodes[1], channel_id, initiator_contribution);

	let signing_event = get_event!(nodes[0], Event::FundingTransactionReadyForSigning);
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());

	// Drop the acceptor's initial `commitment_signed`. On reconnection, node 0's
	// `channel_reestablish` should request it again, while node 1's `channel_reestablish` should
	// not make node 0 retransmit a `commitment_signed` before holder transaction signatures are
	// available.
	let _ = get_htlc_update_msgs(&nodes[1], &node_id_0);
	nodes[0].node.peer_disconnected(node_id_1);
	nodes[1].node.peer_disconnected(node_id_0);

	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_announcement_sigs = (true, true);
	reconnect_args.send_interactive_tx_commit_sig = (true, false);
	reconnect_nodes(reconnect_args);

	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

	let unsigned_transaction = if let Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
 ..
	} = signing_event
	{
 unsigned_transaction
	} else {
 panic!("Expected FundingTransactionReadyForSigning event");
	};
	let tx = nodes[0].wallet_source.sign_tx(unsigned_transaction).unwrap();
	nodes[0].node.funding_transaction_signed(&channel_id, &node_id_1, tx).unwrap();
	check_added_monitors(&nodes[0], 1);

	let initiator_commit_sig = get_htlc_update_msgs(&nodes[0], &node_id_1);
	nodes[1]
 .node
 .handle_commitment_signed_batch_test(node_id_0, &initiator_commit_sig.commitment_signed);
	check_added_monitors(&nodes[1], 1);

	let acceptor_tx_signatures =
 get_event_msg!(nodes[1], MessageSendEvent::SendTxSignatures, node_id_0);
	nodes[0].node.handle_tx_signatures(node_id_1, &acceptor_tx_signatures);
	let initiator_tx_signatures =
 get_event_msg!(nodes[0], MessageSendEvent::SendTxSignatures, node_id_1);
	nodes[1].node.handle_tx_signatures(node_id_0, &initiator_tx_signatures);

	expect_splice_pending_event(&nodes[0], &node_id_1);
	expect_splice_pending_event(&nodes[1], &node_id_0);
}

#[test]
fn test_splice_confirms_on_both_sides_while_disconnected() {
	// Regression test: when a splice transaction confirms on both sides while peers are
Expand Down
Loading

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

Skip to content
Gate interactive commitment_signed on user approval during reestablish#4629

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 1 commit into

from

May 22, 2026
 Merged


Gate interactive commitment_signed on user approval during reestablish
#4629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


46 changes: 24 additions & 22 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10581,30 +10581,32 @@ where
 self.context.expecting_peer_commitment_signed = true;
 }

 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }
 if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 } else {
 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }

 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 }
 }
 } else if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 }
 } else {
 // We'll just send a `tx_abort` here if we don't have a signing session for this channel
Expand Down

71 changes: 71 additions & 0 deletions
lightning/src/ln/splicing_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2676,6 +2676,77 @@ fn test_splice_locked_waits_for_channel_reestablish() {
	send_payment(&nodes[0], &[&nodes[1]], 1_000_000);
}

#[test]
fn test_splice_reestablish_waits_for_holder_tx_signatures_before_commitment_signed() {
	let chanmon_cfgs = create_chanmon_cfgs(2);
	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);

	let node_id_0 = nodes[0].node.get_our_node_id();
	let node_id_1 = nodes[1].node.get_our_node_id();

	let initial_channel_value_sat = 100_000;
	let (_, _, channel_id, _) =
 create_announced_chan_between_nodes_with_value(&nodes, 0, 1, initial_channel_value_sat, 0);

	let outputs = vec![TxOut {
 value: Amount::from_sat(initial_channel_value_sat / 4),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}];
	let initiator_contribution =
 initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs).unwrap();
	negotiate_splice_tx(&nodes[0], &nodes[1], channel_id, initiator_contribution);

	let signing_event = get_event!(nodes[0], Event::FundingTransactionReadyForSigning);
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());

	// Drop the acceptor's initial `commitment_signed`. On reconnection, node 0's
	// `channel_reestablish` should request it again, while node 1's `channel_reestablish` should
	// not make node 0 retransmit a `commitment_signed` before holder transaction signatures are
	// available.
	let _ = get_htlc_update_msgs(&nodes[1], &node_id_0);
	nodes[0].node.peer_disconnected(node_id_1);
	nodes[1].node.peer_disconnected(node_id_0);

	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_announcement_sigs = (true, true);
	reconnect_args.send_interactive_tx_commit_sig = (true, false);
	reconnect_nodes(reconnect_args);

	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

	let unsigned_transaction = if let Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
 ..
	} = signing_event
	{
 unsigned_transaction
	} else {
 panic!("Expected FundingTransactionReadyForSigning event");
	};
	let tx = nodes[0].wallet_source.sign_tx(unsigned_transaction).unwrap();
	nodes[0].node.funding_transaction_signed(&channel_id, &node_id_1, tx).unwrap();
	check_added_monitors(&nodes[0], 1);

	let initiator_commit_sig = get_htlc_update_msgs(&nodes[0], &node_id_1);
	nodes[1]
 .node
 .handle_commitment_signed_batch_test(node_id_0, &initiator_commit_sig.commitment_signed);
	check_added_monitors(&nodes[1], 1);

	let acceptor_tx_signatures =
 get_event_msg!(nodes[1], MessageSendEvent::SendTxSignatures, node_id_0);
	nodes[0].node.handle_tx_signatures(node_id_1, &acceptor_tx_signatures);
	let initiator_tx_signatures =
 get_event_msg!(nodes[0], MessageSendEvent::SendTxSignatures, node_id_1);
	nodes[1].node.handle_tx_signatures(node_id_0, &initiator_tx_signatures);

	expect_splice_pending_event(&nodes[0], &node_id_1);
	expect_splice_pending_event(&nodes[1], &node_id_0);
}

#[test]
fn test_splice_confirms_on_both_sides_while_disconnected() {
	// Regression test: when a splice transaction confirms on both sides while peers are
Expand Down
Loading

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

Skip to content
Gate interactive commitment_signed on user approval during reestablish#4629

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 1 commit into

from

May 22, 2026
 Merged


Gate interactive commitment_signed on user approval during reestablish
#4629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


46 changes: 24 additions & 22 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10581,30 +10581,32 @@ where
 self.context.expecting_peer_commitment_signed = true;
 }

 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }
 if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 } else {
 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }

 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 }
 }
 } else if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 }
 } else {
 // We'll just send a `tx_abort` here if we don't have a signing session for this channel
Expand Down

71 changes: 71 additions & 0 deletions
lightning/src/ln/splicing_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2676,6 +2676,77 @@ fn test_splice_locked_waits_for_channel_reestablish() {
	send_payment(&nodes[0], &[&nodes[1]], 1_000_000);
}

#[test]
fn test_splice_reestablish_waits_for_holder_tx_signatures_before_commitment_signed() {
	let chanmon_cfgs = create_chanmon_cfgs(2);
	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);

	let node_id_0 = nodes[0].node.get_our_node_id();
	let node_id_1 = nodes[1].node.get_our_node_id();

	let initial_channel_value_sat = 100_000;
	let (_, _, channel_id, _) =
 create_announced_chan_between_nodes_with_value(&nodes, 0, 1, initial_channel_value_sat, 0);

	let outputs = vec![TxOut {
 value: Amount::from_sat(initial_channel_value_sat / 4),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}];
	let initiator_contribution =
 initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs).unwrap();
	negotiate_splice_tx(&nodes[0], &nodes[1], channel_id, initiator_contribution);

	let signing_event = get_event!(nodes[0], Event::FundingTransactionReadyForSigning);
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());

	// Drop the acceptor's initial `commitment_signed`. On reconnection, node 0's
	// `channel_reestablish` should request it again, while node 1's `channel_reestablish` should
	// not make node 0 retransmit a `commitment_signed` before holder transaction signatures are
	// available.
	let _ = get_htlc_update_msgs(&nodes[1], &node_id_0);
	nodes[0].node.peer_disconnected(node_id_1);
	nodes[1].node.peer_disconnected(node_id_0);

	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_announcement_sigs = (true, true);
	reconnect_args.send_interactive_tx_commit_sig = (true, false);
	reconnect_nodes(reconnect_args);

	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

	let unsigned_transaction = if let Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
 ..
	} = signing_event
	{
 unsigned_transaction
	} else {
 panic!("Expected FundingTransactionReadyForSigning event");
	};
	let tx = nodes[0].wallet_source.sign_tx(unsigned_transaction).unwrap();
	nodes[0].node.funding_transaction_signed(&channel_id, &node_id_1, tx).unwrap();
	check_added_monitors(&nodes[0], 1);

	let initiator_commit_sig = get_htlc_update_msgs(&nodes[0], &node_id_1);
	nodes[1]
 .node
 .handle_commitment_signed_batch_test(node_id_0, &initiator_commit_sig.commitment_signed);
	check_added_monitors(&nodes[1], 1);

	let acceptor_tx_signatures =
 get_event_msg!(nodes[1], MessageSendEvent::SendTxSignatures, node_id_0);
	nodes[0].node.handle_tx_signatures(node_id_1, &acceptor_tx_signatures);
	let initiator_tx_signatures =
 get_event_msg!(nodes[0], MessageSendEvent::SendTxSignatures, node_id_1);
	nodes[1].node.handle_tx_signatures(node_id_0, &initiator_tx_signatures);

	expect_splice_pending_event(&nodes[0], &node_id_1);
	expect_splice_pending_event(&nodes[1], &node_id_0);
}

#[test]
fn test_splice_confirms_on_both_sides_while_disconnected() {
	// Regression test: when a splice transaction confirms on both sides while peers are
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Gate interactive commitment_signed on user approval during reestablish#4629

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 1 commit into

from

May 22, 2026
 Merged


Gate interactive commitment_signed on user approval during reestablish
#4629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


46 changes: 24 additions & 22 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10581,30 +10581,32 @@ where
 self.context.expecting_peer_commitment_signed = true;
 }

 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }
 if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 } else {
 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }

 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 }
 }
 } else if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 }
 } else {
 // We'll just send a `tx_abort` here if we don't have a signing session for this channel
Expand Down

71 changes: 71 additions & 0 deletions
lightning/src/ln/splicing_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2676,6 +2676,77 @@ fn test_splice_locked_waits_for_channel_reestablish() {
	send_payment(&nodes[0], &[&nodes[1]], 1_000_000);
}

#[test]
fn test_splice_reestablish_waits_for_holder_tx_signatures_before_commitment_signed() {
	let chanmon_cfgs = create_chanmon_cfgs(2);
	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);

	let node_id_0 = nodes[0].node.get_our_node_id();
	let node_id_1 = nodes[1].node.get_our_node_id();

	let initial_channel_value_sat = 100_000;
	let (_, _, channel_id, _) =
 create_announced_chan_between_nodes_with_value(&nodes, 0, 1, initial_channel_value_sat, 0);

	let outputs = vec![TxOut {
 value: Amount::from_sat(initial_channel_value_sat / 4),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}];
	let initiator_contribution =
 initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs).unwrap();
	negotiate_splice_tx(&nodes[0], &nodes[1], channel_id, initiator_contribution);

	let signing_event = get_event!(nodes[0], Event::FundingTransactionReadyForSigning);
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());

	// Drop the acceptor's initial `commitment_signed`. On reconnection, node 0's
	// `channel_reestablish` should request it again, while node 1's `channel_reestablish` should
	// not make node 0 retransmit a `commitment_signed` before holder transaction signatures are
	// available.
	let _ = get_htlc_update_msgs(&nodes[1], &node_id_0);
	nodes[0].node.peer_disconnected(node_id_1);
	nodes[1].node.peer_disconnected(node_id_0);

	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_announcement_sigs = (true, true);
	reconnect_args.send_interactive_tx_commit_sig = (true, false);
	reconnect_nodes(reconnect_args);

	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

	let unsigned_transaction = if let Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
 ..
	} = signing_event
	{
 unsigned_transaction
	} else {
 panic!("Expected FundingTransactionReadyForSigning event");
	};
	let tx = nodes[0].wallet_source.sign_tx(unsigned_transaction).unwrap();
	nodes[0].node.funding_transaction_signed(&channel_id, &node_id_1, tx).unwrap();
	check_added_monitors(&nodes[0], 1);

	let initiator_commit_sig = get_htlc_update_msgs(&nodes[0], &node_id_1);
	nodes[1]
 .node
 .handle_commitment_signed_batch_test(node_id_0, &initiator_commit_sig.commitment_signed);
	check_added_monitors(&nodes[1], 1);

	let acceptor_tx_signatures =
 get_event_msg!(nodes[1], MessageSendEvent::SendTxSignatures, node_id_0);
	nodes[0].node.handle_tx_signatures(node_id_1, &acceptor_tx_signatures);
	let initiator_tx_signatures =
 get_event_msg!(nodes[0], MessageSendEvent::SendTxSignatures, node_id_1);
	nodes[1].node.handle_tx_signatures(node_id_0, &initiator_tx_signatures);

	expect_splice_pending_event(&nodes[0], &node_id_1);
	expect_splice_pending_event(&nodes[1], &node_id_0);
}

#[test]
fn test_splice_confirms_on_both_sides_while_disconnected() {
	// Regression test: when a splice transaction confirms on both sides while peers are
Expand Down
Loading

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

Skip to content
Gate interactive commitment_signed on user approval during reestablish#4629

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 1 commit into

from

May 22, 2026
 Merged


Gate interactive commitment_signed on user approval during reestablish
#4629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


46 changes: 24 additions & 22 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10581,30 +10581,32 @@ where
 self.context.expecting_peer_commitment_signed = true;
 }

 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }
 if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 } else {
 // - if it has not received `tx_signatures` for that funding transaction:
 // - if the `commitment_signed` bit is set in `retransmit_flags`:
 if !session.has_received_tx_signatures()
 && next_funding.should_retransmit(msgs::NextFundingFlag::CommitmentSigned)
 {
 // - MUST retransmit its `commitment_signed` for that funding transaction.
 retransmit_funding_commit_sig = Some(next_funding.txid);
 }

 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 // - if it has already received `commitment_signed` and it should sign first
 // - MUST send its `tx_signatures` for that funding transaction.
 //
 // - if it has already received `tx_signatures` for that funding transaction:
 // - MUST send its `tx_signatures` for that funding transaction.
 if let Some(holder_tx_signatures) = session.holder_tx_signatures() {
 if self.is_awaiting_monitor_update() {
 log_debug!(logger, "Waiting for monitor update before providing funding transaction signatures");
 } else if self.context.signer_pending_funding {
 log_debug!(logger, "Waiting for signer to provide counterparty commitment_signed before releasing funding transaction signatures");
 } else {
 tx_signatures = Some(holder_tx_signatures);
 }
 }
 } else if !session.has_holder_witnesses() {
 log_debug!(logger, "Waiting for funding transaction signatures to be provided");
 }
 } else {
 // We'll just send a `tx_abort` here if we don't have a signing session for this channel
Expand Down

71 changes: 71 additions & 0 deletions
lightning/src/ln/splicing_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2676,6 +2676,77 @@ fn test_splice_locked_waits_for_channel_reestablish() {
	send_payment(&nodes[0], &[&nodes[1]], 1_000_000);
}

#[test]
fn test_splice_reestablish_waits_for_holder_tx_signatures_before_commitment_signed() {
	let chanmon_cfgs = create_chanmon_cfgs(2);
	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);

	let node_id_0 = nodes[0].node.get_our_node_id();
	let node_id_1 = nodes[1].node.get_our_node_id();

	let initial_channel_value_sat = 100_000;
	let (_, _, channel_id, _) =
 create_announced_chan_between_nodes_with_value(&nodes, 0, 1, initial_channel_value_sat, 0);

	let outputs = vec![TxOut {
 value: Amount::from_sat(initial_channel_value_sat / 4),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}];
	let initiator_contribution =
 initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs).unwrap();
	negotiate_splice_tx(&nodes[0], &nodes[1], channel_id, initiator_contribution);

	let signing_event = get_event!(nodes[0], Event::FundingTransactionReadyForSigning);
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());

	// Drop the acceptor's initial `commitment_signed`. On reconnection, node 0's
	// `channel_reestablish` should request it again, while node 1's `channel_reestablish` should
	// not make node 0 retransmit a `commitment_signed` before holder transaction signatures are
	// available.
	let _ = get_htlc_update_msgs(&nodes[1], &node_id_0);
	nodes[0].node.peer_disconnected(node_id_1);
	nodes[1].node.peer_disconnected(node_id_0);

	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_announcement_sigs = (true, true);
	reconnect_args.send_interactive_tx_commit_sig = (true, false);
	reconnect_nodes(reconnect_args);

	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

	let unsigned_transaction = if let Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
 ..
	} = signing_event
	{
 unsigned_transaction
	} else {
 panic!("Expected FundingTransactionReadyForSigning event");
	};
	let tx = nodes[0].wallet_source.sign_tx(unsigned_transaction).unwrap();
	nodes[0].node.funding_transaction_signed(&channel_id, &node_id_1, tx).unwrap();
	check_added_monitors(&nodes[0], 1);

	let initiator_commit_sig = get_htlc_update_msgs(&nodes[0], &node_id_1);
	nodes[1]
 .node
 .handle_commitment_signed_batch_test(node_id_0, &initiator_commit_sig.commitment_signed);
	check_added_monitors(&nodes[1], 1);

	let acceptor_tx_signatures =
 get_event_msg!(nodes[1], MessageSendEvent::SendTxSignatures, node_id_0);
	nodes[0].node.handle_tx_signatures(node_id_1, &acceptor_tx_signatures);
	let initiator_tx_signatures =
 get_event_msg!(nodes[0], MessageSendEvent::SendTxSignatures, node_id_1);
	nodes[1].node.handle_tx_signatures(node_id_0, &initiator_tx_signatures);

	expect_splice_pending_event(&nodes[0], &node_id_1);
	expect_splice_pending_event(&nodes[1], &node_id_0);
}

#[test]
fn test_splice_confirms_on_both_sides_while_disconnected() {
	// Regression test: when a splice transaction confirms on both sides while peers are
Expand Down
Loading