') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); Fix backwards compatibility of `NodeMetrics` reads by tnull · Pull Request #748 · lightningdevkit/ldk-node · GitHub
Skip to content

Fix backwards compatibility of NodeMetrics reads - #748

Merged
tnull merged 3 commits into
lightningdevkit:mainfrom
tnull:2026-01-fix-backwards-compat
Jan 9, 2026
Merged

Fix backwards compatibility of NodeMetrics reads#748
tnull merged 3 commits into
lightningdevkit:mainfrom
tnull:2026-01-fix-backwards-compat

Conversation

@tnull

@tnulltnull commented Jan 8, 2026

Copy link
Copy Markdown
Collaborator

In commit dd55d47 we started ignoring the legacy latest_channel_monitor_archival_height field of NodeMetrics. However, we erroneously started reading it as Option<u32>, though, given it's an optional field, it should have been read as a plain u32 that might or might not be present. Here we fix this error.

We also add a test case asserting serialization backwards compatibility for non-VSS backends.

@tnull
Fix backwards compatibility of NodeMetrics reads
eb83234
In commit dd55d47 we started ignoring
the legacy `latest_channel_monitor_archival_height` field of
`NodeMetrics`. However, we erroneously started reading it as
`Option<u32>`, though, given it's an optional field, it should have been
read as a plain `u32` that might or might not be present. Here we fix this error.
@tnull
tnull requested a review from TheBlueMattJanuary 8, 2026 20:20
@ldk-reviews-bot

ldk-reviews-bot commented Jan 8, 2026•
edited
Loading

Copy link
Copy Markdown

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnulltnull mentioned this pull request Jan 8, 2026
Merged
TheBlueMatt
TheBlueMatt previously approved these changes Jan 8, 2026
View reviewed changes

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops thanks

@tnull
Add backwards compatibility test for non-VSS
06a8108
We previously added a test asserting backwards compatibility for nodes
reinitializing from a VSS backend. However, given VSS tests are only
continously run in CI we here add the same test using the default SQLite
backend, ensuring backwards compatibility breakage is also checked when
running tests locally.
@tnull
Drop unused Watch import
93b6b42
@tnull
tnullforce-pushed the 2026-01-fix-backwards-compat branch from e07e9f5 to 93b6b42CompareJanuary 8, 2026 20:25
@tnull

tnull commented Jan 8, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Oops thanks

Sorry, force-pushed some minor fixups dropping VSS-specific comments from the testcase:

> git diff-tree -U2 e07e9f5c 93b6b425diff --git a/tests/integration_tests_rust.rs b/tests/integration_tests_rust.rs
index 2855c425..4b82d1f4 100644
--- a/tests/integration_tests_rust.rs+++ b/tests/integration_tests_rust.rs@@ -41,5 +41,4 @@ use lightning_invoice::{Bolt11InvoiceDescription, Description};
use lightning_types::payment::{PaymentHash, PaymentPreimage};
use log::LevelFilter;
-use rand::{rng, Rng};
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
@@ -2449,5 +2448,5 @@ async fn persistence_backwards_compatibility() {
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);
-	// Setup a v0.6.2 `Node` persisted with the v0 scheme.+	// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
let mut builder_old = ldk_node_062::Builder::new();
@@ -2473,9 +2472,5 @@ async fn persistence_backwards_compatibility() {
let node_id = node_old.node_id();
- // Workaround necessary as v0.6.2's VSS runtime wasn't dropsafe in a tokio context.- tokio::task::block_in_place(move || {- node_old.stop().unwrap();- drop(node_old);- });+ node_old.stop().unwrap();
(balance, node_id)

@tnull
tnull requested a review from TheBlueMattJanuary 8, 2026 20:27
@TheBlueMatt

TheBlueMatt commented Jan 9, 2026

Copy link
Copy Markdown
Contributor

CI is still sad though.

@tnull

tnull commented Jan 9, 2026

Copy link
Copy Markdown
CollaboratorAuthor

CI is still sad though.

Yeah, that seems really unrelated this time:

error: failed to build archive at `/home/runner/work/ldk-node/ldk-node/target/debug/deps/libldk_node.rlib`: No space left on device (os error 28)

@tnull
tnull merged commit 861f6e3 into lightningdevkit:mainJan 9, 2026
25 of 38 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TheBlueMattTheBlueMattTheBlueMatt approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tnull@ldk-reviews-bot@TheBlueMatt