Skip to content

Persist unresolved ChannelMonitors on empty height change#3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 1 commit into from
Dec 6, 2024
Merged

Persist unresolved ChannelMonitors on empty height change #3442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lightning/src/chain/chainmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -640,17 +640,22 @@ where C::Target: chain::Filter,
/// data could be moved to an archive location or removed entirely.
pub fn archive_fully_resolved_channel_monitors(&self) {
let mut have_monitors_to_prune = false;
for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
for (funding_txo, monitor_holder) in self.monitors.read().unwrap().iter() {
let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
if monitor_holder.monitor.is_fully_resolved(&logger) {
let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
if is_fully_resolved {
have_monitors_to_prune = true;
}
if needs_persistence {
self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
}
}
if have_monitors_to_prune {
let mut monitors = self.monitors.write().unwrap();
monitors.retain(|funding_txo, monitor_holder| {
let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
if monitor_holder.monitor.is_fully_resolved(&logger) {
let (is_fully_resolved, _) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
if is_fully_resolved {
log_info!(logger,
"Archiving fully resolved ChannelMonitor for funding txo {}",
funding_txo
Expand Down
17 changes: 11 additions & 6 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1994,10 +1994,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {

/// Checks if the monitor is fully resolved. Resolved monitor is one that has claimed all of
/// its outputs and balances (i.e. [`Self::get_claimable_balances`] returns an empty set).
/// Additionally may update state to track when the balances set became empty.
///
/// This function returns true only if [`Self::get_claimable_balances`] has been empty for at least
/// This function returns a tuple of two booleans, the first indicating whether the monitor is
/// fully resolved, and the second whether the monitor needs persistence to ensure it is
/// reliably marked as resolved within 4032 blocks.
///
/// The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
Comment thread
arik-so marked this conversation as resolved.
/// 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
pub fn is_fully_resolved<L: Logger>(&self, logger: &L) -> bool {
pub fn check_and_update_full_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
let mut is_all_funds_claimed = self.get_claimable_balances().is_empty();
let current_height = self.current_best_block().height;
let mut inner = self.inner.lock().unwrap();
Expand All@@ -2011,7 +2016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
match (inner.balances_empty_height, is_all_funds_claimed) {
(Some(balances_empty_height), true) => {
// Claimed all funds, check if reached the blocks threshold.
current_height >= balances_empty_height + BLOCKS_THRESHOLD
(current_height >= balances_empty_height + BLOCKS_THRESHOLD, false)
},
(Some(_), false) => {
// previously assumed we claimed all funds, but we have new funds to claim.
Expand All@@ -2021,7 +2026,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
"WARNING: LDK thought it was done claiming all the available funds in the ChannelMonitor for channel {}, but later decided it had more to claim. This is potentially an important bug in LDK, please report it at https://github.com/lightningdevkit/rust-lightning/issues/new",
inner.get_funding_txo().0);
inner.balances_empty_height = None;
false
(false, true)
},
(None, true) => {
// Claimed all funds but `balances_empty_height` is None. It is set to the
Expand All@@ -2030,11 +2035,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
"ChannelMonitor funded at {} is now fully resolved. It will become archivable in {} blocks",
inner.get_funding_txo().0, BLOCKS_THRESHOLD);
inner.balances_empty_height = Some(current_height);
false
(false, true)
},
(None, false) => {
// Have funds to claim.
false
(false, false)
},
}
}
Expand Down
, '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" + '
Persist unresolved ChannelMonitors on empty height change by arik-so · Pull Request #3442 · lightningdevkit/rust-lightning · GitHub
Skip to content
Persist unresolved ChannelMonitors on empty height change#3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Dec 6, 2024
 Merged


Persist unresolved ChannelMonitors on empty height change
#3442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 8 additions & 3 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -640,17 +640,22 @@ where C::Target: chain::Filter,
	/// data could be moved to an archive location or removed entirely.
	pub fn archive_fully_resolved_channel_monitors(&self) {
 let mut have_monitors_to_prune = false;
 for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
 for (funding_txo, monitor_holder) in self.monitors.read().unwrap().iter() {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 have_monitors_to_prune = true;
 }
 if needs_persistence {
 self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
 }
 }
 if have_monitors_to_prune {
 let mut monitors = self.monitors.write().unwrap();
 monitors.retain(|funding_txo, monitor_holder| {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, _) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 log_info!(logger,
 "Archiving fully resolved ChannelMonitor for funding txo {}",
 funding_txo
Expand Down

17 changes: 11 additions & 6 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1994,10 +1994,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {

	/// Checks if the monitor is fully resolved. Resolved monitor is one that has claimed all of
	/// its outputs and balances (i.e. [`Self::get_claimable_balances`] returns an empty set).
	/// Additionally may update state to track when the balances set became empty.
	///
	/// This function returns true only if [`Self::get_claimable_balances`] has been empty for at least
	/// This function returns a tuple of two booleans, the first indicating whether the monitor is
	/// fully resolved, and the second whether the monitor needs persistence to ensure it is
	/// reliably marked as resolved within 4032 blocks.
	///
	/// The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
Comment thread
arik-so marked this conversation as resolved.

	/// 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
	pub fn is_fully_resolved<L: Logger>(&self, logger: &L) -> bool {
	pub fn check_and_update_full_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
 let mut is_all_funds_claimed = self.get_claimable_balances().is_empty();
 let current_height = self.current_best_block().height;
 let mut inner = self.inner.lock().unwrap();
Expand All@@ -2011,7 +2016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 match (inner.balances_empty_height, is_all_funds_claimed) {
 (Some(balances_empty_height), true) => {
 // Claimed all funds, check if reached the blocks threshold.
 current_height >= balances_empty_height + BLOCKS_THRESHOLD
(current_height >= balances_empty_height + BLOCKS_THRESHOLD, false)
 },
 (Some(_), false) => {
 // previously assumed we claimed all funds, but we have new funds to claim.
Expand All@@ -2021,7 +2026,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "WARNING: LDK thought it was done claiming all the available funds in the ChannelMonitor for channel {}, but later decided it had more to claim. This is potentially an important bug in LDK, please report it at https://github.com/lightningdevkit/rust-lightning/issues/new",
 inner.get_funding_txo().0);
 inner.balances_empty_height = None;
 false
(false, true)
 },
 (None, true) => {
 // Claimed all funds but `balances_empty_height` is None. It is set to the
Expand All@@ -2030,11 +2035,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "ChannelMonitor funded at {} is now fully resolved. It will become archivable in {} blocks",
 inner.get_funding_txo().0, BLOCKS_THRESHOLD);
 inner.balances_empty_height = Some(current_height);
 false
(false, true)
 },
 (None, false) => {
 // Have funds to claim.
 false
(false, false)
 },
 }
	}
Expand Down

, '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('^' + ".*" + '
Persist unresolved ChannelMonitors on empty height change by arik-so · Pull Request #3442 · lightningdevkit/rust-lightning · GitHub
Skip to content
Persist unresolved ChannelMonitors on empty height change#3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Dec 6, 2024
 Merged


Persist unresolved ChannelMonitors on empty height change
#3442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 8 additions & 3 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -640,17 +640,22 @@ where C::Target: chain::Filter,
	/// data could be moved to an archive location or removed entirely.
	pub fn archive_fully_resolved_channel_monitors(&self) {
 let mut have_monitors_to_prune = false;
 for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
 for (funding_txo, monitor_holder) in self.monitors.read().unwrap().iter() {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 have_monitors_to_prune = true;
 }
 if needs_persistence {
 self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
 }
 }
 if have_monitors_to_prune {
 let mut monitors = self.monitors.write().unwrap();
 monitors.retain(|funding_txo, monitor_holder| {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, _) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 log_info!(logger,
 "Archiving fully resolved ChannelMonitor for funding txo {}",
 funding_txo
Expand Down

17 changes: 11 additions & 6 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1994,10 +1994,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {

	/// Checks if the monitor is fully resolved. Resolved monitor is one that has claimed all of
	/// its outputs and balances (i.e. [`Self::get_claimable_balances`] returns an empty set).
	/// Additionally may update state to track when the balances set became empty.
	///
	/// This function returns true only if [`Self::get_claimable_balances`] has been empty for at least
	/// This function returns a tuple of two booleans, the first indicating whether the monitor is
	/// fully resolved, and the second whether the monitor needs persistence to ensure it is
	/// reliably marked as resolved within 4032 blocks.
	///
	/// The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
Comment thread
arik-so marked this conversation as resolved.

	/// 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
	pub fn is_fully_resolved<L: Logger>(&self, logger: &L) -> bool {
	pub fn check_and_update_full_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
 let mut is_all_funds_claimed = self.get_claimable_balances().is_empty();
 let current_height = self.current_best_block().height;
 let mut inner = self.inner.lock().unwrap();
Expand All@@ -2011,7 +2016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 match (inner.balances_empty_height, is_all_funds_claimed) {
 (Some(balances_empty_height), true) => {
 // Claimed all funds, check if reached the blocks threshold.
 current_height >= balances_empty_height + BLOCKS_THRESHOLD
(current_height >= balances_empty_height + BLOCKS_THRESHOLD, false)
 },
 (Some(_), false) => {
 // previously assumed we claimed all funds, but we have new funds to claim.
Expand All@@ -2021,7 +2026,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "WARNING: LDK thought it was done claiming all the available funds in the ChannelMonitor for channel {}, but later decided it had more to claim. This is potentially an important bug in LDK, please report it at https://github.com/lightningdevkit/rust-lightning/issues/new",
 inner.get_funding_txo().0);
 inner.balances_empty_height = None;
 false
(false, true)
 },
 (None, true) => {
 // Claimed all funds but `balances_empty_height` is None. It is set to the
Expand All@@ -2030,11 +2035,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "ChannelMonitor funded at {} is now fully resolved. It will become archivable in {} blocks",
 inner.get_funding_txo().0, BLOCKS_THRESHOLD);
 inner.balances_empty_height = Some(current_height);
 false
(false, true)
 },
 (None, false) => {
 // Have funds to claim.
 false
(false, false)
 },
 }
	}
Expand Down

, '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('^' + ".*" + '
Persist unresolved ChannelMonitors on empty height change by arik-so · Pull Request #3442 · lightningdevkit/rust-lightning · GitHub
Skip to content
Persist unresolved ChannelMonitors on empty height change#3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Dec 6, 2024
 Merged


Persist unresolved ChannelMonitors on empty height change
#3442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 8 additions & 3 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -640,17 +640,22 @@ where C::Target: chain::Filter,
	/// data could be moved to an archive location or removed entirely.
	pub fn archive_fully_resolved_channel_monitors(&self) {
 let mut have_monitors_to_prune = false;
 for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
 for (funding_txo, monitor_holder) in self.monitors.read().unwrap().iter() {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 have_monitors_to_prune = true;
 }
 if needs_persistence {
 self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
 }
 }
 if have_monitors_to_prune {
 let mut monitors = self.monitors.write().unwrap();
 monitors.retain(|funding_txo, monitor_holder| {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, _) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 log_info!(logger,
 "Archiving fully resolved ChannelMonitor for funding txo {}",
 funding_txo
Expand Down

17 changes: 11 additions & 6 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1994,10 +1994,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {

	/// Checks if the monitor is fully resolved. Resolved monitor is one that has claimed all of
	/// its outputs and balances (i.e. [`Self::get_claimable_balances`] returns an empty set).
	/// Additionally may update state to track when the balances set became empty.
	///
	/// This function returns true only if [`Self::get_claimable_balances`] has been empty for at least
	/// This function returns a tuple of two booleans, the first indicating whether the monitor is
	/// fully resolved, and the second whether the monitor needs persistence to ensure it is
	/// reliably marked as resolved within 4032 blocks.
	///
	/// The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
Comment thread
arik-so marked this conversation as resolved.

	/// 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
	pub fn is_fully_resolved<L: Logger>(&self, logger: &L) -> bool {
	pub fn check_and_update_full_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
 let mut is_all_funds_claimed = self.get_claimable_balances().is_empty();
 let current_height = self.current_best_block().height;
 let mut inner = self.inner.lock().unwrap();
Expand All@@ -2011,7 +2016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 match (inner.balances_empty_height, is_all_funds_claimed) {
 (Some(balances_empty_height), true) => {
 // Claimed all funds, check if reached the blocks threshold.
 current_height >= balances_empty_height + BLOCKS_THRESHOLD
(current_height >= balances_empty_height + BLOCKS_THRESHOLD, false)
 },
 (Some(_), false) => {
 // previously assumed we claimed all funds, but we have new funds to claim.
Expand All@@ -2021,7 +2026,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "WARNING: LDK thought it was done claiming all the available funds in the ChannelMonitor for channel {}, but later decided it had more to claim. This is potentially an important bug in LDK, please report it at https://github.com/lightningdevkit/rust-lightning/issues/new",
 inner.get_funding_txo().0);
 inner.balances_empty_height = None;
 false
(false, true)
 },
 (None, true) => {
 // Claimed all funds but `balances_empty_height` is None. It is set to the
Expand All@@ -2030,11 +2035,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "ChannelMonitor funded at {} is now fully resolved. It will become archivable in {} blocks",
 inner.get_funding_txo().0, BLOCKS_THRESHOLD);
 inner.balances_empty_height = Some(current_height);
 false
(false, true)
 },
 (None, false) => {
 // Have funds to claim.
 false
(false, false)
 },
 }
	}
Expand Down

, '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" + '
Persist unresolved ChannelMonitors on empty height change by arik-so · Pull Request #3442 · lightningdevkit/rust-lightning · GitHub
Skip to content
Persist unresolved ChannelMonitors on empty height change#3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Dec 6, 2024
 Merged


Persist unresolved ChannelMonitors on empty height change
#3442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 8 additions & 3 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -640,17 +640,22 @@ where C::Target: chain::Filter,
	/// data could be moved to an archive location or removed entirely.
	pub fn archive_fully_resolved_channel_monitors(&self) {
 let mut have_monitors_to_prune = false;
 for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
 for (funding_txo, monitor_holder) in self.monitors.read().unwrap().iter() {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 have_monitors_to_prune = true;
 }
 if needs_persistence {
 self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
 }
 }
 if have_monitors_to_prune {
 let mut monitors = self.monitors.write().unwrap();
 monitors.retain(|funding_txo, monitor_holder| {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, _) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 log_info!(logger,
 "Archiving fully resolved ChannelMonitor for funding txo {}",
 funding_txo
Expand Down

17 changes: 11 additions & 6 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1994,10 +1994,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {

	/// Checks if the monitor is fully resolved. Resolved monitor is one that has claimed all of
	/// its outputs and balances (i.e. [`Self::get_claimable_balances`] returns an empty set).
	/// Additionally may update state to track when the balances set became empty.
	///
	/// This function returns true only if [`Self::get_claimable_balances`] has been empty for at least
	/// This function returns a tuple of two booleans, the first indicating whether the monitor is
	/// fully resolved, and the second whether the monitor needs persistence to ensure it is
	/// reliably marked as resolved within 4032 blocks.
	///
	/// The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
Comment thread
arik-so marked this conversation as resolved.

	/// 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
	pub fn is_fully_resolved<L: Logger>(&self, logger: &L) -> bool {
	pub fn check_and_update_full_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
 let mut is_all_funds_claimed = self.get_claimable_balances().is_empty();
 let current_height = self.current_best_block().height;
 let mut inner = self.inner.lock().unwrap();
Expand All@@ -2011,7 +2016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 match (inner.balances_empty_height, is_all_funds_claimed) {
 (Some(balances_empty_height), true) => {
 // Claimed all funds, check if reached the blocks threshold.
 current_height >= balances_empty_height + BLOCKS_THRESHOLD
(current_height >= balances_empty_height + BLOCKS_THRESHOLD, false)
 },
 (Some(_), false) => {
 // previously assumed we claimed all funds, but we have new funds to claim.
Expand All@@ -2021,7 +2026,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "WARNING: LDK thought it was done claiming all the available funds in the ChannelMonitor for channel {}, but later decided it had more to claim. This is potentially an important bug in LDK, please report it at https://github.com/lightningdevkit/rust-lightning/issues/new",
 inner.get_funding_txo().0);
 inner.balances_empty_height = None;
 false
(false, true)
 },
 (None, true) => {
 // Claimed all funds but `balances_empty_height` is None. It is set to the
Expand All@@ -2030,11 +2035,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "ChannelMonitor funded at {} is now fully resolved. It will become archivable in {} blocks",
 inner.get_funding_txo().0, BLOCKS_THRESHOLD);
 inner.balances_empty_height = Some(current_height);
 false
(false, true)
 },
 (None, false) => {
 // Have funds to claim.
 false
(false, false)
 },
 }
	}
Expand Down

, '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('^' + ".*" + '
Persist unresolved ChannelMonitors on empty height change by arik-so · Pull Request #3442 · lightningdevkit/rust-lightning · GitHub
Skip to content
Persist unresolved ChannelMonitors on empty height change#3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Dec 6, 2024
 Merged


Persist unresolved ChannelMonitors on empty height change
#3442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 8 additions & 3 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -640,17 +640,22 @@ where C::Target: chain::Filter,
	/// data could be moved to an archive location or removed entirely.
	pub fn archive_fully_resolved_channel_monitors(&self) {
 let mut have_monitors_to_prune = false;
 for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
 for (funding_txo, monitor_holder) in self.monitors.read().unwrap().iter() {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 have_monitors_to_prune = true;
 }
 if needs_persistence {
 self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
 }
 }
 if have_monitors_to_prune {
 let mut monitors = self.monitors.write().unwrap();
 monitors.retain(|funding_txo, monitor_holder| {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, _) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 log_info!(logger,
 "Archiving fully resolved ChannelMonitor for funding txo {}",
 funding_txo
Expand Down

17 changes: 11 additions & 6 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1994,10 +1994,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {

	/// Checks if the monitor is fully resolved. Resolved monitor is one that has claimed all of
	/// its outputs and balances (i.e. [`Self::get_claimable_balances`] returns an empty set).
	/// Additionally may update state to track when the balances set became empty.
	///
	/// This function returns true only if [`Self::get_claimable_balances`] has been empty for at least
	/// This function returns a tuple of two booleans, the first indicating whether the monitor is
	/// fully resolved, and the second whether the monitor needs persistence to ensure it is
	/// reliably marked as resolved within 4032 blocks.
	///
	/// The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
Comment thread
arik-so marked this conversation as resolved.

	/// 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
	pub fn is_fully_resolved<L: Logger>(&self, logger: &L) -> bool {
	pub fn check_and_update_full_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
 let mut is_all_funds_claimed = self.get_claimable_balances().is_empty();
 let current_height = self.current_best_block().height;
 let mut inner = self.inner.lock().unwrap();
Expand All@@ -2011,7 +2016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 match (inner.balances_empty_height, is_all_funds_claimed) {
 (Some(balances_empty_height), true) => {
 // Claimed all funds, check if reached the blocks threshold.
 current_height >= balances_empty_height + BLOCKS_THRESHOLD
(current_height >= balances_empty_height + BLOCKS_THRESHOLD, false)
 },
 (Some(_), false) => {
 // previously assumed we claimed all funds, but we have new funds to claim.
Expand All@@ -2021,7 +2026,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "WARNING: LDK thought it was done claiming all the available funds in the ChannelMonitor for channel {}, but later decided it had more to claim. This is potentially an important bug in LDK, please report it at https://github.com/lightningdevkit/rust-lightning/issues/new",
 inner.get_funding_txo().0);
 inner.balances_empty_height = None;
 false
(false, true)
 },
 (None, true) => {
 // Claimed all funds but `balances_empty_height` is None. It is set to the
Expand All@@ -2030,11 +2035,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "ChannelMonitor funded at {} is now fully resolved. It will become archivable in {} blocks",
 inner.get_funding_txo().0, BLOCKS_THRESHOLD);
 inner.balances_empty_height = Some(current_height);
 false
(false, true)
 },
 (None, false) => {
 // Have funds to claim.
 false
(false, false)
 },
 }
	}
Expand Down

, '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('^' + ".*" + '
Persist unresolved ChannelMonitors on empty height change by arik-so · Pull Request #3442 · lightningdevkit/rust-lightning · GitHub
Skip to content
Persist unresolved ChannelMonitors on empty height change#3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Dec 6, 2024
 Merged


Persist unresolved ChannelMonitors on empty height change
#3442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 8 additions & 3 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -640,17 +640,22 @@ where C::Target: chain::Filter,
	/// data could be moved to an archive location or removed entirely.
	pub fn archive_fully_resolved_channel_monitors(&self) {
 let mut have_monitors_to_prune = false;
 for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
 for (funding_txo, monitor_holder) in self.monitors.read().unwrap().iter() {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 have_monitors_to_prune = true;
 }
 if needs_persistence {
 self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
 }
 }
 if have_monitors_to_prune {
 let mut monitors = self.monitors.write().unwrap();
 monitors.retain(|funding_txo, monitor_holder| {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, _) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 log_info!(logger,
 "Archiving fully resolved ChannelMonitor for funding txo {}",
 funding_txo
Expand Down

17 changes: 11 additions & 6 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1994,10 +1994,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {

	/// Checks if the monitor is fully resolved. Resolved monitor is one that has claimed all of
	/// its outputs and balances (i.e. [`Self::get_claimable_balances`] returns an empty set).
	/// Additionally may update state to track when the balances set became empty.
	///
	/// This function returns true only if [`Self::get_claimable_balances`] has been empty for at least
	/// This function returns a tuple of two booleans, the first indicating whether the monitor is
	/// fully resolved, and the second whether the monitor needs persistence to ensure it is
	/// reliably marked as resolved within 4032 blocks.
	///
	/// The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
Comment thread
arik-so marked this conversation as resolved.

	/// 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
	pub fn is_fully_resolved<L: Logger>(&self, logger: &L) -> bool {
	pub fn check_and_update_full_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
 let mut is_all_funds_claimed = self.get_claimable_balances().is_empty();
 let current_height = self.current_best_block().height;
 let mut inner = self.inner.lock().unwrap();
Expand All@@ -2011,7 +2016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 match (inner.balances_empty_height, is_all_funds_claimed) {
 (Some(balances_empty_height), true) => {
 // Claimed all funds, check if reached the blocks threshold.
 current_height >= balances_empty_height + BLOCKS_THRESHOLD
(current_height >= balances_empty_height + BLOCKS_THRESHOLD, false)
 },
 (Some(_), false) => {
 // previously assumed we claimed all funds, but we have new funds to claim.
Expand All@@ -2021,7 +2026,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "WARNING: LDK thought it was done claiming all the available funds in the ChannelMonitor for channel {}, but later decided it had more to claim. This is potentially an important bug in LDK, please report it at https://github.com/lightningdevkit/rust-lightning/issues/new",
 inner.get_funding_txo().0);
 inner.balances_empty_height = None;
 false
(false, true)
 },
 (None, true) => {
 // Claimed all funds but `balances_empty_height` is None. It is set to the
Expand All@@ -2030,11 +2035,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "ChannelMonitor funded at {} is now fully resolved. It will become archivable in {} blocks",
 inner.get_funding_txo().0, BLOCKS_THRESHOLD);
 inner.balances_empty_height = Some(current_height);
 false
(false, true)
 },
 (None, false) => {
 // Have funds to claim.
 false
(false, false)
 },
 }
	}
Expand Down

, '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); }
})();
})();
Persist unresolved ChannelMonitors on empty height change by arik-so · Pull Request #3442 · lightningdevkit/rust-lightning · GitHub
Skip to content
Persist unresolved ChannelMonitors on empty height change#3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Dec 6, 2024
 Merged


Persist unresolved ChannelMonitors on empty height change
#3442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 8 additions & 3 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -640,17 +640,22 @@ where C::Target: chain::Filter,
	/// data could be moved to an archive location or removed entirely.
	pub fn archive_fully_resolved_channel_monitors(&self) {
 let mut have_monitors_to_prune = false;
 for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
 for (funding_txo, monitor_holder) in self.monitors.read().unwrap().iter() {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 have_monitors_to_prune = true;
 }
 if needs_persistence {
 self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
 }
 }
 if have_monitors_to_prune {
 let mut monitors = self.monitors.write().unwrap();
 monitors.retain(|funding_txo, monitor_holder| {
 let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 if monitor_holder.monitor.is_fully_resolved(&logger) {
 let (is_fully_resolved, _) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 if is_fully_resolved {
 log_info!(logger,
 "Archiving fully resolved ChannelMonitor for funding txo {}",
 funding_txo
Expand Down

17 changes: 11 additions & 6 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1994,10 +1994,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {

	/// Checks if the monitor is fully resolved. Resolved monitor is one that has claimed all of
	/// its outputs and balances (i.e. [`Self::get_claimable_balances`] returns an empty set).
	/// Additionally may update state to track when the balances set became empty.
	///
	/// This function returns true only if [`Self::get_claimable_balances`] has been empty for at least
	/// This function returns a tuple of two booleans, the first indicating whether the monitor is
	/// fully resolved, and the second whether the monitor needs persistence to ensure it is
	/// reliably marked as resolved within 4032 blocks.
	///
	/// The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
Comment thread
arik-so marked this conversation as resolved.

	/// 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
	pub fn is_fully_resolved<L: Logger>(&self, logger: &L) -> bool {
	pub fn check_and_update_full_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
 let mut is_all_funds_claimed = self.get_claimable_balances().is_empty();
 let current_height = self.current_best_block().height;
 let mut inner = self.inner.lock().unwrap();
Expand All@@ -2011,7 +2016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 match (inner.balances_empty_height, is_all_funds_claimed) {
 (Some(balances_empty_height), true) => {
 // Claimed all funds, check if reached the blocks threshold.
 current_height >= balances_empty_height + BLOCKS_THRESHOLD
(current_height >= balances_empty_height + BLOCKS_THRESHOLD, false)
 },
 (Some(_), false) => {
 // previously assumed we claimed all funds, but we have new funds to claim.
Expand All@@ -2021,7 +2026,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "WARNING: LDK thought it was done claiming all the available funds in the ChannelMonitor for channel {}, but later decided it had more to claim. This is potentially an important bug in LDK, please report it at https://github.com/lightningdevkit/rust-lightning/issues/new",
 inner.get_funding_txo().0);
 inner.balances_empty_height = None;
 false
(false, true)
 },
 (None, true) => {
 // Claimed all funds but `balances_empty_height` is None. It is set to the
Expand All@@ -2030,11 +2035,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 "ChannelMonitor funded at {} is now fully resolved. It will become archivable in {} blocks",
 inner.get_funding_txo().0, BLOCKS_THRESHOLD);
 inner.balances_empty_height = Some(current_height);
 false
(false, true)
 },
 (None, false) => {
 // Have funds to claim.
 false
(false, false)
 },
 }
	}
Expand Down