Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,7 @@ lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "
proptest = "1.0.0"
regex = "1.5.6"
criterion = { version = "0.7.0", features = ["async_tokio"] }
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
Expand All@@ -103,9 +104,6 @@ clightningrpc = { version = "0.3.0-beta.8", default-features = false }
lnd_grpc_rust = { version = "2.10.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[target.'cfg(vss_test)'.dev-dependencies]
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[build-dependencies]
uniffi = { version = "0.28.3", features = ["build"], optional = true }

Expand Down
2 changes: 1 addition & 1 deletion src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock, Watch};
use lightning::chain::{chainmonitor, BestBlock};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1837,7 +1837,7 @@ impl_writeable_tlv_based!(NodeMetrics, {
(6, latest_rgs_snapshot_timestamp, option),
(8, latest_node_announcement_broadcast_timestamp, option),
// 10 used to be latest_channel_monitor_archival_height
(10, _legacy_latest_channel_monitor_archival_height, (legacy, Option<u32>, |_: &NodeMetrics| None::<Option<u32>> )),
(10, _legacy_latest_channel_monitor_archival_height, (legacy, u32, |_: &NodeMetrics| None::<Option<u32>> )),
});

pub(crate) fn total_anchor_channels_reserve_sats(
Expand Down
59 changes: 59 additions & 0 deletions tests/integration_tests_rust.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use common::{
TestSyncStore,
};
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
use ldk_node::entropy::NodeEntropy;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
Expand DownExpand Up@@ -2436,3 +2437,61 @@ async fn payment_persistence_after_restart() {

restarted_node_a.stop().unwrap();
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn persistence_backwards_compatibility() {
let (bitcoind, electrsd) = common::setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());

let storage_path = common::random_storage_path().to_str().unwrap().to_owned();
let seed_bytes = [42u8; 64];
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);

// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
let mut builder_old = ldk_node_062::Builder::new();
builder_old.set_network(bitcoin::Network::Regtest);
builder_old.set_storage_dir_path(storage_path.clone());
builder_old.set_entropy_seed_bytes(seed_bytes);
builder_old.set_chain_source_esplora(esplora_url.clone(), None);
let node_old = builder_old.build().unwrap();

node_old.start().unwrap();
let addr_old = node_old.onchain_payment().new_address().unwrap();
common::premine_and_distribute_funds(
&bitcoind.client,
&electrsd.client,
vec![addr_old],
bitcoin::Amount::from_sat(100_000),
)
.await;
node_old.sync_wallets().unwrap();

let balance = node_old.list_balances().spendable_onchain_balance_sats;
assert!(balance > 0);
let node_id = node_old.node_id();

node_old.stop().unwrap();

(balance, node_id)
};

// Now ensure we can still reinit from the same backend.
let mut builder_new = Builder::new();
builder_new.set_network(bitcoin::Network::Regtest);
builder_new.set_storage_dir_path(storage_path);
builder_new.set_chain_source_esplora(esplora_url, None);

let node_new = builder_new.build(node_entropy).unwrap();

node_new.start().unwrap();
node_new.sync_wallets().unwrap();

let new_balance = node_new.list_balances().spendable_onchain_balance_sats;
let new_node_id = node_new.node_id();

assert_eq!(old_node_id, new_node_id);
assert_eq!(old_balance, new_balance);

node_new.stop().unwrap();
}
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" + '
Fix backwards compatibility of `NodeMetrics` reads by tnull · Pull Request #748 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,7 @@ lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "
proptest = "1.0.0"
regex = "1.5.6"
criterion = { version = "0.7.0", features = ["async_tokio"] }
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
Expand All@@ -103,9 +104,6 @@ clightningrpc = { version = "0.3.0-beta.8", default-features = false }
lnd_grpc_rust = { version = "2.10.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[target.'cfg(vss_test)'.dev-dependencies]
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[build-dependencies]
uniffi = { version = "0.28.3", features = ["build"], optional = true }

Expand Down
2 changes: 1 addition & 1 deletion src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock, Watch};
use lightning::chain::{chainmonitor, BestBlock};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1837,7 +1837,7 @@ impl_writeable_tlv_based!(NodeMetrics, {
(6, latest_rgs_snapshot_timestamp, option),
(8, latest_node_announcement_broadcast_timestamp, option),
// 10 used to be latest_channel_monitor_archival_height
(10, _legacy_latest_channel_monitor_archival_height, (legacy, Option<u32>, |_: &NodeMetrics| None::<Option<u32>> )),
(10, _legacy_latest_channel_monitor_archival_height, (legacy, u32, |_: &NodeMetrics| None::<Option<u32>> )),
});

pub(crate) fn total_anchor_channels_reserve_sats(
Expand Down
59 changes: 59 additions & 0 deletions tests/integration_tests_rust.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use common::{
TestSyncStore,
};
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
use ldk_node::entropy::NodeEntropy;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
Expand DownExpand Up@@ -2436,3 +2437,61 @@ async fn payment_persistence_after_restart() {

restarted_node_a.stop().unwrap();
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn persistence_backwards_compatibility() {
let (bitcoind, electrsd) = common::setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());

let storage_path = common::random_storage_path().to_str().unwrap().to_owned();
let seed_bytes = [42u8; 64];
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);

// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
let mut builder_old = ldk_node_062::Builder::new();
builder_old.set_network(bitcoin::Network::Regtest);
builder_old.set_storage_dir_path(storage_path.clone());
builder_old.set_entropy_seed_bytes(seed_bytes);
builder_old.set_chain_source_esplora(esplora_url.clone(), None);
let node_old = builder_old.build().unwrap();

node_old.start().unwrap();
let addr_old = node_old.onchain_payment().new_address().unwrap();
common::premine_and_distribute_funds(
&bitcoind.client,
&electrsd.client,
vec![addr_old],
bitcoin::Amount::from_sat(100_000),
)
.await;
node_old.sync_wallets().unwrap();

let balance = node_old.list_balances().spendable_onchain_balance_sats;
assert!(balance > 0);
let node_id = node_old.node_id();

node_old.stop().unwrap();

(balance, node_id)
};

// Now ensure we can still reinit from the same backend.
let mut builder_new = Builder::new();
builder_new.set_network(bitcoin::Network::Regtest);
builder_new.set_storage_dir_path(storage_path);
builder_new.set_chain_source_esplora(esplora_url, None);

let node_new = builder_new.build(node_entropy).unwrap();

node_new.start().unwrap();
node_new.sync_wallets().unwrap();

let new_balance = node_new.list_balances().spendable_onchain_balance_sats;
let new_node_id = node_new.node_id();

assert_eq!(old_node_id, new_node_id);
assert_eq!(old_balance, new_balance);

node_new.stop().unwrap();
}
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('^' + ".*" + ' Fix backwards compatibility of `NodeMetrics` reads by tnull · Pull Request #748 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,7 @@ lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "
proptest = "1.0.0"
regex = "1.5.6"
criterion = { version = "0.7.0", features = ["async_tokio"] }
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
Expand All@@ -103,9 +104,6 @@ clightningrpc = { version = "0.3.0-beta.8", default-features = false }
lnd_grpc_rust = { version = "2.10.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[target.'cfg(vss_test)'.dev-dependencies]
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[build-dependencies]
uniffi = { version = "0.28.3", features = ["build"], optional = true }

Expand Down
2 changes: 1 addition & 1 deletion src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock, Watch};
use lightning::chain::{chainmonitor, BestBlock};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1837,7 +1837,7 @@ impl_writeable_tlv_based!(NodeMetrics, {
(6, latest_rgs_snapshot_timestamp, option),
(8, latest_node_announcement_broadcast_timestamp, option),
// 10 used to be latest_channel_monitor_archival_height
(10, _legacy_latest_channel_monitor_archival_height, (legacy, Option<u32>, |_: &NodeMetrics| None::<Option<u32>> )),
(10, _legacy_latest_channel_monitor_archival_height, (legacy, u32, |_: &NodeMetrics| None::<Option<u32>> )),
});

pub(crate) fn total_anchor_channels_reserve_sats(
Expand Down
59 changes: 59 additions & 0 deletions tests/integration_tests_rust.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use common::{
TestSyncStore,
};
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
use ldk_node::entropy::NodeEntropy;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
Expand DownExpand Up@@ -2436,3 +2437,61 @@ async fn payment_persistence_after_restart() {

restarted_node_a.stop().unwrap();
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn persistence_backwards_compatibility() {
let (bitcoind, electrsd) = common::setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());

let storage_path = common::random_storage_path().to_str().unwrap().to_owned();
let seed_bytes = [42u8; 64];
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);

// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
let mut builder_old = ldk_node_062::Builder::new();
builder_old.set_network(bitcoin::Network::Regtest);
builder_old.set_storage_dir_path(storage_path.clone());
builder_old.set_entropy_seed_bytes(seed_bytes);
builder_old.set_chain_source_esplora(esplora_url.clone(), None);
let node_old = builder_old.build().unwrap();

node_old.start().unwrap();
let addr_old = node_old.onchain_payment().new_address().unwrap();
common::premine_and_distribute_funds(
&bitcoind.client,
&electrsd.client,
vec![addr_old],
bitcoin::Amount::from_sat(100_000),
)
.await;
node_old.sync_wallets().unwrap();

let balance = node_old.list_balances().spendable_onchain_balance_sats;
assert!(balance > 0);
let node_id = node_old.node_id();

node_old.stop().unwrap();

(balance, node_id)
};

// Now ensure we can still reinit from the same backend.
let mut builder_new = Builder::new();
builder_new.set_network(bitcoin::Network::Regtest);
builder_new.set_storage_dir_path(storage_path);
builder_new.set_chain_source_esplora(esplora_url, None);

let node_new = builder_new.build(node_entropy).unwrap();

node_new.start().unwrap();
node_new.sync_wallets().unwrap();

let new_balance = node_new.list_balances().spendable_onchain_balance_sats;
let new_node_id = node_new.node_id();

assert_eq!(old_node_id, new_node_id);
assert_eq!(old_balance, new_balance);

node_new.stop().unwrap();
}
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('^' + ".*" + ' Fix backwards compatibility of `NodeMetrics` reads by tnull · Pull Request #748 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,7 @@ lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "
proptest = "1.0.0"
regex = "1.5.6"
criterion = { version = "0.7.0", features = ["async_tokio"] }
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
Expand All@@ -103,9 +104,6 @@ clightningrpc = { version = "0.3.0-beta.8", default-features = false }
lnd_grpc_rust = { version = "2.10.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[target.'cfg(vss_test)'.dev-dependencies]
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[build-dependencies]
uniffi = { version = "0.28.3", features = ["build"], optional = true }

Expand Down
2 changes: 1 addition & 1 deletion src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock, Watch};
use lightning::chain::{chainmonitor, BestBlock};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1837,7 +1837,7 @@ impl_writeable_tlv_based!(NodeMetrics, {
(6, latest_rgs_snapshot_timestamp, option),
(8, latest_node_announcement_broadcast_timestamp, option),
// 10 used to be latest_channel_monitor_archival_height
(10, _legacy_latest_channel_monitor_archival_height, (legacy, Option<u32>, |_: &NodeMetrics| None::<Option<u32>> )),
(10, _legacy_latest_channel_monitor_archival_height, (legacy, u32, |_: &NodeMetrics| None::<Option<u32>> )),
});

pub(crate) fn total_anchor_channels_reserve_sats(
Expand Down
59 changes: 59 additions & 0 deletions tests/integration_tests_rust.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use common::{
TestSyncStore,
};
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
use ldk_node::entropy::NodeEntropy;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
Expand DownExpand Up@@ -2436,3 +2437,61 @@ async fn payment_persistence_after_restart() {

restarted_node_a.stop().unwrap();
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn persistence_backwards_compatibility() {
let (bitcoind, electrsd) = common::setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());

let storage_path = common::random_storage_path().to_str().unwrap().to_owned();
let seed_bytes = [42u8; 64];
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);

// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
let mut builder_old = ldk_node_062::Builder::new();
builder_old.set_network(bitcoin::Network::Regtest);
builder_old.set_storage_dir_path(storage_path.clone());
builder_old.set_entropy_seed_bytes(seed_bytes);
builder_old.set_chain_source_esplora(esplora_url.clone(), None);
let node_old = builder_old.build().unwrap();

node_old.start().unwrap();
let addr_old = node_old.onchain_payment().new_address().unwrap();
common::premine_and_distribute_funds(
&bitcoind.client,
&electrsd.client,
vec![addr_old],
bitcoin::Amount::from_sat(100_000),
)
.await;
node_old.sync_wallets().unwrap();

let balance = node_old.list_balances().spendable_onchain_balance_sats;
assert!(balance > 0);
let node_id = node_old.node_id();

node_old.stop().unwrap();

(balance, node_id)
};

// Now ensure we can still reinit from the same backend.
let mut builder_new = Builder::new();
builder_new.set_network(bitcoin::Network::Regtest);
builder_new.set_storage_dir_path(storage_path);
builder_new.set_chain_source_esplora(esplora_url, None);

let node_new = builder_new.build(node_entropy).unwrap();

node_new.start().unwrap();
node_new.sync_wallets().unwrap();

let new_balance = node_new.list_balances().spendable_onchain_balance_sats;
let new_node_id = node_new.node_id();

assert_eq!(old_node_id, new_node_id);
assert_eq!(old_balance, new_balance);

node_new.stop().unwrap();
}
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" + ' Fix backwards compatibility of `NodeMetrics` reads by tnull · Pull Request #748 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,7 @@ lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "
proptest = "1.0.0"
regex = "1.5.6"
criterion = { version = "0.7.0", features = ["async_tokio"] }
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
Expand All@@ -103,9 +104,6 @@ clightningrpc = { version = "0.3.0-beta.8", default-features = false }
lnd_grpc_rust = { version = "2.10.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[target.'cfg(vss_test)'.dev-dependencies]
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[build-dependencies]
uniffi = { version = "0.28.3", features = ["build"], optional = true }

Expand Down
2 changes: 1 addition & 1 deletion src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock, Watch};
use lightning::chain::{chainmonitor, BestBlock};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1837,7 +1837,7 @@ impl_writeable_tlv_based!(NodeMetrics, {
(6, latest_rgs_snapshot_timestamp, option),
(8, latest_node_announcement_broadcast_timestamp, option),
// 10 used to be latest_channel_monitor_archival_height
(10, _legacy_latest_channel_monitor_archival_height, (legacy, Option<u32>, |_: &NodeMetrics| None::<Option<u32>> )),
(10, _legacy_latest_channel_monitor_archival_height, (legacy, u32, |_: &NodeMetrics| None::<Option<u32>> )),
});

pub(crate) fn total_anchor_channels_reserve_sats(
Expand Down
59 changes: 59 additions & 0 deletions tests/integration_tests_rust.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use common::{
TestSyncStore,
};
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
use ldk_node::entropy::NodeEntropy;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
Expand DownExpand Up@@ -2436,3 +2437,61 @@ async fn payment_persistence_after_restart() {

restarted_node_a.stop().unwrap();
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn persistence_backwards_compatibility() {
let (bitcoind, electrsd) = common::setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());

let storage_path = common::random_storage_path().to_str().unwrap().to_owned();
let seed_bytes = [42u8; 64];
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);

// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
let mut builder_old = ldk_node_062::Builder::new();
builder_old.set_network(bitcoin::Network::Regtest);
builder_old.set_storage_dir_path(storage_path.clone());
builder_old.set_entropy_seed_bytes(seed_bytes);
builder_old.set_chain_source_esplora(esplora_url.clone(), None);
let node_old = builder_old.build().unwrap();

node_old.start().unwrap();
let addr_old = node_old.onchain_payment().new_address().unwrap();
common::premine_and_distribute_funds(
&bitcoind.client,
&electrsd.client,
vec![addr_old],
bitcoin::Amount::from_sat(100_000),
)
.await;
node_old.sync_wallets().unwrap();

let balance = node_old.list_balances().spendable_onchain_balance_sats;
assert!(balance > 0);
let node_id = node_old.node_id();

node_old.stop().unwrap();

(balance, node_id)
};

// Now ensure we can still reinit from the same backend.
let mut builder_new = Builder::new();
builder_new.set_network(bitcoin::Network::Regtest);
builder_new.set_storage_dir_path(storage_path);
builder_new.set_chain_source_esplora(esplora_url, None);

let node_new = builder_new.build(node_entropy).unwrap();

node_new.start().unwrap();
node_new.sync_wallets().unwrap();

let new_balance = node_new.list_balances().spendable_onchain_balance_sats;
let new_node_id = node_new.node_id();

assert_eq!(old_node_id, new_node_id);
assert_eq!(old_balance, new_balance);

node_new.stop().unwrap();
}
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('^' + ".*" + ' Fix backwards compatibility of `NodeMetrics` reads by tnull · Pull Request #748 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,7 @@ lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "
proptest = "1.0.0"
regex = "1.5.6"
criterion = { version = "0.7.0", features = ["async_tokio"] }
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
Expand All@@ -103,9 +104,6 @@ clightningrpc = { version = "0.3.0-beta.8", default-features = false }
lnd_grpc_rust = { version = "2.10.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[target.'cfg(vss_test)'.dev-dependencies]
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[build-dependencies]
uniffi = { version = "0.28.3", features = ["build"], optional = true }

Expand Down
2 changes: 1 addition & 1 deletion src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock, Watch};
use lightning::chain::{chainmonitor, BestBlock};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1837,7 +1837,7 @@ impl_writeable_tlv_based!(NodeMetrics, {
(6, latest_rgs_snapshot_timestamp, option),
(8, latest_node_announcement_broadcast_timestamp, option),
// 10 used to be latest_channel_monitor_archival_height
(10, _legacy_latest_channel_monitor_archival_height, (legacy, Option<u32>, |_: &NodeMetrics| None::<Option<u32>> )),
(10, _legacy_latest_channel_monitor_archival_height, (legacy, u32, |_: &NodeMetrics| None::<Option<u32>> )),
});

pub(crate) fn total_anchor_channels_reserve_sats(
Expand Down
59 changes: 59 additions & 0 deletions tests/integration_tests_rust.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use common::{
TestSyncStore,
};
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
use ldk_node::entropy::NodeEntropy;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
Expand DownExpand Up@@ -2436,3 +2437,61 @@ async fn payment_persistence_after_restart() {

restarted_node_a.stop().unwrap();
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn persistence_backwards_compatibility() {
let (bitcoind, electrsd) = common::setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());

let storage_path = common::random_storage_path().to_str().unwrap().to_owned();
let seed_bytes = [42u8; 64];
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);

// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
let mut builder_old = ldk_node_062::Builder::new();
builder_old.set_network(bitcoin::Network::Regtest);
builder_old.set_storage_dir_path(storage_path.clone());
builder_old.set_entropy_seed_bytes(seed_bytes);
builder_old.set_chain_source_esplora(esplora_url.clone(), None);
let node_old = builder_old.build().unwrap();

node_old.start().unwrap();
let addr_old = node_old.onchain_payment().new_address().unwrap();
common::premine_and_distribute_funds(
&bitcoind.client,
&electrsd.client,
vec![addr_old],
bitcoin::Amount::from_sat(100_000),
)
.await;
node_old.sync_wallets().unwrap();

let balance = node_old.list_balances().spendable_onchain_balance_sats;
assert!(balance > 0);
let node_id = node_old.node_id();

node_old.stop().unwrap();

(balance, node_id)
};

// Now ensure we can still reinit from the same backend.
let mut builder_new = Builder::new();
builder_new.set_network(bitcoin::Network::Regtest);
builder_new.set_storage_dir_path(storage_path);
builder_new.set_chain_source_esplora(esplora_url, None);

let node_new = builder_new.build(node_entropy).unwrap();

node_new.start().unwrap();
node_new.sync_wallets().unwrap();

let new_balance = node_new.list_balances().spendable_onchain_balance_sats;
let new_node_id = node_new.node_id();

assert_eq!(old_node_id, new_node_id);
assert_eq!(old_balance, new_balance);

node_new.stop().unwrap();
}
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('^' + ".*" + ' Fix backwards compatibility of `NodeMetrics` reads by tnull · Pull Request #748 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,7 @@ lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "
proptest = "1.0.0"
regex = "1.5.6"
criterion = { version = "0.7.0", features = ["async_tokio"] }
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
Expand All@@ -103,9 +104,6 @@ clightningrpc = { version = "0.3.0-beta.8", default-features = false }
lnd_grpc_rust = { version = "2.10.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[target.'cfg(vss_test)'.dev-dependencies]
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[build-dependencies]
uniffi = { version = "0.28.3", features = ["build"], optional = true }

Expand Down
2 changes: 1 addition & 1 deletion src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock, Watch};
use lightning::chain::{chainmonitor, BestBlock};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1837,7 +1837,7 @@ impl_writeable_tlv_based!(NodeMetrics, {
(6, latest_rgs_snapshot_timestamp, option),
(8, latest_node_announcement_broadcast_timestamp, option),
// 10 used to be latest_channel_monitor_archival_height
(10, _legacy_latest_channel_monitor_archival_height, (legacy, Option<u32>, |_: &NodeMetrics| None::<Option<u32>> )),
(10, _legacy_latest_channel_monitor_archival_height, (legacy, u32, |_: &NodeMetrics| None::<Option<u32>> )),
});

pub(crate) fn total_anchor_channels_reserve_sats(
Expand Down
59 changes: 59 additions & 0 deletions tests/integration_tests_rust.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use common::{
TestSyncStore,
};
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
use ldk_node::entropy::NodeEntropy;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
Expand DownExpand Up@@ -2436,3 +2437,61 @@ async fn payment_persistence_after_restart() {

restarted_node_a.stop().unwrap();
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn persistence_backwards_compatibility() {
let (bitcoind, electrsd) = common::setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());

let storage_path = common::random_storage_path().to_str().unwrap().to_owned();
let seed_bytes = [42u8; 64];
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);

// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
let mut builder_old = ldk_node_062::Builder::new();
builder_old.set_network(bitcoin::Network::Regtest);
builder_old.set_storage_dir_path(storage_path.clone());
builder_old.set_entropy_seed_bytes(seed_bytes);
builder_old.set_chain_source_esplora(esplora_url.clone(), None);
let node_old = builder_old.build().unwrap();

node_old.start().unwrap();
let addr_old = node_old.onchain_payment().new_address().unwrap();
common::premine_and_distribute_funds(
&bitcoind.client,
&electrsd.client,
vec![addr_old],
bitcoin::Amount::from_sat(100_000),
)
.await;
node_old.sync_wallets().unwrap();

let balance = node_old.list_balances().spendable_onchain_balance_sats;
assert!(balance > 0);
let node_id = node_old.node_id();

node_old.stop().unwrap();

(balance, node_id)
};

// Now ensure we can still reinit from the same backend.
let mut builder_new = Builder::new();
builder_new.set_network(bitcoin::Network::Regtest);
builder_new.set_storage_dir_path(storage_path);
builder_new.set_chain_source_esplora(esplora_url, None);

let node_new = builder_new.build(node_entropy).unwrap();

node_new.start().unwrap();
node_new.sync_wallets().unwrap();

let new_balance = node_new.list_balances().spendable_onchain_balance_sats;
let new_node_id = node_new.node_id();

assert_eq!(old_node_id, new_node_id);
assert_eq!(old_balance, new_balance);

node_new.stop().unwrap();
}
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); } })(); })(); Fix backwards compatibility of `NodeMetrics` reads by tnull · Pull Request #748 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,7 @@ lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "
proptest = "1.0.0"
regex = "1.5.6"
criterion = { version = "0.7.0", features = ["async_tokio"] }
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
Expand All@@ -103,9 +104,6 @@ clightningrpc = { version = "0.3.0-beta.8", default-features = false }
lnd_grpc_rust = { version = "2.10.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[target.'cfg(vss_test)'.dev-dependencies]
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }

[build-dependencies]
uniffi = { version = "0.28.3", features = ["build"], optional = true }

Expand Down
2 changes: 1 addition & 1 deletion src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock, Watch};
use lightning::chain::{chainmonitor, BestBlock};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1837,7 +1837,7 @@ impl_writeable_tlv_based!(NodeMetrics, {
(6, latest_rgs_snapshot_timestamp, option),
(8, latest_node_announcement_broadcast_timestamp, option),
// 10 used to be latest_channel_monitor_archival_height
(10, _legacy_latest_channel_monitor_archival_height, (legacy, Option<u32>, |_: &NodeMetrics| None::<Option<u32>> )),
(10, _legacy_latest_channel_monitor_archival_height, (legacy, u32, |_: &NodeMetrics| None::<Option<u32>> )),
});

pub(crate) fn total_anchor_channels_reserve_sats(
Expand Down
59 changes: 59 additions & 0 deletions tests/integration_tests_rust.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use common::{
TestSyncStore,
};
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
use ldk_node::entropy::NodeEntropy;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
Expand DownExpand Up@@ -2436,3 +2437,61 @@ async fn payment_persistence_after_restart() {

restarted_node_a.stop().unwrap();
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn persistence_backwards_compatibility() {
let (bitcoind, electrsd) = common::setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());

let storage_path = common::random_storage_path().to_str().unwrap().to_owned();
let seed_bytes = [42u8; 64];
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);

// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
let mut builder_old = ldk_node_062::Builder::new();
builder_old.set_network(bitcoin::Network::Regtest);
builder_old.set_storage_dir_path(storage_path.clone());
builder_old.set_entropy_seed_bytes(seed_bytes);
builder_old.set_chain_source_esplora(esplora_url.clone(), None);
let node_old = builder_old.build().unwrap();

node_old.start().unwrap();
let addr_old = node_old.onchain_payment().new_address().unwrap();
common::premine_and_distribute_funds(
&bitcoind.client,
&electrsd.client,
vec![addr_old],
bitcoin::Amount::from_sat(100_000),
)
.await;
node_old.sync_wallets().unwrap();

let balance = node_old.list_balances().spendable_onchain_balance_sats;
assert!(balance > 0);
let node_id = node_old.node_id();

node_old.stop().unwrap();

(balance, node_id)
};

// Now ensure we can still reinit from the same backend.
let mut builder_new = Builder::new();
builder_new.set_network(bitcoin::Network::Regtest);
builder_new.set_storage_dir_path(storage_path);
builder_new.set_chain_source_esplora(esplora_url, None);

let node_new = builder_new.build(node_entropy).unwrap();

node_new.start().unwrap();
node_new.sync_wallets().unwrap();

let new_balance = node_new.list_balances().spendable_onchain_balance_sats;
let new_node_id = node_new.node_id();

assert_eq!(old_node_id, new_node_id);
assert_eq!(old_balance, new_balance);

node_new.stop().unwrap();
}
Loading