Skip to content

Clean Up Funding Error Handling and shutdown#2809

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
Jan 10, 2024
Merged

Clean Up Funding Error Handling and shutdown #2809

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
396c36b
Consider `MONITOR_UPDATE_IN_PROGRESS` as unbroadcasted funding
TheBlueMatt Dec 29, 2023
ee5b8c7
Move DiscardFunding generation into finish_close_channel
TheBlueMatt Dec 29, 2023
080865d
Move ChannelClosed generation into finish_close_channel
TheBlueMatt Dec 29, 2023
bfe911d
Drop now-unused fields from `MsgHandleErrInternal`
TheBlueMatt Dec 29, 2023
5eea305
Do not panic if a peer learns our funding info before we fund
TheBlueMatt Dec 26, 2023
7bc2a14
Fix handling of duplicate initial `ChannelMonitor` writing
TheBlueMatt Dec 25, 2023
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
35 changes: 27 additions & 8 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -814,6 +814,7 @@ pub(super) struct ReestablishResponses {
/// The result of a shutdown that should be handled.
#[must_use]
pub(crate) struct ShutdownResult {
pub(crate) closure_reason: ClosureReason,
/// A channel monitor update to apply.
pub(crate) monitor_update: Option<(PublicKey, OutPoint, ChannelMonitorUpdate)>,
/// A list of dropped outbound HTLCs that can safely be failed backwards immediately.
Expand All@@ -822,7 +823,10 @@ pub(crate) struct ShutdownResult {
/// propagated to the remainder of the batch.
pub(crate) unbroadcasted_batch_funding_txid: Option<Txid>,
pub(crate) channel_id: ChannelId,
pub(crate) user_channel_id: u128,
pub(crate) channel_capacity_satoshis: u64,
pub(crate) counterparty_node_id: PublicKey,
pub(crate) unbroadcasted_funding_tx: Option<Transaction>,
}

/// If the majority of the channels funds are to the fundee and the initiator holds only just
Expand DownExpand Up@@ -2316,15 +2320,17 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
res
}

fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O>
where F: Fn() -> Option<O> {
fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O> where F: Fn() -> Option<O> {
match self.channel_state {
ChannelState::FundingNegotiated => f(),
ChannelState::AwaitingChannelReady(flags) => if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) {
f()
} else {
None
},
ChannelState::AwaitingChannelReady(flags) =>
if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) ||
flags.is_set(FundedStateFlags::MONITOR_UPDATE_IN_PROGRESS.into())
{
f()
} else {
None
},
_ => None,
}
}
Expand DownExpand Up@@ -2359,7 +2365,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
/// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
/// Also returns the list of payment_hashes for channels which we can safely fail backwards
/// immediately (others we will have to allow to time out).
pub fn force_shutdown(&mut self, should_broadcast: bool) -> ShutdownResult {
pub fn force_shutdown(&mut self, should_broadcast: bool, closure_reason: ClosureReason) -> ShutdownResult {
// Note that we MUST only generate a monitor update that indicates force-closure - we're
// called during initialization prior to the chain_monitor in the encompassing ChannelManager
// being fully configured in some cases. Thus, its likely any monitor events we generate will
Expand DownExpand Up@@ -2400,15 +2406,20 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
} else { None }
} else { None };
let unbroadcasted_batch_funding_txid = self.unbroadcasted_batch_funding_txid();
let unbroadcasted_funding_tx = self.unbroadcasted_funding();

self.channel_state = ChannelState::ShutdownComplete;
self.update_time_counter += 1;
ShutdownResult {
closure_reason,
monitor_update,
dropped_outbound_htlcs,
unbroadcasted_batch_funding_txid,
channel_id: self.channel_id,
user_channel_id: self.user_id,
channel_capacity_satoshis: self.channel_value_satoshis,
counterparty_node_id: self.counterparty_node_id,
unbroadcasted_funding_tx,
}
}

Expand DownExpand Up@@ -4936,11 +4947,15 @@ impl<SP: Deref> Channel<SP> where
if let Some((last_fee, sig)) = self.context.last_sent_closing_fee {
if last_fee == msg.fee_satoshis {
let shutdown_result = ShutdownResult {
closure_reason: ClosureReason::CooperativeClosure,
monitor_update: None,
dropped_outbound_htlcs: Vec::new(),
unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
channel_id: self.context.channel_id,
user_channel_id: self.context.user_id,
channel_capacity_satoshis: self.context.channel_value_satoshis,
counterparty_node_id: self.context.counterparty_node_id,
unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
};
let tx = self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &sig);
self.context.channel_state = ChannelState::ShutdownComplete;
Expand All@@ -4966,11 +4981,15 @@ impl<SP: Deref> Channel<SP> where
.map_err(|_| ChannelError::Close("External signer refused to sign closing transaction".to_owned()))?;
let (signed_tx, shutdown_result) = if $new_fee == msg.fee_satoshis {
let shutdown_result = ShutdownResult {
closure_reason: ClosureReason::CooperativeClosure,
monitor_update: None,
dropped_outbound_htlcs: Vec::new(),
unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
channel_id: self.context.channel_id,
user_channel_id: self.context.user_id,
channel_capacity_satoshis: self.context.channel_value_satoshis,
counterparty_node_id: self.context.counterparty_node_id,
unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
};
self.context.channel_state = ChannelState::ShutdownComplete;
self.context.update_time_counter += 1;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Clean Up Funding Error Handling and shutdown by TheBlueMatt · Pull Request #2809 · lightningdevkit/rust-lightning · GitHub
Skip to content
Clean Up Funding Error Handling and shutdown#2809

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

Jan 10, 2024
 Merged


Clean Up Funding Error Handling and shutdown
#2809
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
396c36b

Consider `MONITOR_UPDATE_IN_PROGRESS` as unbroadcasted funding


TheBlueMatt Dec 29, 2023
ee5b8c7

Move DiscardFunding generation into finish_close_channel


TheBlueMatt Dec 29, 2023
080865d

Move ChannelClosed generation into finish_close_channel


TheBlueMatt Dec 29, 2023
bfe911d

Drop now-unused fields from `MsgHandleErrInternal`


TheBlueMatt Dec 29, 2023
5eea305

Do not panic if a peer learns our funding info before we fund


TheBlueMatt Dec 26, 2023
7bc2a14

Fix handling of duplicate initial `ChannelMonitor` writing


TheBlueMatt Dec 25, 2023

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


35 changes: 27 additions & 8 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -814,6 +814,7 @@ pub(super) struct ReestablishResponses {
/// The result of a shutdown that should be handled.
#[must_use]
pub(crate) struct ShutdownResult {
	pub(crate) closure_reason: ClosureReason,
	/// A channel monitor update to apply.
	pub(crate) monitor_update: Option<(PublicKey, OutPoint, ChannelMonitorUpdate)>,
	/// A list of dropped outbound HTLCs that can safely be failed backwards immediately.
Expand All@@ -822,7 +823,10 @@ pub(crate) struct ShutdownResult {
	/// propagated to the remainder of the batch.
	pub(crate) unbroadcasted_batch_funding_txid: Option<Txid>,
	pub(crate) channel_id: ChannelId,
	pub(crate) user_channel_id: u128,
	pub(crate) channel_capacity_satoshis: u64,
	pub(crate) counterparty_node_id: PublicKey,
	pub(crate) unbroadcasted_funding_tx: Option<Transaction>,
}

/// If the majority of the channels funds are to the fundee and the initiator holds only just
Expand DownExpand Up@@ -2316,15 +2320,17 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 res
	}

	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O>
 where F: Fn() -> Option<O> {
	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O> where F: Fn() -> Option<O> {
 match self.channel_state {
 ChannelState::FundingNegotiated => f(),
 ChannelState::AwaitingChannelReady(flags) => if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) {
 f()
 } else {
 None
 },
 ChannelState::AwaitingChannelReady(flags) =>
 if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) ||
 flags.is_set(FundedStateFlags::MONITOR_UPDATE_IN_PROGRESS.into())
 {
 f()
 } else {
 None
 },
 _ => None,
 }
	}
Expand DownExpand Up@@ -2359,7 +2365,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
	/// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
	/// Also returns the list of payment_hashes for channels which we can safely fail backwards
	/// immediately (others we will have to allow to time out).
	pub fn force_shutdown(&mut self, should_broadcast: bool) -> ShutdownResult {
	pub fn force_shutdown(&mut self, should_broadcast: bool, closure_reason: ClosureReason) -> ShutdownResult {
 // Note that we MUST only generate a monitor update that indicates force-closure - we're
 // called during initialization prior to the chain_monitor in the encompassing ChannelManager
 // being fully configured in some cases. Thus, its likely any monitor events we generate will
Expand DownExpand Up@@ -2400,15 +2406,20 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 } else { None }
 } else { None };
 let unbroadcasted_batch_funding_txid = self.unbroadcasted_batch_funding_txid();
 let unbroadcasted_funding_tx = self.unbroadcasted_funding();

 self.channel_state = ChannelState::ShutdownComplete;
 self.update_time_counter += 1;
 ShutdownResult {
 closure_reason,
 monitor_update,
 dropped_outbound_htlcs,
 unbroadcasted_batch_funding_txid,
 channel_id: self.channel_id,
 user_channel_id: self.user_id,
 channel_capacity_satoshis: self.channel_value_satoshis,
 counterparty_node_id: self.counterparty_node_id,
 unbroadcasted_funding_tx,
 }
	}

Expand DownExpand Up@@ -4936,11 +4947,15 @@ impl<SP: Deref> Channel<SP> where
 if let Some((last_fee, sig)) = self.context.last_sent_closing_fee {
 if last_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 let tx = self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &sig);
 self.context.channel_state = ChannelState::ShutdownComplete;
Expand All@@ -4966,11 +4981,15 @@ impl<SP: Deref> Channel<SP> where
 .map_err(|_| ChannelError::Close("External signer refused to sign closing transaction".to_owned()))?;
 let (signed_tx, shutdown_result) = if $new_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 self.context.channel_state = ChannelState::ShutdownComplete;
 self.context.update_time_counter += 1;
Expand Down
Loading

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

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

Jan 10, 2024
 Merged


Clean Up Funding Error Handling and shutdown
#2809
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
396c36b

Consider `MONITOR_UPDATE_IN_PROGRESS` as unbroadcasted funding


TheBlueMatt Dec 29, 2023
ee5b8c7

Move DiscardFunding generation into finish_close_channel


TheBlueMatt Dec 29, 2023
080865d

Move ChannelClosed generation into finish_close_channel


TheBlueMatt Dec 29, 2023
bfe911d

Drop now-unused fields from `MsgHandleErrInternal`


TheBlueMatt Dec 29, 2023
5eea305

Do not panic if a peer learns our funding info before we fund


TheBlueMatt Dec 26, 2023
7bc2a14

Fix handling of duplicate initial `ChannelMonitor` writing


TheBlueMatt Dec 25, 2023

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


35 changes: 27 additions & 8 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -814,6 +814,7 @@ pub(super) struct ReestablishResponses {
/// The result of a shutdown that should be handled.
#[must_use]
pub(crate) struct ShutdownResult {
	pub(crate) closure_reason: ClosureReason,
	/// A channel monitor update to apply.
	pub(crate) monitor_update: Option<(PublicKey, OutPoint, ChannelMonitorUpdate)>,
	/// A list of dropped outbound HTLCs that can safely be failed backwards immediately.
Expand All@@ -822,7 +823,10 @@ pub(crate) struct ShutdownResult {
	/// propagated to the remainder of the batch.
	pub(crate) unbroadcasted_batch_funding_txid: Option<Txid>,
	pub(crate) channel_id: ChannelId,
	pub(crate) user_channel_id: u128,
	pub(crate) channel_capacity_satoshis: u64,
	pub(crate) counterparty_node_id: PublicKey,
	pub(crate) unbroadcasted_funding_tx: Option<Transaction>,
}

/// If the majority of the channels funds are to the fundee and the initiator holds only just
Expand DownExpand Up@@ -2316,15 +2320,17 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 res
	}

	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O>
 where F: Fn() -> Option<O> {
	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O> where F: Fn() -> Option<O> {
 match self.channel_state {
 ChannelState::FundingNegotiated => f(),
 ChannelState::AwaitingChannelReady(flags) => if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) {
 f()
 } else {
 None
 },
 ChannelState::AwaitingChannelReady(flags) =>
 if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) ||
 flags.is_set(FundedStateFlags::MONITOR_UPDATE_IN_PROGRESS.into())
 {
 f()
 } else {
 None
 },
 _ => None,
 }
	}
Expand DownExpand Up@@ -2359,7 +2365,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
	/// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
	/// Also returns the list of payment_hashes for channels which we can safely fail backwards
	/// immediately (others we will have to allow to time out).
	pub fn force_shutdown(&mut self, should_broadcast: bool) -> ShutdownResult {
	pub fn force_shutdown(&mut self, should_broadcast: bool, closure_reason: ClosureReason) -> ShutdownResult {
 // Note that we MUST only generate a monitor update that indicates force-closure - we're
 // called during initialization prior to the chain_monitor in the encompassing ChannelManager
 // being fully configured in some cases. Thus, its likely any monitor events we generate will
Expand DownExpand Up@@ -2400,15 +2406,20 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 } else { None }
 } else { None };
 let unbroadcasted_batch_funding_txid = self.unbroadcasted_batch_funding_txid();
 let unbroadcasted_funding_tx = self.unbroadcasted_funding();

 self.channel_state = ChannelState::ShutdownComplete;
 self.update_time_counter += 1;
 ShutdownResult {
 closure_reason,
 monitor_update,
 dropped_outbound_htlcs,
 unbroadcasted_batch_funding_txid,
 channel_id: self.channel_id,
 user_channel_id: self.user_id,
 channel_capacity_satoshis: self.channel_value_satoshis,
 counterparty_node_id: self.counterparty_node_id,
 unbroadcasted_funding_tx,
 }
	}

Expand DownExpand Up@@ -4936,11 +4947,15 @@ impl<SP: Deref> Channel<SP> where
 if let Some((last_fee, sig)) = self.context.last_sent_closing_fee {
 if last_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 let tx = self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &sig);
 self.context.channel_state = ChannelState::ShutdownComplete;
Expand All@@ -4966,11 +4981,15 @@ impl<SP: Deref> Channel<SP> where
 .map_err(|_| ChannelError::Close("External signer refused to sign closing transaction".to_owned()))?;
 let (signed_tx, shutdown_result) = if $new_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 self.context.channel_state = ChannelState::ShutdownComplete;
 self.context.update_time_counter += 1;
Expand Down
Loading

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

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

Jan 10, 2024
 Merged


Clean Up Funding Error Handling and shutdown
#2809
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
396c36b

Consider `MONITOR_UPDATE_IN_PROGRESS` as unbroadcasted funding


TheBlueMatt Dec 29, 2023
ee5b8c7

Move DiscardFunding generation into finish_close_channel


TheBlueMatt Dec 29, 2023
080865d

Move ChannelClosed generation into finish_close_channel


TheBlueMatt Dec 29, 2023
bfe911d

Drop now-unused fields from `MsgHandleErrInternal`


TheBlueMatt Dec 29, 2023
5eea305

Do not panic if a peer learns our funding info before we fund


TheBlueMatt Dec 26, 2023
7bc2a14

Fix handling of duplicate initial `ChannelMonitor` writing


TheBlueMatt Dec 25, 2023

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


35 changes: 27 additions & 8 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -814,6 +814,7 @@ pub(super) struct ReestablishResponses {
/// The result of a shutdown that should be handled.
#[must_use]
pub(crate) struct ShutdownResult {
	pub(crate) closure_reason: ClosureReason,
	/// A channel monitor update to apply.
	pub(crate) monitor_update: Option<(PublicKey, OutPoint, ChannelMonitorUpdate)>,
	/// A list of dropped outbound HTLCs that can safely be failed backwards immediately.
Expand All@@ -822,7 +823,10 @@ pub(crate) struct ShutdownResult {
	/// propagated to the remainder of the batch.
	pub(crate) unbroadcasted_batch_funding_txid: Option<Txid>,
	pub(crate) channel_id: ChannelId,
	pub(crate) user_channel_id: u128,
	pub(crate) channel_capacity_satoshis: u64,
	pub(crate) counterparty_node_id: PublicKey,
	pub(crate) unbroadcasted_funding_tx: Option<Transaction>,
}

/// If the majority of the channels funds are to the fundee and the initiator holds only just
Expand DownExpand Up@@ -2316,15 +2320,17 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 res
	}

	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O>
 where F: Fn() -> Option<O> {
	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O> where F: Fn() -> Option<O> {
 match self.channel_state {
 ChannelState::FundingNegotiated => f(),
 ChannelState::AwaitingChannelReady(flags) => if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) {
 f()
 } else {
 None
 },
 ChannelState::AwaitingChannelReady(flags) =>
 if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) ||
 flags.is_set(FundedStateFlags::MONITOR_UPDATE_IN_PROGRESS.into())
 {
 f()
 } else {
 None
 },
 _ => None,
 }
	}
Expand DownExpand Up@@ -2359,7 +2365,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
	/// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
	/// Also returns the list of payment_hashes for channels which we can safely fail backwards
	/// immediately (others we will have to allow to time out).
	pub fn force_shutdown(&mut self, should_broadcast: bool) -> ShutdownResult {
	pub fn force_shutdown(&mut self, should_broadcast: bool, closure_reason: ClosureReason) -> ShutdownResult {
 // Note that we MUST only generate a monitor update that indicates force-closure - we're
 // called during initialization prior to the chain_monitor in the encompassing ChannelManager
 // being fully configured in some cases. Thus, its likely any monitor events we generate will
Expand DownExpand Up@@ -2400,15 +2406,20 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 } else { None }
 } else { None };
 let unbroadcasted_batch_funding_txid = self.unbroadcasted_batch_funding_txid();
 let unbroadcasted_funding_tx = self.unbroadcasted_funding();

 self.channel_state = ChannelState::ShutdownComplete;
 self.update_time_counter += 1;
 ShutdownResult {
 closure_reason,
 monitor_update,
 dropped_outbound_htlcs,
 unbroadcasted_batch_funding_txid,
 channel_id: self.channel_id,
 user_channel_id: self.user_id,
 channel_capacity_satoshis: self.channel_value_satoshis,
 counterparty_node_id: self.counterparty_node_id,
 unbroadcasted_funding_tx,
 }
	}

Expand DownExpand Up@@ -4936,11 +4947,15 @@ impl<SP: Deref> Channel<SP> where
 if let Some((last_fee, sig)) = self.context.last_sent_closing_fee {
 if last_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 let tx = self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &sig);
 self.context.channel_state = ChannelState::ShutdownComplete;
Expand All@@ -4966,11 +4981,15 @@ impl<SP: Deref> Channel<SP> where
 .map_err(|_| ChannelError::Close("External signer refused to sign closing transaction".to_owned()))?;
 let (signed_tx, shutdown_result) = if $new_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 self.context.channel_state = ChannelState::ShutdownComplete;
 self.context.update_time_counter += 1;
Expand Down
Loading

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

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

Jan 10, 2024
 Merged


Clean Up Funding Error Handling and shutdown
#2809
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
396c36b

Consider `MONITOR_UPDATE_IN_PROGRESS` as unbroadcasted funding


TheBlueMatt Dec 29, 2023
ee5b8c7

Move DiscardFunding generation into finish_close_channel


TheBlueMatt Dec 29, 2023
080865d

Move ChannelClosed generation into finish_close_channel


TheBlueMatt Dec 29, 2023
bfe911d

Drop now-unused fields from `MsgHandleErrInternal`


TheBlueMatt Dec 29, 2023
5eea305

Do not panic if a peer learns our funding info before we fund


TheBlueMatt Dec 26, 2023
7bc2a14

Fix handling of duplicate initial `ChannelMonitor` writing


TheBlueMatt Dec 25, 2023

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


35 changes: 27 additions & 8 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -814,6 +814,7 @@ pub(super) struct ReestablishResponses {
/// The result of a shutdown that should be handled.
#[must_use]
pub(crate) struct ShutdownResult {
	pub(crate) closure_reason: ClosureReason,
	/// A channel monitor update to apply.
	pub(crate) monitor_update: Option<(PublicKey, OutPoint, ChannelMonitorUpdate)>,
	/// A list of dropped outbound HTLCs that can safely be failed backwards immediately.
Expand All@@ -822,7 +823,10 @@ pub(crate) struct ShutdownResult {
	/// propagated to the remainder of the batch.
	pub(crate) unbroadcasted_batch_funding_txid: Option<Txid>,
	pub(crate) channel_id: ChannelId,
	pub(crate) user_channel_id: u128,
	pub(crate) channel_capacity_satoshis: u64,
	pub(crate) counterparty_node_id: PublicKey,
	pub(crate) unbroadcasted_funding_tx: Option<Transaction>,
}

/// If the majority of the channels funds are to the fundee and the initiator holds only just
Expand DownExpand Up@@ -2316,15 +2320,17 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 res
	}

	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O>
 where F: Fn() -> Option<O> {
	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O> where F: Fn() -> Option<O> {
 match self.channel_state {
 ChannelState::FundingNegotiated => f(),
 ChannelState::AwaitingChannelReady(flags) => if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) {
 f()
 } else {
 None
 },
 ChannelState::AwaitingChannelReady(flags) =>
 if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) ||
 flags.is_set(FundedStateFlags::MONITOR_UPDATE_IN_PROGRESS.into())
 {
 f()
 } else {
 None
 },
 _ => None,
 }
	}
Expand DownExpand Up@@ -2359,7 +2365,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
	/// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
	/// Also returns the list of payment_hashes for channels which we can safely fail backwards
	/// immediately (others we will have to allow to time out).
	pub fn force_shutdown(&mut self, should_broadcast: bool) -> ShutdownResult {
	pub fn force_shutdown(&mut self, should_broadcast: bool, closure_reason: ClosureReason) -> ShutdownResult {
 // Note that we MUST only generate a monitor update that indicates force-closure - we're
 // called during initialization prior to the chain_monitor in the encompassing ChannelManager
 // being fully configured in some cases. Thus, its likely any monitor events we generate will
Expand DownExpand Up@@ -2400,15 +2406,20 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 } else { None }
 } else { None };
 let unbroadcasted_batch_funding_txid = self.unbroadcasted_batch_funding_txid();
 let unbroadcasted_funding_tx = self.unbroadcasted_funding();

 self.channel_state = ChannelState::ShutdownComplete;
 self.update_time_counter += 1;
 ShutdownResult {
 closure_reason,
 monitor_update,
 dropped_outbound_htlcs,
 unbroadcasted_batch_funding_txid,
 channel_id: self.channel_id,
 user_channel_id: self.user_id,
 channel_capacity_satoshis: self.channel_value_satoshis,
 counterparty_node_id: self.counterparty_node_id,
 unbroadcasted_funding_tx,
 }
	}

Expand DownExpand Up@@ -4936,11 +4947,15 @@ impl<SP: Deref> Channel<SP> where
 if let Some((last_fee, sig)) = self.context.last_sent_closing_fee {
 if last_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 let tx = self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &sig);
 self.context.channel_state = ChannelState::ShutdownComplete;
Expand All@@ -4966,11 +4981,15 @@ impl<SP: Deref> Channel<SP> where
 .map_err(|_| ChannelError::Close("External signer refused to sign closing transaction".to_owned()))?;
 let (signed_tx, shutdown_result) = if $new_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 self.context.channel_state = ChannelState::ShutdownComplete;
 self.context.update_time_counter += 1;
Expand Down
Loading

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

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

Jan 10, 2024
 Merged


Clean Up Funding Error Handling and shutdown
#2809
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
396c36b

Consider `MONITOR_UPDATE_IN_PROGRESS` as unbroadcasted funding


TheBlueMatt Dec 29, 2023
ee5b8c7

Move DiscardFunding generation into finish_close_channel


TheBlueMatt Dec 29, 2023
080865d

Move ChannelClosed generation into finish_close_channel


TheBlueMatt Dec 29, 2023
bfe911d

Drop now-unused fields from `MsgHandleErrInternal`


TheBlueMatt Dec 29, 2023
5eea305

Do not panic if a peer learns our funding info before we fund


TheBlueMatt Dec 26, 2023
7bc2a14

Fix handling of duplicate initial `ChannelMonitor` writing


TheBlueMatt Dec 25, 2023

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


35 changes: 27 additions & 8 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -814,6 +814,7 @@ pub(super) struct ReestablishResponses {
/// The result of a shutdown that should be handled.
#[must_use]
pub(crate) struct ShutdownResult {
	pub(crate) closure_reason: ClosureReason,
	/// A channel monitor update to apply.
	pub(crate) monitor_update: Option<(PublicKey, OutPoint, ChannelMonitorUpdate)>,
	/// A list of dropped outbound HTLCs that can safely be failed backwards immediately.
Expand All@@ -822,7 +823,10 @@ pub(crate) struct ShutdownResult {
	/// propagated to the remainder of the batch.
	pub(crate) unbroadcasted_batch_funding_txid: Option<Txid>,
	pub(crate) channel_id: ChannelId,
	pub(crate) user_channel_id: u128,
	pub(crate) channel_capacity_satoshis: u64,
	pub(crate) counterparty_node_id: PublicKey,
	pub(crate) unbroadcasted_funding_tx: Option<Transaction>,
}

/// If the majority of the channels funds are to the fundee and the initiator holds only just
Expand DownExpand Up@@ -2316,15 +2320,17 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 res
	}

	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O>
 where F: Fn() -> Option<O> {
	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O> where F: Fn() -> Option<O> {
 match self.channel_state {
 ChannelState::FundingNegotiated => f(),
 ChannelState::AwaitingChannelReady(flags) => if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) {
 f()
 } else {
 None
 },
 ChannelState::AwaitingChannelReady(flags) =>
 if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) ||
 flags.is_set(FundedStateFlags::MONITOR_UPDATE_IN_PROGRESS.into())
 {
 f()
 } else {
 None
 },
 _ => None,
 }
	}
Expand DownExpand Up@@ -2359,7 +2365,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
	/// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
	/// Also returns the list of payment_hashes for channels which we can safely fail backwards
	/// immediately (others we will have to allow to time out).
	pub fn force_shutdown(&mut self, should_broadcast: bool) -> ShutdownResult {
	pub fn force_shutdown(&mut self, should_broadcast: bool, closure_reason: ClosureReason) -> ShutdownResult {
 // Note that we MUST only generate a monitor update that indicates force-closure - we're
 // called during initialization prior to the chain_monitor in the encompassing ChannelManager
 // being fully configured in some cases. Thus, its likely any monitor events we generate will
Expand DownExpand Up@@ -2400,15 +2406,20 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 } else { None }
 } else { None };
 let unbroadcasted_batch_funding_txid = self.unbroadcasted_batch_funding_txid();
 let unbroadcasted_funding_tx = self.unbroadcasted_funding();

 self.channel_state = ChannelState::ShutdownComplete;
 self.update_time_counter += 1;
 ShutdownResult {
 closure_reason,
 monitor_update,
 dropped_outbound_htlcs,
 unbroadcasted_batch_funding_txid,
 channel_id: self.channel_id,
 user_channel_id: self.user_id,
 channel_capacity_satoshis: self.channel_value_satoshis,
 counterparty_node_id: self.counterparty_node_id,
 unbroadcasted_funding_tx,
 }
	}

Expand DownExpand Up@@ -4936,11 +4947,15 @@ impl<SP: Deref> Channel<SP> where
 if let Some((last_fee, sig)) = self.context.last_sent_closing_fee {
 if last_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 let tx = self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &sig);
 self.context.channel_state = ChannelState::ShutdownComplete;
Expand All@@ -4966,11 +4981,15 @@ impl<SP: Deref> Channel<SP> where
 .map_err(|_| ChannelError::Close("External signer refused to sign closing transaction".to_owned()))?;
 let (signed_tx, shutdown_result) = if $new_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 self.context.channel_state = ChannelState::ShutdownComplete;
 self.context.update_time_counter += 1;
Expand Down
Loading

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

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

Jan 10, 2024
 Merged


Clean Up Funding Error Handling and shutdown
#2809
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
396c36b

Consider `MONITOR_UPDATE_IN_PROGRESS` as unbroadcasted funding


TheBlueMatt Dec 29, 2023
ee5b8c7

Move DiscardFunding generation into finish_close_channel


TheBlueMatt Dec 29, 2023
080865d

Move ChannelClosed generation into finish_close_channel


TheBlueMatt Dec 29, 2023
bfe911d

Drop now-unused fields from `MsgHandleErrInternal`


TheBlueMatt Dec 29, 2023
5eea305

Do not panic if a peer learns our funding info before we fund


TheBlueMatt Dec 26, 2023
7bc2a14

Fix handling of duplicate initial `ChannelMonitor` writing


TheBlueMatt Dec 25, 2023

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


35 changes: 27 additions & 8 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -814,6 +814,7 @@ pub(super) struct ReestablishResponses {
/// The result of a shutdown that should be handled.
#[must_use]
pub(crate) struct ShutdownResult {
	pub(crate) closure_reason: ClosureReason,
	/// A channel monitor update to apply.
	pub(crate) monitor_update: Option<(PublicKey, OutPoint, ChannelMonitorUpdate)>,
	/// A list of dropped outbound HTLCs that can safely be failed backwards immediately.
Expand All@@ -822,7 +823,10 @@ pub(crate) struct ShutdownResult {
	/// propagated to the remainder of the batch.
	pub(crate) unbroadcasted_batch_funding_txid: Option<Txid>,
	pub(crate) channel_id: ChannelId,
	pub(crate) user_channel_id: u128,
	pub(crate) channel_capacity_satoshis: u64,
	pub(crate) counterparty_node_id: PublicKey,
	pub(crate) unbroadcasted_funding_tx: Option<Transaction>,
}

/// If the majority of the channels funds are to the fundee and the initiator holds only just
Expand DownExpand Up@@ -2316,15 +2320,17 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 res
	}

	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O>
 where F: Fn() -> Option<O> {
	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O> where F: Fn() -> Option<O> {
 match self.channel_state {
 ChannelState::FundingNegotiated => f(),
 ChannelState::AwaitingChannelReady(flags) => if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) {
 f()
 } else {
 None
 },
 ChannelState::AwaitingChannelReady(flags) =>
 if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) ||
 flags.is_set(FundedStateFlags::MONITOR_UPDATE_IN_PROGRESS.into())
 {
 f()
 } else {
 None
 },
 _ => None,
 }
	}
Expand DownExpand Up@@ -2359,7 +2365,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
	/// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
	/// Also returns the list of payment_hashes for channels which we can safely fail backwards
	/// immediately (others we will have to allow to time out).
	pub fn force_shutdown(&mut self, should_broadcast: bool) -> ShutdownResult {
	pub fn force_shutdown(&mut self, should_broadcast: bool, closure_reason: ClosureReason) -> ShutdownResult {
 // Note that we MUST only generate a monitor update that indicates force-closure - we're
 // called during initialization prior to the chain_monitor in the encompassing ChannelManager
 // being fully configured in some cases. Thus, its likely any monitor events we generate will
Expand DownExpand Up@@ -2400,15 +2406,20 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 } else { None }
 } else { None };
 let unbroadcasted_batch_funding_txid = self.unbroadcasted_batch_funding_txid();
 let unbroadcasted_funding_tx = self.unbroadcasted_funding();

 self.channel_state = ChannelState::ShutdownComplete;
 self.update_time_counter += 1;
 ShutdownResult {
 closure_reason,
 monitor_update,
 dropped_outbound_htlcs,
 unbroadcasted_batch_funding_txid,
 channel_id: self.channel_id,
 user_channel_id: self.user_id,
 channel_capacity_satoshis: self.channel_value_satoshis,
 counterparty_node_id: self.counterparty_node_id,
 unbroadcasted_funding_tx,
 }
	}

Expand DownExpand Up@@ -4936,11 +4947,15 @@ impl<SP: Deref> Channel<SP> where
 if let Some((last_fee, sig)) = self.context.last_sent_closing_fee {
 if last_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 let tx = self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &sig);
 self.context.channel_state = ChannelState::ShutdownComplete;
Expand All@@ -4966,11 +4981,15 @@ impl<SP: Deref> Channel<SP> where
 .map_err(|_| ChannelError::Close("External signer refused to sign closing transaction".to_owned()))?;
 let (signed_tx, shutdown_result) = if $new_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 self.context.channel_state = ChannelState::ShutdownComplete;
 self.context.update_time_counter += 1;
Expand Down
Loading

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

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

Jan 10, 2024
 Merged


Clean Up Funding Error Handling and shutdown
#2809
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
396c36b

Consider `MONITOR_UPDATE_IN_PROGRESS` as unbroadcasted funding


TheBlueMatt Dec 29, 2023
ee5b8c7

Move DiscardFunding generation into finish_close_channel


TheBlueMatt Dec 29, 2023
080865d

Move ChannelClosed generation into finish_close_channel


TheBlueMatt Dec 29, 2023
bfe911d

Drop now-unused fields from `MsgHandleErrInternal`


TheBlueMatt Dec 29, 2023
5eea305

Do not panic if a peer learns our funding info before we fund


TheBlueMatt Dec 26, 2023
7bc2a14

Fix handling of duplicate initial `ChannelMonitor` writing


TheBlueMatt Dec 25, 2023

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


35 changes: 27 additions & 8 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -814,6 +814,7 @@ pub(super) struct ReestablishResponses {
/// The result of a shutdown that should be handled.
#[must_use]
pub(crate) struct ShutdownResult {
	pub(crate) closure_reason: ClosureReason,
	/// A channel monitor update to apply.
	pub(crate) monitor_update: Option<(PublicKey, OutPoint, ChannelMonitorUpdate)>,
	/// A list of dropped outbound HTLCs that can safely be failed backwards immediately.
Expand All@@ -822,7 +823,10 @@ pub(crate) struct ShutdownResult {
	/// propagated to the remainder of the batch.
	pub(crate) unbroadcasted_batch_funding_txid: Option<Txid>,
	pub(crate) channel_id: ChannelId,
	pub(crate) user_channel_id: u128,
	pub(crate) channel_capacity_satoshis: u64,
	pub(crate) counterparty_node_id: PublicKey,
	pub(crate) unbroadcasted_funding_tx: Option<Transaction>,
}

/// If the majority of the channels funds are to the fundee and the initiator holds only just
Expand DownExpand Up@@ -2316,15 +2320,17 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 res
	}

	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O>
 where F: Fn() -> Option<O> {
	fn if_unbroadcasted_funding<F, O>(&self, f: F) -> Option<O> where F: Fn() -> Option<O> {
 match self.channel_state {
 ChannelState::FundingNegotiated => f(),
 ChannelState::AwaitingChannelReady(flags) => if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) {
 f()
 } else {
 None
 },
 ChannelState::AwaitingChannelReady(flags) =>
 if flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH) ||
 flags.is_set(FundedStateFlags::MONITOR_UPDATE_IN_PROGRESS.into())
 {
 f()
 } else {
 None
 },
 _ => None,
 }
	}
Expand DownExpand Up@@ -2359,7 +2365,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
	/// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
	/// Also returns the list of payment_hashes for channels which we can safely fail backwards
	/// immediately (others we will have to allow to time out).
	pub fn force_shutdown(&mut self, should_broadcast: bool) -> ShutdownResult {
	pub fn force_shutdown(&mut self, should_broadcast: bool, closure_reason: ClosureReason) -> ShutdownResult {
 // Note that we MUST only generate a monitor update that indicates force-closure - we're
 // called during initialization prior to the chain_monitor in the encompassing ChannelManager
 // being fully configured in some cases. Thus, its likely any monitor events we generate will
Expand DownExpand Up@@ -2400,15 +2406,20 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 } else { None }
 } else { None };
 let unbroadcasted_batch_funding_txid = self.unbroadcasted_batch_funding_txid();
 let unbroadcasted_funding_tx = self.unbroadcasted_funding();

 self.channel_state = ChannelState::ShutdownComplete;
 self.update_time_counter += 1;
 ShutdownResult {
 closure_reason,
 monitor_update,
 dropped_outbound_htlcs,
 unbroadcasted_batch_funding_txid,
 channel_id: self.channel_id,
 user_channel_id: self.user_id,
 channel_capacity_satoshis: self.channel_value_satoshis,
 counterparty_node_id: self.counterparty_node_id,
 unbroadcasted_funding_tx,
 }
	}

Expand DownExpand Up@@ -4936,11 +4947,15 @@ impl<SP: Deref> Channel<SP> where
 if let Some((last_fee, sig)) = self.context.last_sent_closing_fee {
 if last_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 let tx = self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &sig);
 self.context.channel_state = ChannelState::ShutdownComplete;
Expand All@@ -4966,11 +4981,15 @@ impl<SP: Deref> Channel<SP> where
 .map_err(|_| ChannelError::Close("External signer refused to sign closing transaction".to_owned()))?;
 let (signed_tx, shutdown_result) = if $new_fee == msg.fee_satoshis {
 let shutdown_result = ShutdownResult {
 closure_reason: ClosureReason::CooperativeClosure,
 monitor_update: None,
 dropped_outbound_htlcs: Vec::new(),
 unbroadcasted_batch_funding_txid: self.context.unbroadcasted_batch_funding_txid(),
 channel_id: self.context.channel_id,
 user_channel_id: self.context.user_id,
 channel_capacity_satoshis: self.context.channel_value_satoshis,
 counterparty_node_id: self.context.counterparty_node_id,
 unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
 };
 self.context.channel_state = ChannelState::ShutdownComplete;
 self.context.update_time_counter += 1;
Expand Down
Loading