Free holding cell in remaining quiescence-exit code paths#4415

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 6 commits into from
Feb 18, 2026
Merged

Free holding cell in remaining quiescence-exit code paths #4415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac0f53f
Free holding cell upon handling an invalid interactive-tx message
wpaulino Feb 12, 2026
2665465
Free holding cell upon handling a counterparty tx_abort
wpaulino Feb 12, 2026
3e8b060
Free holding cell upon tx_signatures exchange
wpaulino Feb 12, 2026
c9827fc
Avoid persisting ChannelManager on handle_tx_* errors
wpaulino Feb 12, 2026
f6ea33e
Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer
wpaulino Feb 12, 2026
1b8617c
Bind Channel::commitment_signed result in internal_commitment_signed
wpaulino Feb 12, 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
96 changes: 61 additions & 35 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,6 +1204,18 @@ pub enum UpdateFulfillCommitFetch {
DuplicateClaim {},
}

/// Error returned when processing an invalid interactive-tx message from our counterparty.
pub(super) struct InteractiveTxMsgError {
/// The underlying error.
pub(super) err: ChannelError,
/// If a splice was in progress when processing the message, this contains the splice funding
/// information for emitting a `SpliceFailed` event.
pub(super) splice_funding_failed: Option<SpliceFundingFailed>,
/// Whether we were quiescent when we received the message, and are no longer due to aborting
/// the session.
pub(super) exited_quiescence: bool,
}

/// The return value of `monitor_updating_restored`
pub(super) struct MonitorRestoreUpdates {
pub raa: Option<msgs::RevokeAndACK>,
Expand DownExpand Up@@ -1846,104 +1858,118 @@ where

fn fail_interactive_tx_negotiation<L: Logger>(
&mut self, reason: AbortReason, logger: &L,
) -> (ChannelError, Option<SpliceFundingFailed>) {
) -> InteractiveTxMsgError {
let logger = WithChannelContext::from(logger, &self.context(), None);
log_info!(logger, "Failed interactive transaction negotiation: {reason}");

let splice_funding_failed = match &mut self.phase {
let (splice_funding_failed, exited_quiescence) = match &mut self.phase {
ChannelPhase::Undefined => unreachable!(),
ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => None,
ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
(None, false)
},
ChannelPhase::UnfundedV2(pending_v2_channel) => {
pending_v2_channel.interactive_tx_constructor.take();
None
(None, false)
},
ChannelPhase::Funded(funded_channel) => {
if funded_channel.should_reset_pending_splice_state(false) {
funded_channel.reset_pending_splice_state()
(funded_channel.reset_pending_splice_state(), true)
} else {
debug_assert!(false, "We should never fail an interactive funding negotiation once we're exchanging tx_signatures");
None
(None, false)
}
},
};

(ChannelError::Abort(reason), splice_funding_failed)
InteractiveTxMsgError {
err: ChannelError::Abort(reason),
splice_funding_failed,
exited_quiescence,
}
}

pub fn tx_add_input<L: Logger>(
&mut self, msg: &msgs::TxAddInput, logger: &L,
) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
match self.interactive_tx_constructor_mut() {
Some(interactive_tx_constructor) => interactive_tx_constructor
.handle_tx_add_input(msg)
.map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
None => Err((
ChannelError::WarnAndDisconnect(
None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
"Received unexpected interactive transaction negotiation message".to_owned(),
),
None,
)),
splice_funding_failed: None,
exited_quiescence: false,
}),
}
}

pub fn tx_add_output<L: Logger>(
&mut self, msg: &msgs::TxAddOutput, logger: &L,
) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
match self.interactive_tx_constructor_mut() {
Some(interactive_tx_constructor) => interactive_tx_constructor
.handle_tx_add_output(msg)
.map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
None => Err((
ChannelError::WarnAndDisconnect(
None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
"Received unexpected interactive transaction negotiation message".to_owned(),
),
None,
)),
splice_funding_failed: None,
exited_quiescence: false,
}),
}
}

pub fn tx_remove_input<L: Logger>(
&mut self, msg: &msgs::TxRemoveInput, logger: &L,
) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
match self.interactive_tx_constructor_mut() {
Some(interactive_tx_constructor) => interactive_tx_constructor
.handle_tx_remove_input(msg)
.map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
None => Err((
ChannelError::WarnAndDisconnect(
None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
"Received unexpected interactive transaction negotiation message".to_owned(),
),
None,
)),
splice_funding_failed: None,
exited_quiescence: false,
}),
}
}

pub fn tx_remove_output<L: Logger>(
&mut self, msg: &msgs::TxRemoveOutput, logger: &L,
) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
match self.interactive_tx_constructor_mut() {
Some(interactive_tx_constructor) => interactive_tx_constructor
.handle_tx_remove_output(msg)
.map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
None => Err((
ChannelError::WarnAndDisconnect(
None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
"Received unexpected interactive transaction negotiation message".to_owned(),
),
None,
)),
splice_funding_failed: None,
exited_quiescence: false,
}),
}
}

pub fn tx_complete<F: FeeEstimator, L: Logger>(
&mut self, msg: &msgs::TxComplete, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
) -> Result<TxCompleteResult, (ChannelError, Option<SpliceFundingFailed>)> {
) -> Result<TxCompleteResult, InteractiveTxMsgError> {
let tx_complete_action = match self.interactive_tx_constructor_mut() {
Some(interactive_tx_constructor) => interactive_tx_constructor
.handle_tx_complete(msg)
.map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger))?,
None => {
let err = "Received unexpected interactive transaction negotiation message";
return Err((ChannelError::WarnAndDisconnect(err.to_owned()), None));
return Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(err.to_owned()),
splice_funding_failed: None,
exited_quiescence: false,
});
},
};

Expand DownExpand Up@@ -2003,13 +2029,13 @@ where

pub fn tx_abort<L: Logger>(
&mut self, msg: &msgs::TxAbort, logger: &L,
) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>), ChannelError> {
) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>, bool), ChannelError> {
// If we have not sent a `tx_abort` message for this negotiation previously, we need to echo
// back a tx_abort message according to the spec:
// https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L560-L561
// For rationale why we echo back `tx_abort`:
// https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L578-L580
let (should_ack, splice_funding_failed) = match &mut self.phase {
let (should_ack, splice_funding_failed, exited_quiescence) = match &mut self.phase {
ChannelPhase::Undefined => unreachable!(),
ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
let err = "Got an unexpected tx_abort message: This is an unfunded channel created with V1 channel establishment";
Expand All@@ -2018,7 +2044,7 @@ where
ChannelPhase::UnfundedV2(pending_v2_channel) => {
let had_constructor =
pending_v2_channel.interactive_tx_constructor.take().is_some();
(had_constructor, None)
(had_constructor, None, false)
},
ChannelPhase::Funded(funded_channel) => {
if funded_channel.has_pending_splice_awaiting_signatures()
Expand DownExpand Up@@ -2046,11 +2072,11 @@ where
.unwrap_or(false);
debug_assert!(has_funding_negotiation);
let splice_funding_failed = funded_channel.reset_pending_splice_state();
(true, splice_funding_failed)
(true, splice_funding_failed, true)
} else {
// We were not tracking the pending funding negotiation state anymore, likely
// due to a disconnection or already having sent our own `tx_abort`.
(false, None)
(false, None, false)
}
},
};
Expand All@@ -2066,7 +2092,7 @@ where
}
});

Ok((tx_abort, splice_funding_failed))
Ok((tx_abort, splice_funding_failed, exited_quiescence))
}

#[rustfmt::skip]
Expand Down
Loading
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
Free holding cell in remaining quiescence-exit code paths#4415

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 6 commits into

from

Feb 18, 2026
 Merged


Free holding cell in remaining quiescence-exit code paths
#4415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ac0f53f

Free holding cell upon handling an invalid interactive-tx message


wpaulino Feb 12, 2026
2665465

Free holding cell upon handling a counterparty tx_abort


wpaulino Feb 12, 2026
3e8b060

Free holding cell upon tx_signatures exchange


wpaulino Feb 12, 2026
c9827fc

Avoid persisting ChannelManager on handle_tx_* errors


wpaulino Feb 12, 2026
f6ea33e

Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer


wpaulino Feb 12, 2026
1b8617c

Bind Channel::commitment_signed result in internal_commitment_signed


wpaulino Feb 12, 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


96 changes: 61 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,6 +1204,18 @@ pub enum UpdateFulfillCommitFetch {
	DuplicateClaim {},
}

/// Error returned when processing an invalid interactive-tx message from our counterparty.
pub(super) struct InteractiveTxMsgError {
	/// The underlying error.
	pub(super) err: ChannelError,
	/// If a splice was in progress when processing the message, this contains the splice funding
	/// information for emitting a `SpliceFailed` event.
	pub(super) splice_funding_failed: Option<SpliceFundingFailed>,
	/// Whether we were quiescent when we received the message, and are no longer due to aborting
	/// the session.
	pub(super) exited_quiescence: bool,
}

/// The return value of `monitor_updating_restored`
pub(super) struct MonitorRestoreUpdates {
	pub raa: Option<msgs::RevokeAndACK>,
Expand DownExpand Up@@ -1846,104 +1858,118 @@ where

	fn fail_interactive_tx_negotiation<L: Logger>(
 &mut self, reason: AbortReason, logger: &L,
	) -> (ChannelError, Option<SpliceFundingFailed>) {
	) -> InteractiveTxMsgError {
 let logger = WithChannelContext::from(logger, &self.context(), None);
 log_info!(logger, "Failed interactive transaction negotiation: {reason}");

 let splice_funding_failed = match &mut self.phase {
 let (splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => None,
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 (None, false)
 },
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 pending_v2_channel.interactive_tx_constructor.take();
 None
(None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.should_reset_pending_splice_state(false) {
 funded_channel.reset_pending_splice_state()
(funded_channel.reset_pending_splice_state(), true)
 } else {
 debug_assert!(false, "We should never fail an interactive funding negotiation once we're exchanging tx_signatures");
 None
(None, false)
 }
 },
 };

 (ChannelError::Abort(reason), splice_funding_failed)
 InteractiveTxMsgError {
 err: ChannelError::Abort(reason),
 splice_funding_failed,
 exited_quiescence,
 }
	}

	pub fn tx_add_input<L: Logger>(
 &mut self, msg: &msgs::TxAddInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_add_output<L: Logger>(
 &mut self, msg: &msgs::TxAddOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_input<L: Logger>(
 &mut self, msg: &msgs::TxRemoveInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_output<L: Logger>(
 &mut self, msg: &msgs::TxRemoveOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_complete<F: FeeEstimator, L: Logger>(
 &mut self, msg: &msgs::TxComplete, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
	) -> Result<TxCompleteResult, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<TxCompleteResult, InteractiveTxMsgError> {
 let tx_complete_action = match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_complete(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger))?,
 None => {
 let err = "Received unexpected interactive transaction negotiation message";
 return Err((ChannelError::WarnAndDisconnect(err.to_owned()), None));
 return Err(InteractiveTxMsgError {
 err: ChannelError::WarnAndDisconnect(err.to_owned()),
 splice_funding_failed: None,
 exited_quiescence: false,
 });
 },
 };

Expand DownExpand Up@@ -2003,13 +2029,13 @@ where

	pub fn tx_abort<L: Logger>(
 &mut self, msg: &msgs::TxAbort, logger: &L,
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>), ChannelError> {
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>, bool), ChannelError> {
 // If we have not sent a `tx_abort` message for this negotiation previously, we need to echo
 // back a tx_abort message according to the spec:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L560-L561
 // For rationale why we echo back `tx_abort`:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L578-L580
 let (should_ack, splice_funding_failed) = match &mut self.phase {
 let (should_ack, splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 let err = "Got an unexpected tx_abort message: This is an unfunded channel created with V1 channel establishment";
Expand All@@ -2018,7 +2044,7 @@ where
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 let had_constructor =
 pending_v2_channel.interactive_tx_constructor.take().is_some();
 (had_constructor, None)
 (had_constructor, None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.has_pending_splice_awaiting_signatures()
Expand DownExpand Up@@ -2046,11 +2072,11 @@ where
 .unwrap_or(false);
 debug_assert!(has_funding_negotiation);
 let splice_funding_failed = funded_channel.reset_pending_splice_state();
 (true, splice_funding_failed)
 (true, splice_funding_failed, true)
 } else {
 // We were not tracking the pending funding negotiation state anymore, likely
 // due to a disconnection or already having sent our own `tx_abort`.
 (false, None)
 (false, None, false)
 }
 },
 };
Expand All@@ -2066,7 +2092,7 @@ where
 }
 });

 Ok((tx_abort, splice_funding_failed))
 Ok((tx_abort, splice_funding_failed, exited_quiescence))
	}

	#[rustfmt::skip]
Expand Down
Loading
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
Free holding cell in remaining quiescence-exit code paths#4415

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 6 commits into

from

Feb 18, 2026
 Merged


Free holding cell in remaining quiescence-exit code paths
#4415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ac0f53f

Free holding cell upon handling an invalid interactive-tx message


wpaulino Feb 12, 2026
2665465

Free holding cell upon handling a counterparty tx_abort


wpaulino Feb 12, 2026
3e8b060

Free holding cell upon tx_signatures exchange


wpaulino Feb 12, 2026
c9827fc

Avoid persisting ChannelManager on handle_tx_* errors


wpaulino Feb 12, 2026
f6ea33e

Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer


wpaulino Feb 12, 2026
1b8617c

Bind Channel::commitment_signed result in internal_commitment_signed


wpaulino Feb 12, 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


96 changes: 61 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,6 +1204,18 @@ pub enum UpdateFulfillCommitFetch {
	DuplicateClaim {},
}

/// Error returned when processing an invalid interactive-tx message from our counterparty.
pub(super) struct InteractiveTxMsgError {
	/// The underlying error.
	pub(super) err: ChannelError,
	/// If a splice was in progress when processing the message, this contains the splice funding
	/// information for emitting a `SpliceFailed` event.
	pub(super) splice_funding_failed: Option<SpliceFundingFailed>,
	/// Whether we were quiescent when we received the message, and are no longer due to aborting
	/// the session.
	pub(super) exited_quiescence: bool,
}

/// The return value of `monitor_updating_restored`
pub(super) struct MonitorRestoreUpdates {
	pub raa: Option<msgs::RevokeAndACK>,
Expand DownExpand Up@@ -1846,104 +1858,118 @@ where

	fn fail_interactive_tx_negotiation<L: Logger>(
 &mut self, reason: AbortReason, logger: &L,
	) -> (ChannelError, Option<SpliceFundingFailed>) {
	) -> InteractiveTxMsgError {
 let logger = WithChannelContext::from(logger, &self.context(), None);
 log_info!(logger, "Failed interactive transaction negotiation: {reason}");

 let splice_funding_failed = match &mut self.phase {
 let (splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => None,
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 (None, false)
 },
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 pending_v2_channel.interactive_tx_constructor.take();
 None
(None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.should_reset_pending_splice_state(false) {
 funded_channel.reset_pending_splice_state()
(funded_channel.reset_pending_splice_state(), true)
 } else {
 debug_assert!(false, "We should never fail an interactive funding negotiation once we're exchanging tx_signatures");
 None
(None, false)
 }
 },
 };

 (ChannelError::Abort(reason), splice_funding_failed)
 InteractiveTxMsgError {
 err: ChannelError::Abort(reason),
 splice_funding_failed,
 exited_quiescence,
 }
	}

	pub fn tx_add_input<L: Logger>(
 &mut self, msg: &msgs::TxAddInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_add_output<L: Logger>(
 &mut self, msg: &msgs::TxAddOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_input<L: Logger>(
 &mut self, msg: &msgs::TxRemoveInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_output<L: Logger>(
 &mut self, msg: &msgs::TxRemoveOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_complete<F: FeeEstimator, L: Logger>(
 &mut self, msg: &msgs::TxComplete, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
	) -> Result<TxCompleteResult, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<TxCompleteResult, InteractiveTxMsgError> {
 let tx_complete_action = match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_complete(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger))?,
 None => {
 let err = "Received unexpected interactive transaction negotiation message";
 return Err((ChannelError::WarnAndDisconnect(err.to_owned()), None));
 return Err(InteractiveTxMsgError {
 err: ChannelError::WarnAndDisconnect(err.to_owned()),
 splice_funding_failed: None,
 exited_quiescence: false,
 });
 },
 };

Expand DownExpand Up@@ -2003,13 +2029,13 @@ where

	pub fn tx_abort<L: Logger>(
 &mut self, msg: &msgs::TxAbort, logger: &L,
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>), ChannelError> {
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>, bool), ChannelError> {
 // If we have not sent a `tx_abort` message for this negotiation previously, we need to echo
 // back a tx_abort message according to the spec:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L560-L561
 // For rationale why we echo back `tx_abort`:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L578-L580
 let (should_ack, splice_funding_failed) = match &mut self.phase {
 let (should_ack, splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 let err = "Got an unexpected tx_abort message: This is an unfunded channel created with V1 channel establishment";
Expand All@@ -2018,7 +2044,7 @@ where
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 let had_constructor =
 pending_v2_channel.interactive_tx_constructor.take().is_some();
 (had_constructor, None)
 (had_constructor, None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.has_pending_splice_awaiting_signatures()
Expand DownExpand Up@@ -2046,11 +2072,11 @@ where
 .unwrap_or(false);
 debug_assert!(has_funding_negotiation);
 let splice_funding_failed = funded_channel.reset_pending_splice_state();
 (true, splice_funding_failed)
 (true, splice_funding_failed, true)
 } else {
 // We were not tracking the pending funding negotiation state anymore, likely
 // due to a disconnection or already having sent our own `tx_abort`.
 (false, None)
 (false, None, false)
 }
 },
 };
Expand All@@ -2066,7 +2092,7 @@ where
 }
 });

 Ok((tx_abort, splice_funding_failed))
 Ok((tx_abort, splice_funding_failed, exited_quiescence))
	}

	#[rustfmt::skip]
Expand Down
Loading
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
Free holding cell in remaining quiescence-exit code paths#4415

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 6 commits into

from

Feb 18, 2026
 Merged


Free holding cell in remaining quiescence-exit code paths
#4415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ac0f53f

Free holding cell upon handling an invalid interactive-tx message


wpaulino Feb 12, 2026
2665465

Free holding cell upon handling a counterparty tx_abort


wpaulino Feb 12, 2026
3e8b060

Free holding cell upon tx_signatures exchange


wpaulino Feb 12, 2026
c9827fc

Avoid persisting ChannelManager on handle_tx_* errors


wpaulino Feb 12, 2026
f6ea33e

Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer


wpaulino Feb 12, 2026
1b8617c

Bind Channel::commitment_signed result in internal_commitment_signed


wpaulino Feb 12, 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


96 changes: 61 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,6 +1204,18 @@ pub enum UpdateFulfillCommitFetch {
	DuplicateClaim {},
}

/// Error returned when processing an invalid interactive-tx message from our counterparty.
pub(super) struct InteractiveTxMsgError {
	/// The underlying error.
	pub(super) err: ChannelError,
	/// If a splice was in progress when processing the message, this contains the splice funding
	/// information for emitting a `SpliceFailed` event.
	pub(super) splice_funding_failed: Option<SpliceFundingFailed>,
	/// Whether we were quiescent when we received the message, and are no longer due to aborting
	/// the session.
	pub(super) exited_quiescence: bool,
}

/// The return value of `monitor_updating_restored`
pub(super) struct MonitorRestoreUpdates {
	pub raa: Option<msgs::RevokeAndACK>,
Expand DownExpand Up@@ -1846,104 +1858,118 @@ where

	fn fail_interactive_tx_negotiation<L: Logger>(
 &mut self, reason: AbortReason, logger: &L,
	) -> (ChannelError, Option<SpliceFundingFailed>) {
	) -> InteractiveTxMsgError {
 let logger = WithChannelContext::from(logger, &self.context(), None);
 log_info!(logger, "Failed interactive transaction negotiation: {reason}");

 let splice_funding_failed = match &mut self.phase {
 let (splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => None,
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 (None, false)
 },
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 pending_v2_channel.interactive_tx_constructor.take();
 None
(None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.should_reset_pending_splice_state(false) {
 funded_channel.reset_pending_splice_state()
(funded_channel.reset_pending_splice_state(), true)
 } else {
 debug_assert!(false, "We should never fail an interactive funding negotiation once we're exchanging tx_signatures");
 None
(None, false)
 }
 },
 };

 (ChannelError::Abort(reason), splice_funding_failed)
 InteractiveTxMsgError {
 err: ChannelError::Abort(reason),
 splice_funding_failed,
 exited_quiescence,
 }
	}

	pub fn tx_add_input<L: Logger>(
 &mut self, msg: &msgs::TxAddInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_add_output<L: Logger>(
 &mut self, msg: &msgs::TxAddOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_input<L: Logger>(
 &mut self, msg: &msgs::TxRemoveInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_output<L: Logger>(
 &mut self, msg: &msgs::TxRemoveOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_complete<F: FeeEstimator, L: Logger>(
 &mut self, msg: &msgs::TxComplete, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
	) -> Result<TxCompleteResult, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<TxCompleteResult, InteractiveTxMsgError> {
 let tx_complete_action = match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_complete(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger))?,
 None => {
 let err = "Received unexpected interactive transaction negotiation message";
 return Err((ChannelError::WarnAndDisconnect(err.to_owned()), None));
 return Err(InteractiveTxMsgError {
 err: ChannelError::WarnAndDisconnect(err.to_owned()),
 splice_funding_failed: None,
 exited_quiescence: false,
 });
 },
 };

Expand DownExpand Up@@ -2003,13 +2029,13 @@ where

	pub fn tx_abort<L: Logger>(
 &mut self, msg: &msgs::TxAbort, logger: &L,
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>), ChannelError> {
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>, bool), ChannelError> {
 // If we have not sent a `tx_abort` message for this negotiation previously, we need to echo
 // back a tx_abort message according to the spec:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L560-L561
 // For rationale why we echo back `tx_abort`:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L578-L580
 let (should_ack, splice_funding_failed) = match &mut self.phase {
 let (should_ack, splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 let err = "Got an unexpected tx_abort message: This is an unfunded channel created with V1 channel establishment";
Expand All@@ -2018,7 +2044,7 @@ where
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 let had_constructor =
 pending_v2_channel.interactive_tx_constructor.take().is_some();
 (had_constructor, None)
 (had_constructor, None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.has_pending_splice_awaiting_signatures()
Expand DownExpand Up@@ -2046,11 +2072,11 @@ where
 .unwrap_or(false);
 debug_assert!(has_funding_negotiation);
 let splice_funding_failed = funded_channel.reset_pending_splice_state();
 (true, splice_funding_failed)
 (true, splice_funding_failed, true)
 } else {
 // We were not tracking the pending funding negotiation state anymore, likely
 // due to a disconnection or already having sent our own `tx_abort`.
 (false, None)
 (false, None, false)
 }
 },
 };
Expand All@@ -2066,7 +2092,7 @@ where
 }
 });

 Ok((tx_abort, splice_funding_failed))
 Ok((tx_abort, splice_funding_failed, exited_quiescence))
	}

	#[rustfmt::skip]
Expand Down
Loading
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
Free holding cell in remaining quiescence-exit code paths#4415

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 6 commits into

from

Feb 18, 2026
 Merged


Free holding cell in remaining quiescence-exit code paths
#4415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ac0f53f

Free holding cell upon handling an invalid interactive-tx message


wpaulino Feb 12, 2026
2665465

Free holding cell upon handling a counterparty tx_abort


wpaulino Feb 12, 2026
3e8b060

Free holding cell upon tx_signatures exchange


wpaulino Feb 12, 2026
c9827fc

Avoid persisting ChannelManager on handle_tx_* errors


wpaulino Feb 12, 2026
f6ea33e

Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer


wpaulino Feb 12, 2026
1b8617c

Bind Channel::commitment_signed result in internal_commitment_signed


wpaulino Feb 12, 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


96 changes: 61 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,6 +1204,18 @@ pub enum UpdateFulfillCommitFetch {
	DuplicateClaim {},
}

/// Error returned when processing an invalid interactive-tx message from our counterparty.
pub(super) struct InteractiveTxMsgError {
	/// The underlying error.
	pub(super) err: ChannelError,
	/// If a splice was in progress when processing the message, this contains the splice funding
	/// information for emitting a `SpliceFailed` event.
	pub(super) splice_funding_failed: Option<SpliceFundingFailed>,
	/// Whether we were quiescent when we received the message, and are no longer due to aborting
	/// the session.
	pub(super) exited_quiescence: bool,
}

/// The return value of `monitor_updating_restored`
pub(super) struct MonitorRestoreUpdates {
	pub raa: Option<msgs::RevokeAndACK>,
Expand DownExpand Up@@ -1846,104 +1858,118 @@ where

	fn fail_interactive_tx_negotiation<L: Logger>(
 &mut self, reason: AbortReason, logger: &L,
	) -> (ChannelError, Option<SpliceFundingFailed>) {
	) -> InteractiveTxMsgError {
 let logger = WithChannelContext::from(logger, &self.context(), None);
 log_info!(logger, "Failed interactive transaction negotiation: {reason}");

 let splice_funding_failed = match &mut self.phase {
 let (splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => None,
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 (None, false)
 },
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 pending_v2_channel.interactive_tx_constructor.take();
 None
(None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.should_reset_pending_splice_state(false) {
 funded_channel.reset_pending_splice_state()
(funded_channel.reset_pending_splice_state(), true)
 } else {
 debug_assert!(false, "We should never fail an interactive funding negotiation once we're exchanging tx_signatures");
 None
(None, false)
 }
 },
 };

 (ChannelError::Abort(reason), splice_funding_failed)
 InteractiveTxMsgError {
 err: ChannelError::Abort(reason),
 splice_funding_failed,
 exited_quiescence,
 }
	}

	pub fn tx_add_input<L: Logger>(
 &mut self, msg: &msgs::TxAddInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_add_output<L: Logger>(
 &mut self, msg: &msgs::TxAddOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_input<L: Logger>(
 &mut self, msg: &msgs::TxRemoveInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_output<L: Logger>(
 &mut self, msg: &msgs::TxRemoveOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_complete<F: FeeEstimator, L: Logger>(
 &mut self, msg: &msgs::TxComplete, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
	) -> Result<TxCompleteResult, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<TxCompleteResult, InteractiveTxMsgError> {
 let tx_complete_action = match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_complete(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger))?,
 None => {
 let err = "Received unexpected interactive transaction negotiation message";
 return Err((ChannelError::WarnAndDisconnect(err.to_owned()), None));
 return Err(InteractiveTxMsgError {
 err: ChannelError::WarnAndDisconnect(err.to_owned()),
 splice_funding_failed: None,
 exited_quiescence: false,
 });
 },
 };

Expand DownExpand Up@@ -2003,13 +2029,13 @@ where

	pub fn tx_abort<L: Logger>(
 &mut self, msg: &msgs::TxAbort, logger: &L,
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>), ChannelError> {
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>, bool), ChannelError> {
 // If we have not sent a `tx_abort` message for this negotiation previously, we need to echo
 // back a tx_abort message according to the spec:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L560-L561
 // For rationale why we echo back `tx_abort`:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L578-L580
 let (should_ack, splice_funding_failed) = match &mut self.phase {
 let (should_ack, splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 let err = "Got an unexpected tx_abort message: This is an unfunded channel created with V1 channel establishment";
Expand All@@ -2018,7 +2044,7 @@ where
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 let had_constructor =
 pending_v2_channel.interactive_tx_constructor.take().is_some();
 (had_constructor, None)
 (had_constructor, None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.has_pending_splice_awaiting_signatures()
Expand DownExpand Up@@ -2046,11 +2072,11 @@ where
 .unwrap_or(false);
 debug_assert!(has_funding_negotiation);
 let splice_funding_failed = funded_channel.reset_pending_splice_state();
 (true, splice_funding_failed)
 (true, splice_funding_failed, true)
 } else {
 // We were not tracking the pending funding negotiation state anymore, likely
 // due to a disconnection or already having sent our own `tx_abort`.
 (false, None)
 (false, None, false)
 }
 },
 };
Expand All@@ -2066,7 +2092,7 @@ where
 }
 });

 Ok((tx_abort, splice_funding_failed))
 Ok((tx_abort, splice_funding_failed, exited_quiescence))
	}

	#[rustfmt::skip]
Expand Down
Loading
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
Free holding cell in remaining quiescence-exit code paths#4415

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 6 commits into

from

Feb 18, 2026
 Merged


Free holding cell in remaining quiescence-exit code paths
#4415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ac0f53f

Free holding cell upon handling an invalid interactive-tx message


wpaulino Feb 12, 2026
2665465

Free holding cell upon handling a counterparty tx_abort


wpaulino Feb 12, 2026
3e8b060

Free holding cell upon tx_signatures exchange


wpaulino Feb 12, 2026
c9827fc

Avoid persisting ChannelManager on handle_tx_* errors


wpaulino Feb 12, 2026
f6ea33e

Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer


wpaulino Feb 12, 2026
1b8617c

Bind Channel::commitment_signed result in internal_commitment_signed


wpaulino Feb 12, 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


96 changes: 61 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,6 +1204,18 @@ pub enum UpdateFulfillCommitFetch {
	DuplicateClaim {},
}

/// Error returned when processing an invalid interactive-tx message from our counterparty.
pub(super) struct InteractiveTxMsgError {
	/// The underlying error.
	pub(super) err: ChannelError,
	/// If a splice was in progress when processing the message, this contains the splice funding
	/// information for emitting a `SpliceFailed` event.
	pub(super) splice_funding_failed: Option<SpliceFundingFailed>,
	/// Whether we were quiescent when we received the message, and are no longer due to aborting
	/// the session.
	pub(super) exited_quiescence: bool,
}

/// The return value of `monitor_updating_restored`
pub(super) struct MonitorRestoreUpdates {
	pub raa: Option<msgs::RevokeAndACK>,
Expand DownExpand Up@@ -1846,104 +1858,118 @@ where

	fn fail_interactive_tx_negotiation<L: Logger>(
 &mut self, reason: AbortReason, logger: &L,
	) -> (ChannelError, Option<SpliceFundingFailed>) {
	) -> InteractiveTxMsgError {
 let logger = WithChannelContext::from(logger, &self.context(), None);
 log_info!(logger, "Failed interactive transaction negotiation: {reason}");

 let splice_funding_failed = match &mut self.phase {
 let (splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => None,
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 (None, false)
 },
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 pending_v2_channel.interactive_tx_constructor.take();
 None
(None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.should_reset_pending_splice_state(false) {
 funded_channel.reset_pending_splice_state()
(funded_channel.reset_pending_splice_state(), true)
 } else {
 debug_assert!(false, "We should never fail an interactive funding negotiation once we're exchanging tx_signatures");
 None
(None, false)
 }
 },
 };

 (ChannelError::Abort(reason), splice_funding_failed)
 InteractiveTxMsgError {
 err: ChannelError::Abort(reason),
 splice_funding_failed,
 exited_quiescence,
 }
	}

	pub fn tx_add_input<L: Logger>(
 &mut self, msg: &msgs::TxAddInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_add_output<L: Logger>(
 &mut self, msg: &msgs::TxAddOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_input<L: Logger>(
 &mut self, msg: &msgs::TxRemoveInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_output<L: Logger>(
 &mut self, msg: &msgs::TxRemoveOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_complete<F: FeeEstimator, L: Logger>(
 &mut self, msg: &msgs::TxComplete, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
	) -> Result<TxCompleteResult, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<TxCompleteResult, InteractiveTxMsgError> {
 let tx_complete_action = match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_complete(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger))?,
 None => {
 let err = "Received unexpected interactive transaction negotiation message";
 return Err((ChannelError::WarnAndDisconnect(err.to_owned()), None));
 return Err(InteractiveTxMsgError {
 err: ChannelError::WarnAndDisconnect(err.to_owned()),
 splice_funding_failed: None,
 exited_quiescence: false,
 });
 },
 };

Expand DownExpand Up@@ -2003,13 +2029,13 @@ where

	pub fn tx_abort<L: Logger>(
 &mut self, msg: &msgs::TxAbort, logger: &L,
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>), ChannelError> {
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>, bool), ChannelError> {
 // If we have not sent a `tx_abort` message for this negotiation previously, we need to echo
 // back a tx_abort message according to the spec:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L560-L561
 // For rationale why we echo back `tx_abort`:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L578-L580
 let (should_ack, splice_funding_failed) = match &mut self.phase {
 let (should_ack, splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 let err = "Got an unexpected tx_abort message: This is an unfunded channel created with V1 channel establishment";
Expand All@@ -2018,7 +2044,7 @@ where
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 let had_constructor =
 pending_v2_channel.interactive_tx_constructor.take().is_some();
 (had_constructor, None)
 (had_constructor, None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.has_pending_splice_awaiting_signatures()
Expand DownExpand Up@@ -2046,11 +2072,11 @@ where
 .unwrap_or(false);
 debug_assert!(has_funding_negotiation);
 let splice_funding_failed = funded_channel.reset_pending_splice_state();
 (true, splice_funding_failed)
 (true, splice_funding_failed, true)
 } else {
 // We were not tracking the pending funding negotiation state anymore, likely
 // due to a disconnection or already having sent our own `tx_abort`.
 (false, None)
 (false, None, false)
 }
 },
 };
Expand All@@ -2066,7 +2092,7 @@ where
 }
 });

 Ok((tx_abort, splice_funding_failed))
 Ok((tx_abort, splice_funding_failed, exited_quiescence))
	}

	#[rustfmt::skip]
Expand Down
Loading
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
Free holding cell in remaining quiescence-exit code paths#4415

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 6 commits into

from

Feb 18, 2026
 Merged


Free holding cell in remaining quiescence-exit code paths
#4415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ac0f53f

Free holding cell upon handling an invalid interactive-tx message


wpaulino Feb 12, 2026
2665465

Free holding cell upon handling a counterparty tx_abort


wpaulino Feb 12, 2026
3e8b060

Free holding cell upon tx_signatures exchange


wpaulino Feb 12, 2026
c9827fc

Avoid persisting ChannelManager on handle_tx_* errors


wpaulino Feb 12, 2026
f6ea33e

Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer


wpaulino Feb 12, 2026
1b8617c

Bind Channel::commitment_signed result in internal_commitment_signed


wpaulino Feb 12, 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


96 changes: 61 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,6 +1204,18 @@ pub enum UpdateFulfillCommitFetch {
	DuplicateClaim {},
}

/// Error returned when processing an invalid interactive-tx message from our counterparty.
pub(super) struct InteractiveTxMsgError {
	/// The underlying error.
	pub(super) err: ChannelError,
	/// If a splice was in progress when processing the message, this contains the splice funding
	/// information for emitting a `SpliceFailed` event.
	pub(super) splice_funding_failed: Option<SpliceFundingFailed>,
	/// Whether we were quiescent when we received the message, and are no longer due to aborting
	/// the session.
	pub(super) exited_quiescence: bool,
}

/// The return value of `monitor_updating_restored`
pub(super) struct MonitorRestoreUpdates {
	pub raa: Option<msgs::RevokeAndACK>,
Expand DownExpand Up@@ -1846,104 +1858,118 @@ where

	fn fail_interactive_tx_negotiation<L: Logger>(
 &mut self, reason: AbortReason, logger: &L,
	) -> (ChannelError, Option<SpliceFundingFailed>) {
	) -> InteractiveTxMsgError {
 let logger = WithChannelContext::from(logger, &self.context(), None);
 log_info!(logger, "Failed interactive transaction negotiation: {reason}");

 let splice_funding_failed = match &mut self.phase {
 let (splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => None,
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 (None, false)
 },
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 pending_v2_channel.interactive_tx_constructor.take();
 None
(None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.should_reset_pending_splice_state(false) {
 funded_channel.reset_pending_splice_state()
(funded_channel.reset_pending_splice_state(), true)
 } else {
 debug_assert!(false, "We should never fail an interactive funding negotiation once we're exchanging tx_signatures");
 None
(None, false)
 }
 },
 };

 (ChannelError::Abort(reason), splice_funding_failed)
 InteractiveTxMsgError {
 err: ChannelError::Abort(reason),
 splice_funding_failed,
 exited_quiescence,
 }
	}

	pub fn tx_add_input<L: Logger>(
 &mut self, msg: &msgs::TxAddInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_add_output<L: Logger>(
 &mut self, msg: &msgs::TxAddOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_input<L: Logger>(
 &mut self, msg: &msgs::TxRemoveInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_output<L: Logger>(
 &mut self, msg: &msgs::TxRemoveOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_complete<F: FeeEstimator, L: Logger>(
 &mut self, msg: &msgs::TxComplete, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
	) -> Result<TxCompleteResult, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<TxCompleteResult, InteractiveTxMsgError> {
 let tx_complete_action = match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_complete(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger))?,
 None => {
 let err = "Received unexpected interactive transaction negotiation message";
 return Err((ChannelError::WarnAndDisconnect(err.to_owned()), None));
 return Err(InteractiveTxMsgError {
 err: ChannelError::WarnAndDisconnect(err.to_owned()),
 splice_funding_failed: None,
 exited_quiescence: false,
 });
 },
 };

Expand DownExpand Up@@ -2003,13 +2029,13 @@ where

	pub fn tx_abort<L: Logger>(
 &mut self, msg: &msgs::TxAbort, logger: &L,
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>), ChannelError> {
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>, bool), ChannelError> {
 // If we have not sent a `tx_abort` message for this negotiation previously, we need to echo
 // back a tx_abort message according to the spec:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L560-L561
 // For rationale why we echo back `tx_abort`:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L578-L580
 let (should_ack, splice_funding_failed) = match &mut self.phase {
 let (should_ack, splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 let err = "Got an unexpected tx_abort message: This is an unfunded channel created with V1 channel establishment";
Expand All@@ -2018,7 +2044,7 @@ where
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 let had_constructor =
 pending_v2_channel.interactive_tx_constructor.take().is_some();
 (had_constructor, None)
 (had_constructor, None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.has_pending_splice_awaiting_signatures()
Expand DownExpand Up@@ -2046,11 +2072,11 @@ where
 .unwrap_or(false);
 debug_assert!(has_funding_negotiation);
 let splice_funding_failed = funded_channel.reset_pending_splice_state();
 (true, splice_funding_failed)
 (true, splice_funding_failed, true)
 } else {
 // We were not tracking the pending funding negotiation state anymore, likely
 // due to a disconnection or already having sent our own `tx_abort`.
 (false, None)
 (false, None, false)
 }
 },
 };
Expand All@@ -2066,7 +2092,7 @@ where
 }
 });

 Ok((tx_abort, splice_funding_failed))
 Ok((tx_abort, splice_funding_failed, exited_quiescence))
	}

	#[rustfmt::skip]
Expand Down
Loading
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
Free holding cell in remaining quiescence-exit code paths#4415

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 6 commits into

from

Feb 18, 2026
 Merged


Free holding cell in remaining quiescence-exit code paths
#4415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ac0f53f

Free holding cell upon handling an invalid interactive-tx message


wpaulino Feb 12, 2026
2665465

Free holding cell upon handling a counterparty tx_abort


wpaulino Feb 12, 2026
3e8b060

Free holding cell upon tx_signatures exchange


wpaulino Feb 12, 2026
c9827fc

Avoid persisting ChannelManager on handle_tx_* errors


wpaulino Feb 12, 2026
f6ea33e

Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer


wpaulino Feb 12, 2026
1b8617c

Bind Channel::commitment_signed result in internal_commitment_signed


wpaulino Feb 12, 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


96 changes: 61 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,6 +1204,18 @@ pub enum UpdateFulfillCommitFetch {
	DuplicateClaim {},
}

/// Error returned when processing an invalid interactive-tx message from our counterparty.
pub(super) struct InteractiveTxMsgError {
	/// The underlying error.
	pub(super) err: ChannelError,
	/// If a splice was in progress when processing the message, this contains the splice funding
	/// information for emitting a `SpliceFailed` event.
	pub(super) splice_funding_failed: Option<SpliceFundingFailed>,
	/// Whether we were quiescent when we received the message, and are no longer due to aborting
	/// the session.
	pub(super) exited_quiescence: bool,
}

/// The return value of `monitor_updating_restored`
pub(super) struct MonitorRestoreUpdates {
	pub raa: Option<msgs::RevokeAndACK>,
Expand DownExpand Up@@ -1846,104 +1858,118 @@ where

	fn fail_interactive_tx_negotiation<L: Logger>(
 &mut self, reason: AbortReason, logger: &L,
	) -> (ChannelError, Option<SpliceFundingFailed>) {
	) -> InteractiveTxMsgError {
 let logger = WithChannelContext::from(logger, &self.context(), None);
 log_info!(logger, "Failed interactive transaction negotiation: {reason}");

 let splice_funding_failed = match &mut self.phase {
 let (splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => None,
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 (None, false)
 },
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 pending_v2_channel.interactive_tx_constructor.take();
 None
(None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.should_reset_pending_splice_state(false) {
 funded_channel.reset_pending_splice_state()
(funded_channel.reset_pending_splice_state(), true)
 } else {
 debug_assert!(false, "We should never fail an interactive funding negotiation once we're exchanging tx_signatures");
 None
(None, false)
 }
 },
 };

 (ChannelError::Abort(reason), splice_funding_failed)
 InteractiveTxMsgError {
 err: ChannelError::Abort(reason),
 splice_funding_failed,
 exited_quiescence,
 }
	}

	pub fn tx_add_input<L: Logger>(
 &mut self, msg: &msgs::TxAddInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_add_output<L: Logger>(
 &mut self, msg: &msgs::TxAddOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_add_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_input<L: Logger>(
 &mut self, msg: &msgs::TxRemoveInput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_input(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_remove_output<L: Logger>(
 &mut self, msg: &msgs::TxRemoveOutput, logger: &L,
	) -> Result<InteractiveTxMessageSend, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<InteractiveTxMessageSend, InteractiveTxMsgError> {
 match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_remove_output(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger)),
 None => Err((
 ChannelError::WarnAndDisconnect(
 None => Err(InteractiveTxMsgError {
err: ChannelError::WarnAndDisconnect(
 "Received unexpected interactive transaction negotiation message".to_owned(),
 ),
 None,
 )),
 splice_funding_failed: None,
 exited_quiescence: false,
 }),
 }
	}

	pub fn tx_complete<F: FeeEstimator, L: Logger>(
 &mut self, msg: &msgs::TxComplete, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
	) -> Result<TxCompleteResult, (ChannelError, Option<SpliceFundingFailed>)> {
	) -> Result<TxCompleteResult, InteractiveTxMsgError> {
 let tx_complete_action = match self.interactive_tx_constructor_mut() {
 Some(interactive_tx_constructor) => interactive_tx_constructor
 .handle_tx_complete(msg)
 .map_err(|reason| self.fail_interactive_tx_negotiation(reason, logger))?,
 None => {
 let err = "Received unexpected interactive transaction negotiation message";
 return Err((ChannelError::WarnAndDisconnect(err.to_owned()), None));
 return Err(InteractiveTxMsgError {
 err: ChannelError::WarnAndDisconnect(err.to_owned()),
 splice_funding_failed: None,
 exited_quiescence: false,
 });
 },
 };

Expand DownExpand Up@@ -2003,13 +2029,13 @@ where

	pub fn tx_abort<L: Logger>(
 &mut self, msg: &msgs::TxAbort, logger: &L,
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>), ChannelError> {
	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>, bool), ChannelError> {
 // If we have not sent a `tx_abort` message for this negotiation previously, we need to echo
 // back a tx_abort message according to the spec:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L560-L561
 // For rationale why we echo back `tx_abort`:
 // https://github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L578-L580
 let (should_ack, splice_funding_failed) = match &mut self.phase {
 let (should_ack, splice_funding_failed, exited_quiescence) = match &mut self.phase {
 ChannelPhase::Undefined => unreachable!(),
 ChannelPhase::UnfundedOutboundV1(_) | ChannelPhase::UnfundedInboundV1(_) => {
 let err = "Got an unexpected tx_abort message: This is an unfunded channel created with V1 channel establishment";
Expand All@@ -2018,7 +2044,7 @@ where
 ChannelPhase::UnfundedV2(pending_v2_channel) => {
 let had_constructor =
 pending_v2_channel.interactive_tx_constructor.take().is_some();
 (had_constructor, None)
 (had_constructor, None, false)
 },
 ChannelPhase::Funded(funded_channel) => {
 if funded_channel.has_pending_splice_awaiting_signatures()
Expand DownExpand Up@@ -2046,11 +2072,11 @@ where
 .unwrap_or(false);
 debug_assert!(has_funding_negotiation);
 let splice_funding_failed = funded_channel.reset_pending_splice_state();
 (true, splice_funding_failed)
 (true, splice_funding_failed, true)
 } else {
 // We were not tracking the pending funding negotiation state anymore, likely
 // due to a disconnection or already having sent our own `tx_abort`.
 (false, None)
 (false, None, false)
 }
 },
 };
Expand All@@ -2066,7 +2092,7 @@ where
 }
 });

 Ok((tx_abort, splice_funding_failed))
 Ok((tx_abort, splice_funding_failed, exited_quiescence))
	}

	#[rustfmt::skip]
Expand Down
Loading
Loading