Skip to content

Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager#3554

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
wpaulino merged 3 commits into from
Jan 31, 2025
Merged

Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager #3554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d205d8d
Use channel ID over funding outpoint to track monitors in ChainMonitor
wpaulino Jan 16, 2025
e8854f9
Use channel ID over funding outpoint to track monitors in ChannelManager
wpaulino Jan 16, 2025
717db82
Remove funding script return value from ChannelMonitor::get_funding_txo
wpaulino Jan 31, 2025
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
92 changes: 48 additions & 44 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,7 @@ struct TestChainMonitor {
Arc<TestPersister>,
>,
>,
pub latest_monitors: Mutex<HashMap<OutPoint, LatestMonitorState>>,
pub latest_monitors: Mutex<HashMap<ChannelId, LatestMonitorState>>,
}
impl TestChainMonitor {
pub fn new(
Expand All@@ -213,12 +213,12 @@ impl TestChainMonitor {
}
impl chain::Watch<TestChannelSigner> for TestChainMonitor {
fn watch_channel(
&self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
&self, channel_id: ChannelId, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
) -> Result<chain::ChannelMonitorUpdateStatus, ()> {
let mut ser = VecWriter(Vec::new());
monitor.write(&mut ser).unwrap();
let monitor_id = monitor.get_latest_update_id();
let res = self.chain_monitor.watch_channel(funding_txo, monitor);
let res = self.chain_monitor.watch_channel(channel_id, monitor);
let state = match res {
Ok(chain::ChannelMonitorUpdateStatus::Completed) => LatestMonitorState {
persisted_monitor_id: monitor_id,
Expand All@@ -231,17 +231,17 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
Ok(chain::ChannelMonitorUpdateStatus::UnrecoverableError) => panic!(),
Err(()) => panic!(),
};
if self.latest_monitors.lock().unwrap().insert(funding_txo, state).is_some() {
if self.latest_monitors.lock().unwrap().insert(channel_id, state).is_some() {
panic!("Already had monitor pre-watch_channel");
}
res
}

fn update_channel(
&self, funding_txo: OutPoint, update: &channelmonitor::ChannelMonitorUpdate,
&self, channel_id: ChannelId, update: &channelmonitor::ChannelMonitorUpdate,
) -> chain::ChannelMonitorUpdateStatus {
let mut map_lock = self.latest_monitors.lock().unwrap();
let map_entry = map_lock.get_mut(&funding_txo).expect("Didn't have monitor on update call");
let map_entry = map_lock.get_mut(&channel_id).expect("Didn't have monitor on update call");
let latest_monitor_data = map_entry
.pending_monitors
.last()
Expand All@@ -265,7 +265,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
.unwrap();
let mut ser = VecWriter(Vec::new());
deserialized_monitor.write(&mut ser).unwrap();
let res = self.chain_monitor.update_channel(funding_txo, update);
let res = self.chain_monitor.update_channel(channel_id, update);
match res {
chain::ChannelMonitorUpdateStatus::Completed => {
map_entry.persisted_monitor_id = update.update_id;
Expand DownExpand Up@@ -711,9 +711,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

let mut monitors = new_hash_map();
let mut old_monitors = $old_monitors.latest_monitors.lock().unwrap();
for (outpoint, mut prev_state) in old_monitors.drain() {
for (channel_id, mut prev_state) in old_monitors.drain() {
monitors.insert(
outpoint,
channel_id,
<(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
&mut Cursor::new(&prev_state.persisted_monitor),
(&*$keys_manager, &*$keys_manager),
Expand All@@ -725,11 +725,11 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
// considering them discarded. LDK should replay these for us as they're stored in
// the `ChannelManager`.
prev_state.pending_monitors.clear();
chain_monitor.latest_monitors.lock().unwrap().insert(outpoint, prev_state);
chain_monitor.latest_monitors.lock().unwrap().insert(channel_id, prev_state);
}
let mut monitor_refs = new_hash_map();
for (outpoint, monitor) in monitors.iter() {
monitor_refs.insert(*outpoint, monitor);
for (channel_id, monitor) in monitors.iter() {
monitor_refs.insert(*channel_id, monitor);
}

let read_args = ChannelManagerReadArgs {
Expand All@@ -752,9 +752,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
.1,
chain_monitor.clone(),
);
for (funding_txo, mon) in monitors.drain() {
for (channel_id, mon) in monitors.drain() {
assert_eq!(
chain_monitor.chain_monitor.watch_channel(funding_txo, mon),
chain_monitor.chain_monitor.watch_channel(channel_id, mon),
Ok(ChannelMonitorUpdateStatus::Completed)
);
}
Expand DownExpand Up@@ -825,7 +825,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
};

$source.handle_accept_channel($dest.get_our_node_id(), &accept_channel);
let funding_output;
{
let mut events = $source.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
Expand All@@ -845,7 +844,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
script_pubkey: output_script,
}],
};
funding_output = OutPoint { txid: tx.compute_txid(), index: 0 };
$source
.funding_transaction_generated(
temporary_channel_id,
Expand DownExpand Up@@ -890,13 +888,19 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
$source.handle_funding_signed($dest.get_our_node_id(), &funding_signed);
let events = $source.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
if let events::Event::ChannelPending { ref counterparty_node_id, .. } = events[0] {
let channel_id = if let events::Event::ChannelPending {
ref counterparty_node_id,
ref channel_id,
..
} = events[0]
{
assert_eq!(counterparty_node_id, &$dest.get_our_node_id());
channel_id.clone()
} else {
panic!("Wrong event type");
}
};

funding_output
channel_id
}};
}

Expand DownExpand Up@@ -963,8 +967,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

let mut nodes = [node_a, node_b, node_c];

let chan_1_funding = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
let chan_2_funding = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);
let chan_1_id = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
let chan_2_id = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);

for node in nodes.iter() {
confirm_txn!(node);
Expand DownExpand Up@@ -1363,14 +1367,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
}
};

let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_funding| {
if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_id| {
if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_id) {
assert!(
state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
"updates should be sorted by id"
);
for (id, data) in state.pending_monitors.drain(..) {
monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
monitor.chain_monitor.channel_monitor_updated(*chan_id, id).unwrap();
if id > state.persisted_monitor_id {
state.persisted_monitor_id = id;
state.persisted_monitor = data;
Expand DownExpand Up@@ -1410,10 +1414,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
ChannelMonitorUpdateStatus::Completed
},

0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_funding),
0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_funding),
0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_funding),
0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_funding),
0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_id),
0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_id),
0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_id),
0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_id),

0x0c => {
if !chan_a_disconnected {
Expand DownExpand Up@@ -1683,21 +1687,21 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
nodes[2].maybe_update_chan_fees();
},

0xf0 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_first),
0xf1 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_second),
0xf2 => complete_monitor_update(&monitor_a, &chan_1_funding, &Vec::pop),
0xf0 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_first),
0xf1 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_second),
0xf2 => complete_monitor_update(&monitor_a, &chan_1_id, &Vec::pop),

0xf4 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_first),
0xf5 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_second),
0xf6 => complete_monitor_update(&monitor_b, &chan_1_funding, &Vec::pop),
0xf4 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_first),
0xf5 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_second),
0xf6 => complete_monitor_update(&monitor_b, &chan_1_id, &Vec::pop),

0xf8 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_first),
0xf9 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_second),
0xfa => complete_monitor_update(&monitor_b, &chan_2_funding, &Vec::pop),
0xf8 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_first),
0xf9 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_second),
0xfa => complete_monitor_update(&monitor_b, &chan_2_id, &Vec::pop),

0xfc => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_first),
0xfd => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_second),
0xfe => complete_monitor_update(&monitor_c, &chan_2_funding, &Vec::pop),
0xfc => complete_monitor_update(&monitor_c, &chan_2_id, &complete_first),
0xfd => complete_monitor_update(&monitor_c, &chan_2_id, &complete_second),
0xfe => complete_monitor_update(&monitor_c, &chan_2_id, &Vec::pop),

0xff => {
// Test that no channel is in a stuck state where neither party can send funds even
Expand All@@ -1711,10 +1715,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
*monitor_c.persister.update_ret.lock().unwrap() =
ChannelMonitorUpdateStatus::Completed;

complete_all_monitor_updates(&monitor_a, &chan_1_funding);
complete_all_monitor_updates(&monitor_b, &chan_1_funding);
complete_all_monitor_updates(&monitor_b, &chan_2_funding);
complete_all_monitor_updates(&monitor_c, &chan_2_funding);
complete_all_monitor_updates(&monitor_a, &chan_1_id);
complete_all_monitor_updates(&monitor_b, &chan_1_id);
complete_all_monitor_updates(&monitor_b, &chan_2_id);
complete_all_monitor_updates(&monitor_c, &chan_2_id);

// Next, make sure peers are all connected to each other
if chan_a_disconnected {
Expand Down
2 changes: 1 addition & 1 deletion lightning-block-sync/src/init.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ where
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
/// chain_monitor.watch_channel(monitor.channel_id(), monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
/// let chain_poller = poll::ChainPoller::new(block_source, Network::Bitcoin);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager by wpaulino · Pull Request #3554 · lightningdevkit/rust-lightning · GitHub
Skip to content
Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager#3554

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

wpaulino
merged 3 commits into

from

Jan 31, 2025
 Merged


Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager
#3554
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d205d8d

Use channel ID over funding outpoint to track monitors in ChainMonitor


wpaulino Jan 16, 2025
e8854f9

Use channel ID over funding outpoint to track monitors in ChannelManager


wpaulino Jan 16, 2025
717db82

Remove funding script return value from ChannelMonitor::get_funding_txo


wpaulino Jan 31, 2025

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


92 changes: 48 additions & 44 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,7 @@ struct TestChainMonitor {
 Arc<TestPersister>,
 >,
	>,
	pub latest_monitors: Mutex<HashMap<OutPoint, LatestMonitorState>>,
	pub latest_monitors: Mutex<HashMap<ChannelId, LatestMonitorState>>,
}
impl TestChainMonitor {
	pub fn new(
Expand All@@ -213,12 +213,12 @@ impl TestChainMonitor {
}
impl chain::Watch<TestChannelSigner> for TestChainMonitor {
	fn watch_channel(
 &self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
 &self, channel_id: ChannelId, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
	) -> Result<chain::ChannelMonitorUpdateStatus, ()> {
 let mut ser = VecWriter(Vec::new());
 monitor.write(&mut ser).unwrap();
 let monitor_id = monitor.get_latest_update_id();
 let res = self.chain_monitor.watch_channel(funding_txo, monitor);
 let res = self.chain_monitor.watch_channel(channel_id, monitor);
 let state = match res {
 Ok(chain::ChannelMonitorUpdateStatus::Completed) => LatestMonitorState {
 persisted_monitor_id: monitor_id,
Expand All@@ -231,17 +231,17 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 Ok(chain::ChannelMonitorUpdateStatus::UnrecoverableError) => panic!(),
 Err(()) => panic!(),
 };
 if self.latest_monitors.lock().unwrap().insert(funding_txo, state).is_some() {
 if self.latest_monitors.lock().unwrap().insert(channel_id, state).is_some() {
 panic!("Already had monitor pre-watch_channel");
 }
 res
	}

	fn update_channel(
 &self, funding_txo: OutPoint, update: &channelmonitor::ChannelMonitorUpdate,
 &self, channel_id: ChannelId, update: &channelmonitor::ChannelMonitorUpdate,
	) -> chain::ChannelMonitorUpdateStatus {
 let mut map_lock = self.latest_monitors.lock().unwrap();
 let map_entry = map_lock.get_mut(&funding_txo).expect("Didn't have monitor on update call");
 let map_entry = map_lock.get_mut(&channel_id).expect("Didn't have monitor on update call");
 let latest_monitor_data = map_entry
 .pending_monitors
 .last()
Expand All@@ -265,7 +265,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 .unwrap();
 let mut ser = VecWriter(Vec::new());
 deserialized_monitor.write(&mut ser).unwrap();
 let res = self.chain_monitor.update_channel(funding_txo, update);
 let res = self.chain_monitor.update_channel(channel_id, update);
 match res {
 chain::ChannelMonitorUpdateStatus::Completed => {
 map_entry.persisted_monitor_id = update.update_id;
Expand DownExpand Up@@ -711,9 +711,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

 let mut monitors = new_hash_map();
 let mut old_monitors = $old_monitors.latest_monitors.lock().unwrap();
 for (outpoint, mut prev_state) in old_monitors.drain() {
 for (channel_id, mut prev_state) in old_monitors.drain() {
 monitors.insert(
outpoint,
channel_id,
 <(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
 &mut Cursor::new(&prev_state.persisted_monitor),
 (&*$keys_manager, &*$keys_manager),
Expand All@@ -725,11 +725,11 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 // considering them discarded. LDK should replay these for us as they're stored in
 // the `ChannelManager`.
 prev_state.pending_monitors.clear();
 chain_monitor.latest_monitors.lock().unwrap().insert(outpoint, prev_state);
 chain_monitor.latest_monitors.lock().unwrap().insert(channel_id, prev_state);
 }
 let mut monitor_refs = new_hash_map();
 for (outpoint, monitor) in monitors.iter() {
 monitor_refs.insert(*outpoint, monitor);
 for (channel_id, monitor) in monitors.iter() {
 monitor_refs.insert(*channel_id, monitor);
 }

 let read_args = ChannelManagerReadArgs {
Expand All@@ -752,9 +752,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 .1,
 chain_monitor.clone(),
 );
 for (funding_txo, mon) in monitors.drain() {
 for (channel_id, mon) in monitors.drain() {
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(funding_txo, mon),
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 );
 }
Expand DownExpand Up@@ -825,7 +825,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 };

 $source.handle_accept_channel($dest.get_our_node_id(), &accept_channel);
 let funding_output;
 {
 let mut events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -845,7 +844,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 script_pubkey: output_script,
 }],
 };
 funding_output = OutPoint { txid: tx.compute_txid(), index: 0 };
 $source
 .funding_transaction_generated(
 temporary_channel_id,
Expand DownExpand Up@@ -890,13 +888,19 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 $source.handle_funding_signed($dest.get_our_node_id(), &funding_signed);
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
 if let events::Event::ChannelPending { ref counterparty_node_id, .. } = events[0] {
 let channel_id = if let events::Event::ChannelPending {
 ref counterparty_node_id,
 ref channel_id,
 ..
 } = events[0]
 {
 assert_eq!(counterparty_node_id, &$dest.get_our_node_id());
 channel_id.clone()
 } else {
 panic!("Wrong event type");
 }
 };

funding_output
channel_id
 }};
	}

Expand DownExpand Up@@ -963,8 +967,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

	let mut nodes = [node_a, node_b, node_c];

	let chan_1_funding = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_funding = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);
	let chan_1_id = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_id = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);

	for node in nodes.iter() {
 confirm_txn!(node);
Expand DownExpand Up@@ -1363,14 +1367,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 }
 };

 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_funding| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_id| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_id) {
 assert!(
 state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
 "updates should be sorted by id"
 );
 for (id, data) in state.pending_monitors.drain(..) {
 monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
 monitor.chain_monitor.channel_monitor_updated(*chan_id, id).unwrap();
 if id > state.persisted_monitor_id {
 state.persisted_monitor_id = id;
 state.persisted_monitor = data;
Expand DownExpand Up@@ -1410,10 +1414,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 ChannelMonitorUpdateStatus::Completed
 },

 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_funding),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_funding),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_funding),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_funding),
 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_id),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_id),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_id),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_id),

 0x0c => {
 if !chan_a_disconnected {
Expand DownExpand Up@@ -1683,21 +1687,21 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 nodes[2].maybe_update_chan_fees();
 },

 0xf0 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_funding, &Vec::pop),
 0xf0 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_id, &Vec::pop),

 0xf4 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_funding, &Vec::pop),
 0xf4 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_id, &Vec::pop),

 0xf8 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_funding, &Vec::pop),
 0xf8 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_id, &Vec::pop),

 0xfc => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_funding, &Vec::pop),
 0xfc => complete_monitor_update(&monitor_c, &chan_2_id, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_id, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_id, &Vec::pop),

 0xff => {
 // Test that no channel is in a stuck state where neither party can send funds even
Expand All@@ -1711,10 +1715,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 *monitor_c.persister.update_ret.lock().unwrap() =
 ChannelMonitorUpdateStatus::Completed;

 complete_all_monitor_updates(&monitor_a, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_2_funding);
 complete_all_monitor_updates(&monitor_c, &chan_2_funding);
 complete_all_monitor_updates(&monitor_a, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_2_id);
 complete_all_monitor_updates(&monitor_c, &chan_2_id);

 // Next, make sure peers are all connected to each other
 if chan_a_disconnected {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ where
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
/// chain_monitor.watch_channel(monitor.channel_id(), monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
/// let chain_poller = poll::ChainPoller::new(block_source, Network::Bitcoin);
Expand Down
Loading

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

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

wpaulino
merged 3 commits into

from

Jan 31, 2025
 Merged


Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager
#3554
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d205d8d

Use channel ID over funding outpoint to track monitors in ChainMonitor


wpaulino Jan 16, 2025
e8854f9

Use channel ID over funding outpoint to track monitors in ChannelManager


wpaulino Jan 16, 2025
717db82

Remove funding script return value from ChannelMonitor::get_funding_txo


wpaulino Jan 31, 2025

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


92 changes: 48 additions & 44 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,7 @@ struct TestChainMonitor {
 Arc<TestPersister>,
 >,
	>,
	pub latest_monitors: Mutex<HashMap<OutPoint, LatestMonitorState>>,
	pub latest_monitors: Mutex<HashMap<ChannelId, LatestMonitorState>>,
}
impl TestChainMonitor {
	pub fn new(
Expand All@@ -213,12 +213,12 @@ impl TestChainMonitor {
}
impl chain::Watch<TestChannelSigner> for TestChainMonitor {
	fn watch_channel(
 &self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
 &self, channel_id: ChannelId, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
	) -> Result<chain::ChannelMonitorUpdateStatus, ()> {
 let mut ser = VecWriter(Vec::new());
 monitor.write(&mut ser).unwrap();
 let monitor_id = monitor.get_latest_update_id();
 let res = self.chain_monitor.watch_channel(funding_txo, monitor);
 let res = self.chain_monitor.watch_channel(channel_id, monitor);
 let state = match res {
 Ok(chain::ChannelMonitorUpdateStatus::Completed) => LatestMonitorState {
 persisted_monitor_id: monitor_id,
Expand All@@ -231,17 +231,17 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 Ok(chain::ChannelMonitorUpdateStatus::UnrecoverableError) => panic!(),
 Err(()) => panic!(),
 };
 if self.latest_monitors.lock().unwrap().insert(funding_txo, state).is_some() {
 if self.latest_monitors.lock().unwrap().insert(channel_id, state).is_some() {
 panic!("Already had monitor pre-watch_channel");
 }
 res
	}

	fn update_channel(
 &self, funding_txo: OutPoint, update: &channelmonitor::ChannelMonitorUpdate,
 &self, channel_id: ChannelId, update: &channelmonitor::ChannelMonitorUpdate,
	) -> chain::ChannelMonitorUpdateStatus {
 let mut map_lock = self.latest_monitors.lock().unwrap();
 let map_entry = map_lock.get_mut(&funding_txo).expect("Didn't have monitor on update call");
 let map_entry = map_lock.get_mut(&channel_id).expect("Didn't have monitor on update call");
 let latest_monitor_data = map_entry
 .pending_monitors
 .last()
Expand All@@ -265,7 +265,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 .unwrap();
 let mut ser = VecWriter(Vec::new());
 deserialized_monitor.write(&mut ser).unwrap();
 let res = self.chain_monitor.update_channel(funding_txo, update);
 let res = self.chain_monitor.update_channel(channel_id, update);
 match res {
 chain::ChannelMonitorUpdateStatus::Completed => {
 map_entry.persisted_monitor_id = update.update_id;
Expand DownExpand Up@@ -711,9 +711,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

 let mut monitors = new_hash_map();
 let mut old_monitors = $old_monitors.latest_monitors.lock().unwrap();
 for (outpoint, mut prev_state) in old_monitors.drain() {
 for (channel_id, mut prev_state) in old_monitors.drain() {
 monitors.insert(
outpoint,
channel_id,
 <(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
 &mut Cursor::new(&prev_state.persisted_monitor),
 (&*$keys_manager, &*$keys_manager),
Expand All@@ -725,11 +725,11 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 // considering them discarded. LDK should replay these for us as they're stored in
 // the `ChannelManager`.
 prev_state.pending_monitors.clear();
 chain_monitor.latest_monitors.lock().unwrap().insert(outpoint, prev_state);
 chain_monitor.latest_monitors.lock().unwrap().insert(channel_id, prev_state);
 }
 let mut monitor_refs = new_hash_map();
 for (outpoint, monitor) in monitors.iter() {
 monitor_refs.insert(*outpoint, monitor);
 for (channel_id, monitor) in monitors.iter() {
 monitor_refs.insert(*channel_id, monitor);
 }

 let read_args = ChannelManagerReadArgs {
Expand All@@ -752,9 +752,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 .1,
 chain_monitor.clone(),
 );
 for (funding_txo, mon) in monitors.drain() {
 for (channel_id, mon) in monitors.drain() {
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(funding_txo, mon),
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 );
 }
Expand DownExpand Up@@ -825,7 +825,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 };

 $source.handle_accept_channel($dest.get_our_node_id(), &accept_channel);
 let funding_output;
 {
 let mut events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -845,7 +844,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 script_pubkey: output_script,
 }],
 };
 funding_output = OutPoint { txid: tx.compute_txid(), index: 0 };
 $source
 .funding_transaction_generated(
 temporary_channel_id,
Expand DownExpand Up@@ -890,13 +888,19 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 $source.handle_funding_signed($dest.get_our_node_id(), &funding_signed);
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
 if let events::Event::ChannelPending { ref counterparty_node_id, .. } = events[0] {
 let channel_id = if let events::Event::ChannelPending {
 ref counterparty_node_id,
 ref channel_id,
 ..
 } = events[0]
 {
 assert_eq!(counterparty_node_id, &$dest.get_our_node_id());
 channel_id.clone()
 } else {
 panic!("Wrong event type");
 }
 };

funding_output
channel_id
 }};
	}

Expand DownExpand Up@@ -963,8 +967,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

	let mut nodes = [node_a, node_b, node_c];

	let chan_1_funding = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_funding = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);
	let chan_1_id = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_id = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);

	for node in nodes.iter() {
 confirm_txn!(node);
Expand DownExpand Up@@ -1363,14 +1367,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 }
 };

 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_funding| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_id| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_id) {
 assert!(
 state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
 "updates should be sorted by id"
 );
 for (id, data) in state.pending_monitors.drain(..) {
 monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
 monitor.chain_monitor.channel_monitor_updated(*chan_id, id).unwrap();
 if id > state.persisted_monitor_id {
 state.persisted_monitor_id = id;
 state.persisted_monitor = data;
Expand DownExpand Up@@ -1410,10 +1414,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 ChannelMonitorUpdateStatus::Completed
 },

 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_funding),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_funding),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_funding),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_funding),
 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_id),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_id),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_id),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_id),

 0x0c => {
 if !chan_a_disconnected {
Expand DownExpand Up@@ -1683,21 +1687,21 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 nodes[2].maybe_update_chan_fees();
 },

 0xf0 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_funding, &Vec::pop),
 0xf0 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_id, &Vec::pop),

 0xf4 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_funding, &Vec::pop),
 0xf4 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_id, &Vec::pop),

 0xf8 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_funding, &Vec::pop),
 0xf8 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_id, &Vec::pop),

 0xfc => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_funding, &Vec::pop),
 0xfc => complete_monitor_update(&monitor_c, &chan_2_id, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_id, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_id, &Vec::pop),

 0xff => {
 // Test that no channel is in a stuck state where neither party can send funds even
Expand All@@ -1711,10 +1715,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 *monitor_c.persister.update_ret.lock().unwrap() =
 ChannelMonitorUpdateStatus::Completed;

 complete_all_monitor_updates(&monitor_a, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_2_funding);
 complete_all_monitor_updates(&monitor_c, &chan_2_funding);
 complete_all_monitor_updates(&monitor_a, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_2_id);
 complete_all_monitor_updates(&monitor_c, &chan_2_id);

 // Next, make sure peers are all connected to each other
 if chan_a_disconnected {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ where
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
/// chain_monitor.watch_channel(monitor.channel_id(), monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
/// let chain_poller = poll::ChainPoller::new(block_source, Network::Bitcoin);
Expand Down
Loading

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

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

wpaulino
merged 3 commits into

from

Jan 31, 2025
 Merged


Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager
#3554
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d205d8d

Use channel ID over funding outpoint to track monitors in ChainMonitor


wpaulino Jan 16, 2025
e8854f9

Use channel ID over funding outpoint to track monitors in ChannelManager


wpaulino Jan 16, 2025
717db82

Remove funding script return value from ChannelMonitor::get_funding_txo


wpaulino Jan 31, 2025

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


92 changes: 48 additions & 44 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,7 @@ struct TestChainMonitor {
 Arc<TestPersister>,
 >,
	>,
	pub latest_monitors: Mutex<HashMap<OutPoint, LatestMonitorState>>,
	pub latest_monitors: Mutex<HashMap<ChannelId, LatestMonitorState>>,
}
impl TestChainMonitor {
	pub fn new(
Expand All@@ -213,12 +213,12 @@ impl TestChainMonitor {
}
impl chain::Watch<TestChannelSigner> for TestChainMonitor {
	fn watch_channel(
 &self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
 &self, channel_id: ChannelId, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
	) -> Result<chain::ChannelMonitorUpdateStatus, ()> {
 let mut ser = VecWriter(Vec::new());
 monitor.write(&mut ser).unwrap();
 let monitor_id = monitor.get_latest_update_id();
 let res = self.chain_monitor.watch_channel(funding_txo, monitor);
 let res = self.chain_monitor.watch_channel(channel_id, monitor);
 let state = match res {
 Ok(chain::ChannelMonitorUpdateStatus::Completed) => LatestMonitorState {
 persisted_monitor_id: monitor_id,
Expand All@@ -231,17 +231,17 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 Ok(chain::ChannelMonitorUpdateStatus::UnrecoverableError) => panic!(),
 Err(()) => panic!(),
 };
 if self.latest_monitors.lock().unwrap().insert(funding_txo, state).is_some() {
 if self.latest_monitors.lock().unwrap().insert(channel_id, state).is_some() {
 panic!("Already had monitor pre-watch_channel");
 }
 res
	}

	fn update_channel(
 &self, funding_txo: OutPoint, update: &channelmonitor::ChannelMonitorUpdate,
 &self, channel_id: ChannelId, update: &channelmonitor::ChannelMonitorUpdate,
	) -> chain::ChannelMonitorUpdateStatus {
 let mut map_lock = self.latest_monitors.lock().unwrap();
 let map_entry = map_lock.get_mut(&funding_txo).expect("Didn't have monitor on update call");
 let map_entry = map_lock.get_mut(&channel_id).expect("Didn't have monitor on update call");
 let latest_monitor_data = map_entry
 .pending_monitors
 .last()
Expand All@@ -265,7 +265,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 .unwrap();
 let mut ser = VecWriter(Vec::new());
 deserialized_monitor.write(&mut ser).unwrap();
 let res = self.chain_monitor.update_channel(funding_txo, update);
 let res = self.chain_monitor.update_channel(channel_id, update);
 match res {
 chain::ChannelMonitorUpdateStatus::Completed => {
 map_entry.persisted_monitor_id = update.update_id;
Expand DownExpand Up@@ -711,9 +711,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

 let mut monitors = new_hash_map();
 let mut old_monitors = $old_monitors.latest_monitors.lock().unwrap();
 for (outpoint, mut prev_state) in old_monitors.drain() {
 for (channel_id, mut prev_state) in old_monitors.drain() {
 monitors.insert(
outpoint,
channel_id,
 <(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
 &mut Cursor::new(&prev_state.persisted_monitor),
 (&*$keys_manager, &*$keys_manager),
Expand All@@ -725,11 +725,11 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 // considering them discarded. LDK should replay these for us as they're stored in
 // the `ChannelManager`.
 prev_state.pending_monitors.clear();
 chain_monitor.latest_monitors.lock().unwrap().insert(outpoint, prev_state);
 chain_monitor.latest_monitors.lock().unwrap().insert(channel_id, prev_state);
 }
 let mut monitor_refs = new_hash_map();
 for (outpoint, monitor) in monitors.iter() {
 monitor_refs.insert(*outpoint, monitor);
 for (channel_id, monitor) in monitors.iter() {
 monitor_refs.insert(*channel_id, monitor);
 }

 let read_args = ChannelManagerReadArgs {
Expand All@@ -752,9 +752,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 .1,
 chain_monitor.clone(),
 );
 for (funding_txo, mon) in monitors.drain() {
 for (channel_id, mon) in monitors.drain() {
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(funding_txo, mon),
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 );
 }
Expand DownExpand Up@@ -825,7 +825,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 };

 $source.handle_accept_channel($dest.get_our_node_id(), &accept_channel);
 let funding_output;
 {
 let mut events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -845,7 +844,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 script_pubkey: output_script,
 }],
 };
 funding_output = OutPoint { txid: tx.compute_txid(), index: 0 };
 $source
 .funding_transaction_generated(
 temporary_channel_id,
Expand DownExpand Up@@ -890,13 +888,19 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 $source.handle_funding_signed($dest.get_our_node_id(), &funding_signed);
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
 if let events::Event::ChannelPending { ref counterparty_node_id, .. } = events[0] {
 let channel_id = if let events::Event::ChannelPending {
 ref counterparty_node_id,
 ref channel_id,
 ..
 } = events[0]
 {
 assert_eq!(counterparty_node_id, &$dest.get_our_node_id());
 channel_id.clone()
 } else {
 panic!("Wrong event type");
 }
 };

funding_output
channel_id
 }};
	}

Expand DownExpand Up@@ -963,8 +967,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

	let mut nodes = [node_a, node_b, node_c];

	let chan_1_funding = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_funding = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);
	let chan_1_id = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_id = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);

	for node in nodes.iter() {
 confirm_txn!(node);
Expand DownExpand Up@@ -1363,14 +1367,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 }
 };

 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_funding| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_id| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_id) {
 assert!(
 state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
 "updates should be sorted by id"
 );
 for (id, data) in state.pending_monitors.drain(..) {
 monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
 monitor.chain_monitor.channel_monitor_updated(*chan_id, id).unwrap();
 if id > state.persisted_monitor_id {
 state.persisted_monitor_id = id;
 state.persisted_monitor = data;
Expand DownExpand Up@@ -1410,10 +1414,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 ChannelMonitorUpdateStatus::Completed
 },

 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_funding),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_funding),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_funding),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_funding),
 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_id),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_id),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_id),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_id),

 0x0c => {
 if !chan_a_disconnected {
Expand DownExpand Up@@ -1683,21 +1687,21 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 nodes[2].maybe_update_chan_fees();
 },

 0xf0 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_funding, &Vec::pop),
 0xf0 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_id, &Vec::pop),

 0xf4 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_funding, &Vec::pop),
 0xf4 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_id, &Vec::pop),

 0xf8 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_funding, &Vec::pop),
 0xf8 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_id, &Vec::pop),

 0xfc => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_funding, &Vec::pop),
 0xfc => complete_monitor_update(&monitor_c, &chan_2_id, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_id, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_id, &Vec::pop),

 0xff => {
 // Test that no channel is in a stuck state where neither party can send funds even
Expand All@@ -1711,10 +1715,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 *monitor_c.persister.update_ret.lock().unwrap() =
 ChannelMonitorUpdateStatus::Completed;

 complete_all_monitor_updates(&monitor_a, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_2_funding);
 complete_all_monitor_updates(&monitor_c, &chan_2_funding);
 complete_all_monitor_updates(&monitor_a, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_2_id);
 complete_all_monitor_updates(&monitor_c, &chan_2_id);

 // Next, make sure peers are all connected to each other
 if chan_a_disconnected {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ where
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
/// chain_monitor.watch_channel(monitor.channel_id(), monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
/// let chain_poller = poll::ChainPoller::new(block_source, Network::Bitcoin);
Expand Down
Loading

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

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

wpaulino
merged 3 commits into

from

Jan 31, 2025
 Merged


Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager
#3554
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d205d8d

Use channel ID over funding outpoint to track monitors in ChainMonitor


wpaulino Jan 16, 2025
e8854f9

Use channel ID over funding outpoint to track monitors in ChannelManager


wpaulino Jan 16, 2025
717db82

Remove funding script return value from ChannelMonitor::get_funding_txo


wpaulino Jan 31, 2025

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


92 changes: 48 additions & 44 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,7 @@ struct TestChainMonitor {
 Arc<TestPersister>,
 >,
	>,
	pub latest_monitors: Mutex<HashMap<OutPoint, LatestMonitorState>>,
	pub latest_monitors: Mutex<HashMap<ChannelId, LatestMonitorState>>,
}
impl TestChainMonitor {
	pub fn new(
Expand All@@ -213,12 +213,12 @@ impl TestChainMonitor {
}
impl chain::Watch<TestChannelSigner> for TestChainMonitor {
	fn watch_channel(
 &self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
 &self, channel_id: ChannelId, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
	) -> Result<chain::ChannelMonitorUpdateStatus, ()> {
 let mut ser = VecWriter(Vec::new());
 monitor.write(&mut ser).unwrap();
 let monitor_id = monitor.get_latest_update_id();
 let res = self.chain_monitor.watch_channel(funding_txo, monitor);
 let res = self.chain_monitor.watch_channel(channel_id, monitor);
 let state = match res {
 Ok(chain::ChannelMonitorUpdateStatus::Completed) => LatestMonitorState {
 persisted_monitor_id: monitor_id,
Expand All@@ -231,17 +231,17 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 Ok(chain::ChannelMonitorUpdateStatus::UnrecoverableError) => panic!(),
 Err(()) => panic!(),
 };
 if self.latest_monitors.lock().unwrap().insert(funding_txo, state).is_some() {
 if self.latest_monitors.lock().unwrap().insert(channel_id, state).is_some() {
 panic!("Already had monitor pre-watch_channel");
 }
 res
	}

	fn update_channel(
 &self, funding_txo: OutPoint, update: &channelmonitor::ChannelMonitorUpdate,
 &self, channel_id: ChannelId, update: &channelmonitor::ChannelMonitorUpdate,
	) -> chain::ChannelMonitorUpdateStatus {
 let mut map_lock = self.latest_monitors.lock().unwrap();
 let map_entry = map_lock.get_mut(&funding_txo).expect("Didn't have monitor on update call");
 let map_entry = map_lock.get_mut(&channel_id).expect("Didn't have monitor on update call");
 let latest_monitor_data = map_entry
 .pending_monitors
 .last()
Expand All@@ -265,7 +265,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 .unwrap();
 let mut ser = VecWriter(Vec::new());
 deserialized_monitor.write(&mut ser).unwrap();
 let res = self.chain_monitor.update_channel(funding_txo, update);
 let res = self.chain_monitor.update_channel(channel_id, update);
 match res {
 chain::ChannelMonitorUpdateStatus::Completed => {
 map_entry.persisted_monitor_id = update.update_id;
Expand DownExpand Up@@ -711,9 +711,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

 let mut monitors = new_hash_map();
 let mut old_monitors = $old_monitors.latest_monitors.lock().unwrap();
 for (outpoint, mut prev_state) in old_monitors.drain() {
 for (channel_id, mut prev_state) in old_monitors.drain() {
 monitors.insert(
outpoint,
channel_id,
 <(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
 &mut Cursor::new(&prev_state.persisted_monitor),
 (&*$keys_manager, &*$keys_manager),
Expand All@@ -725,11 +725,11 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 // considering them discarded. LDK should replay these for us as they're stored in
 // the `ChannelManager`.
 prev_state.pending_monitors.clear();
 chain_monitor.latest_monitors.lock().unwrap().insert(outpoint, prev_state);
 chain_monitor.latest_monitors.lock().unwrap().insert(channel_id, prev_state);
 }
 let mut monitor_refs = new_hash_map();
 for (outpoint, monitor) in monitors.iter() {
 monitor_refs.insert(*outpoint, monitor);
 for (channel_id, monitor) in monitors.iter() {
 monitor_refs.insert(*channel_id, monitor);
 }

 let read_args = ChannelManagerReadArgs {
Expand All@@ -752,9 +752,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 .1,
 chain_monitor.clone(),
 );
 for (funding_txo, mon) in monitors.drain() {
 for (channel_id, mon) in monitors.drain() {
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(funding_txo, mon),
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 );
 }
Expand DownExpand Up@@ -825,7 +825,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 };

 $source.handle_accept_channel($dest.get_our_node_id(), &accept_channel);
 let funding_output;
 {
 let mut events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -845,7 +844,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 script_pubkey: output_script,
 }],
 };
 funding_output = OutPoint { txid: tx.compute_txid(), index: 0 };
 $source
 .funding_transaction_generated(
 temporary_channel_id,
Expand DownExpand Up@@ -890,13 +888,19 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 $source.handle_funding_signed($dest.get_our_node_id(), &funding_signed);
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
 if let events::Event::ChannelPending { ref counterparty_node_id, .. } = events[0] {
 let channel_id = if let events::Event::ChannelPending {
 ref counterparty_node_id,
 ref channel_id,
 ..
 } = events[0]
 {
 assert_eq!(counterparty_node_id, &$dest.get_our_node_id());
 channel_id.clone()
 } else {
 panic!("Wrong event type");
 }
 };

funding_output
channel_id
 }};
	}

Expand DownExpand Up@@ -963,8 +967,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

	let mut nodes = [node_a, node_b, node_c];

	let chan_1_funding = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_funding = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);
	let chan_1_id = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_id = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);

	for node in nodes.iter() {
 confirm_txn!(node);
Expand DownExpand Up@@ -1363,14 +1367,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 }
 };

 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_funding| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_id| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_id) {
 assert!(
 state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
 "updates should be sorted by id"
 );
 for (id, data) in state.pending_monitors.drain(..) {
 monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
 monitor.chain_monitor.channel_monitor_updated(*chan_id, id).unwrap();
 if id > state.persisted_monitor_id {
 state.persisted_monitor_id = id;
 state.persisted_monitor = data;
Expand DownExpand Up@@ -1410,10 +1414,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 ChannelMonitorUpdateStatus::Completed
 },

 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_funding),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_funding),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_funding),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_funding),
 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_id),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_id),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_id),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_id),

 0x0c => {
 if !chan_a_disconnected {
Expand DownExpand Up@@ -1683,21 +1687,21 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 nodes[2].maybe_update_chan_fees();
 },

 0xf0 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_funding, &Vec::pop),
 0xf0 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_id, &Vec::pop),

 0xf4 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_funding, &Vec::pop),
 0xf4 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_id, &Vec::pop),

 0xf8 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_funding, &Vec::pop),
 0xf8 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_id, &Vec::pop),

 0xfc => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_funding, &Vec::pop),
 0xfc => complete_monitor_update(&monitor_c, &chan_2_id, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_id, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_id, &Vec::pop),

 0xff => {
 // Test that no channel is in a stuck state where neither party can send funds even
Expand All@@ -1711,10 +1715,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 *monitor_c.persister.update_ret.lock().unwrap() =
 ChannelMonitorUpdateStatus::Completed;

 complete_all_monitor_updates(&monitor_a, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_2_funding);
 complete_all_monitor_updates(&monitor_c, &chan_2_funding);
 complete_all_monitor_updates(&monitor_a, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_2_id);
 complete_all_monitor_updates(&monitor_c, &chan_2_id);

 // Next, make sure peers are all connected to each other
 if chan_a_disconnected {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ where
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
/// chain_monitor.watch_channel(monitor.channel_id(), monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
/// let chain_poller = poll::ChainPoller::new(block_source, Network::Bitcoin);
Expand Down
Loading

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

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

wpaulino
merged 3 commits into

from

Jan 31, 2025
 Merged


Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager
#3554
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d205d8d

Use channel ID over funding outpoint to track monitors in ChainMonitor


wpaulino Jan 16, 2025
e8854f9

Use channel ID over funding outpoint to track monitors in ChannelManager


wpaulino Jan 16, 2025
717db82

Remove funding script return value from ChannelMonitor::get_funding_txo


wpaulino Jan 31, 2025

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


92 changes: 48 additions & 44 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,7 @@ struct TestChainMonitor {
 Arc<TestPersister>,
 >,
	>,
	pub latest_monitors: Mutex<HashMap<OutPoint, LatestMonitorState>>,
	pub latest_monitors: Mutex<HashMap<ChannelId, LatestMonitorState>>,
}
impl TestChainMonitor {
	pub fn new(
Expand All@@ -213,12 +213,12 @@ impl TestChainMonitor {
}
impl chain::Watch<TestChannelSigner> for TestChainMonitor {
	fn watch_channel(
 &self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
 &self, channel_id: ChannelId, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
	) -> Result<chain::ChannelMonitorUpdateStatus, ()> {
 let mut ser = VecWriter(Vec::new());
 monitor.write(&mut ser).unwrap();
 let monitor_id = monitor.get_latest_update_id();
 let res = self.chain_monitor.watch_channel(funding_txo, monitor);
 let res = self.chain_monitor.watch_channel(channel_id, monitor);
 let state = match res {
 Ok(chain::ChannelMonitorUpdateStatus::Completed) => LatestMonitorState {
 persisted_monitor_id: monitor_id,
Expand All@@ -231,17 +231,17 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 Ok(chain::ChannelMonitorUpdateStatus::UnrecoverableError) => panic!(),
 Err(()) => panic!(),
 };
 if self.latest_monitors.lock().unwrap().insert(funding_txo, state).is_some() {
 if self.latest_monitors.lock().unwrap().insert(channel_id, state).is_some() {
 panic!("Already had monitor pre-watch_channel");
 }
 res
	}

	fn update_channel(
 &self, funding_txo: OutPoint, update: &channelmonitor::ChannelMonitorUpdate,
 &self, channel_id: ChannelId, update: &channelmonitor::ChannelMonitorUpdate,
	) -> chain::ChannelMonitorUpdateStatus {
 let mut map_lock = self.latest_monitors.lock().unwrap();
 let map_entry = map_lock.get_mut(&funding_txo).expect("Didn't have monitor on update call");
 let map_entry = map_lock.get_mut(&channel_id).expect("Didn't have monitor on update call");
 let latest_monitor_data = map_entry
 .pending_monitors
 .last()
Expand All@@ -265,7 +265,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 .unwrap();
 let mut ser = VecWriter(Vec::new());
 deserialized_monitor.write(&mut ser).unwrap();
 let res = self.chain_monitor.update_channel(funding_txo, update);
 let res = self.chain_monitor.update_channel(channel_id, update);
 match res {
 chain::ChannelMonitorUpdateStatus::Completed => {
 map_entry.persisted_monitor_id = update.update_id;
Expand DownExpand Up@@ -711,9 +711,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

 let mut monitors = new_hash_map();
 let mut old_monitors = $old_monitors.latest_monitors.lock().unwrap();
 for (outpoint, mut prev_state) in old_monitors.drain() {
 for (channel_id, mut prev_state) in old_monitors.drain() {
 monitors.insert(
outpoint,
channel_id,
 <(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
 &mut Cursor::new(&prev_state.persisted_monitor),
 (&*$keys_manager, &*$keys_manager),
Expand All@@ -725,11 +725,11 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 // considering them discarded. LDK should replay these for us as they're stored in
 // the `ChannelManager`.
 prev_state.pending_monitors.clear();
 chain_monitor.latest_monitors.lock().unwrap().insert(outpoint, prev_state);
 chain_monitor.latest_monitors.lock().unwrap().insert(channel_id, prev_state);
 }
 let mut monitor_refs = new_hash_map();
 for (outpoint, monitor) in monitors.iter() {
 monitor_refs.insert(*outpoint, monitor);
 for (channel_id, monitor) in monitors.iter() {
 monitor_refs.insert(*channel_id, monitor);
 }

 let read_args = ChannelManagerReadArgs {
Expand All@@ -752,9 +752,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 .1,
 chain_monitor.clone(),
 );
 for (funding_txo, mon) in monitors.drain() {
 for (channel_id, mon) in monitors.drain() {
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(funding_txo, mon),
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 );
 }
Expand DownExpand Up@@ -825,7 +825,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 };

 $source.handle_accept_channel($dest.get_our_node_id(), &accept_channel);
 let funding_output;
 {
 let mut events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -845,7 +844,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 script_pubkey: output_script,
 }],
 };
 funding_output = OutPoint { txid: tx.compute_txid(), index: 0 };
 $source
 .funding_transaction_generated(
 temporary_channel_id,
Expand DownExpand Up@@ -890,13 +888,19 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 $source.handle_funding_signed($dest.get_our_node_id(), &funding_signed);
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
 if let events::Event::ChannelPending { ref counterparty_node_id, .. } = events[0] {
 let channel_id = if let events::Event::ChannelPending {
 ref counterparty_node_id,
 ref channel_id,
 ..
 } = events[0]
 {
 assert_eq!(counterparty_node_id, &$dest.get_our_node_id());
 channel_id.clone()
 } else {
 panic!("Wrong event type");
 }
 };

funding_output
channel_id
 }};
	}

Expand DownExpand Up@@ -963,8 +967,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

	let mut nodes = [node_a, node_b, node_c];

	let chan_1_funding = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_funding = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);
	let chan_1_id = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_id = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);

	for node in nodes.iter() {
 confirm_txn!(node);
Expand DownExpand Up@@ -1363,14 +1367,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 }
 };

 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_funding| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_id| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_id) {
 assert!(
 state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
 "updates should be sorted by id"
 );
 for (id, data) in state.pending_monitors.drain(..) {
 monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
 monitor.chain_monitor.channel_monitor_updated(*chan_id, id).unwrap();
 if id > state.persisted_monitor_id {
 state.persisted_monitor_id = id;
 state.persisted_monitor = data;
Expand DownExpand Up@@ -1410,10 +1414,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 ChannelMonitorUpdateStatus::Completed
 },

 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_funding),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_funding),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_funding),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_funding),
 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_id),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_id),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_id),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_id),

 0x0c => {
 if !chan_a_disconnected {
Expand DownExpand Up@@ -1683,21 +1687,21 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 nodes[2].maybe_update_chan_fees();
 },

 0xf0 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_funding, &Vec::pop),
 0xf0 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_id, &Vec::pop),

 0xf4 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_funding, &Vec::pop),
 0xf4 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_id, &Vec::pop),

 0xf8 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_funding, &Vec::pop),
 0xf8 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_id, &Vec::pop),

 0xfc => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_funding, &Vec::pop),
 0xfc => complete_monitor_update(&monitor_c, &chan_2_id, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_id, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_id, &Vec::pop),

 0xff => {
 // Test that no channel is in a stuck state where neither party can send funds even
Expand All@@ -1711,10 +1715,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 *monitor_c.persister.update_ret.lock().unwrap() =
 ChannelMonitorUpdateStatus::Completed;

 complete_all_monitor_updates(&monitor_a, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_2_funding);
 complete_all_monitor_updates(&monitor_c, &chan_2_funding);
 complete_all_monitor_updates(&monitor_a, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_2_id);
 complete_all_monitor_updates(&monitor_c, &chan_2_id);

 // Next, make sure peers are all connected to each other
 if chan_a_disconnected {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ where
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
/// chain_monitor.watch_channel(monitor.channel_id(), monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
/// let chain_poller = poll::ChainPoller::new(block_source, Network::Bitcoin);
Expand Down
Loading

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

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

wpaulino
merged 3 commits into

from

Jan 31, 2025
 Merged


Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager
#3554
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d205d8d

Use channel ID over funding outpoint to track monitors in ChainMonitor


wpaulino Jan 16, 2025
e8854f9

Use channel ID over funding outpoint to track monitors in ChannelManager


wpaulino Jan 16, 2025
717db82

Remove funding script return value from ChannelMonitor::get_funding_txo


wpaulino Jan 31, 2025

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


92 changes: 48 additions & 44 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,7 @@ struct TestChainMonitor {
 Arc<TestPersister>,
 >,
	>,
	pub latest_monitors: Mutex<HashMap<OutPoint, LatestMonitorState>>,
	pub latest_monitors: Mutex<HashMap<ChannelId, LatestMonitorState>>,
}
impl TestChainMonitor {
	pub fn new(
Expand All@@ -213,12 +213,12 @@ impl TestChainMonitor {
}
impl chain::Watch<TestChannelSigner> for TestChainMonitor {
	fn watch_channel(
 &self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
 &self, channel_id: ChannelId, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
	) -> Result<chain::ChannelMonitorUpdateStatus, ()> {
 let mut ser = VecWriter(Vec::new());
 monitor.write(&mut ser).unwrap();
 let monitor_id = monitor.get_latest_update_id();
 let res = self.chain_monitor.watch_channel(funding_txo, monitor);
 let res = self.chain_monitor.watch_channel(channel_id, monitor);
 let state = match res {
 Ok(chain::ChannelMonitorUpdateStatus::Completed) => LatestMonitorState {
 persisted_monitor_id: monitor_id,
Expand All@@ -231,17 +231,17 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 Ok(chain::ChannelMonitorUpdateStatus::UnrecoverableError) => panic!(),
 Err(()) => panic!(),
 };
 if self.latest_monitors.lock().unwrap().insert(funding_txo, state).is_some() {
 if self.latest_monitors.lock().unwrap().insert(channel_id, state).is_some() {
 panic!("Already had monitor pre-watch_channel");
 }
 res
	}

	fn update_channel(
 &self, funding_txo: OutPoint, update: &channelmonitor::ChannelMonitorUpdate,
 &self, channel_id: ChannelId, update: &channelmonitor::ChannelMonitorUpdate,
	) -> chain::ChannelMonitorUpdateStatus {
 let mut map_lock = self.latest_monitors.lock().unwrap();
 let map_entry = map_lock.get_mut(&funding_txo).expect("Didn't have monitor on update call");
 let map_entry = map_lock.get_mut(&channel_id).expect("Didn't have monitor on update call");
 let latest_monitor_data = map_entry
 .pending_monitors
 .last()
Expand All@@ -265,7 +265,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 .unwrap();
 let mut ser = VecWriter(Vec::new());
 deserialized_monitor.write(&mut ser).unwrap();
 let res = self.chain_monitor.update_channel(funding_txo, update);
 let res = self.chain_monitor.update_channel(channel_id, update);
 match res {
 chain::ChannelMonitorUpdateStatus::Completed => {
 map_entry.persisted_monitor_id = update.update_id;
Expand DownExpand Up@@ -711,9 +711,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

 let mut monitors = new_hash_map();
 let mut old_monitors = $old_monitors.latest_monitors.lock().unwrap();
 for (outpoint, mut prev_state) in old_monitors.drain() {
 for (channel_id, mut prev_state) in old_monitors.drain() {
 monitors.insert(
outpoint,
channel_id,
 <(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
 &mut Cursor::new(&prev_state.persisted_monitor),
 (&*$keys_manager, &*$keys_manager),
Expand All@@ -725,11 +725,11 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 // considering them discarded. LDK should replay these for us as they're stored in
 // the `ChannelManager`.
 prev_state.pending_monitors.clear();
 chain_monitor.latest_monitors.lock().unwrap().insert(outpoint, prev_state);
 chain_monitor.latest_monitors.lock().unwrap().insert(channel_id, prev_state);
 }
 let mut monitor_refs = new_hash_map();
 for (outpoint, monitor) in monitors.iter() {
 monitor_refs.insert(*outpoint, monitor);
 for (channel_id, monitor) in monitors.iter() {
 monitor_refs.insert(*channel_id, monitor);
 }

 let read_args = ChannelManagerReadArgs {
Expand All@@ -752,9 +752,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 .1,
 chain_monitor.clone(),
 );
 for (funding_txo, mon) in monitors.drain() {
 for (channel_id, mon) in monitors.drain() {
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(funding_txo, mon),
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 );
 }
Expand DownExpand Up@@ -825,7 +825,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 };

 $source.handle_accept_channel($dest.get_our_node_id(), &accept_channel);
 let funding_output;
 {
 let mut events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -845,7 +844,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 script_pubkey: output_script,
 }],
 };
 funding_output = OutPoint { txid: tx.compute_txid(), index: 0 };
 $source
 .funding_transaction_generated(
 temporary_channel_id,
Expand DownExpand Up@@ -890,13 +888,19 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 $source.handle_funding_signed($dest.get_our_node_id(), &funding_signed);
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
 if let events::Event::ChannelPending { ref counterparty_node_id, .. } = events[0] {
 let channel_id = if let events::Event::ChannelPending {
 ref counterparty_node_id,
 ref channel_id,
 ..
 } = events[0]
 {
 assert_eq!(counterparty_node_id, &$dest.get_our_node_id());
 channel_id.clone()
 } else {
 panic!("Wrong event type");
 }
 };

funding_output
channel_id
 }};
	}

Expand DownExpand Up@@ -963,8 +967,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

	let mut nodes = [node_a, node_b, node_c];

	let chan_1_funding = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_funding = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);
	let chan_1_id = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_id = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);

	for node in nodes.iter() {
 confirm_txn!(node);
Expand DownExpand Up@@ -1363,14 +1367,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 }
 };

 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_funding| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_id| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_id) {
 assert!(
 state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
 "updates should be sorted by id"
 );
 for (id, data) in state.pending_monitors.drain(..) {
 monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
 monitor.chain_monitor.channel_monitor_updated(*chan_id, id).unwrap();
 if id > state.persisted_monitor_id {
 state.persisted_monitor_id = id;
 state.persisted_monitor = data;
Expand DownExpand Up@@ -1410,10 +1414,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 ChannelMonitorUpdateStatus::Completed
 },

 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_funding),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_funding),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_funding),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_funding),
 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_id),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_id),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_id),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_id),

 0x0c => {
 if !chan_a_disconnected {
Expand DownExpand Up@@ -1683,21 +1687,21 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 nodes[2].maybe_update_chan_fees();
 },

 0xf0 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_funding, &Vec::pop),
 0xf0 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_id, &Vec::pop),

 0xf4 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_funding, &Vec::pop),
 0xf4 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_id, &Vec::pop),

 0xf8 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_funding, &Vec::pop),
 0xf8 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_id, &Vec::pop),

 0xfc => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_funding, &Vec::pop),
 0xfc => complete_monitor_update(&monitor_c, &chan_2_id, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_id, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_id, &Vec::pop),

 0xff => {
 // Test that no channel is in a stuck state where neither party can send funds even
Expand All@@ -1711,10 +1715,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 *monitor_c.persister.update_ret.lock().unwrap() =
 ChannelMonitorUpdateStatus::Completed;

 complete_all_monitor_updates(&monitor_a, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_2_funding);
 complete_all_monitor_updates(&monitor_c, &chan_2_funding);
 complete_all_monitor_updates(&monitor_a, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_2_id);
 complete_all_monitor_updates(&monitor_c, &chan_2_id);

 // Next, make sure peers are all connected to each other
 if chan_a_disconnected {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ where
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
/// chain_monitor.watch_channel(monitor.channel_id(), monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
/// let chain_poller = poll::ChainPoller::new(block_source, Network::Bitcoin);
Expand Down
Loading

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

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

wpaulino
merged 3 commits into

from

Jan 31, 2025
 Merged


Start tracking ChannelMonitors by channel ID in ChainMonitor and ChannelManager
#3554
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d205d8d

Use channel ID over funding outpoint to track monitors in ChainMonitor


wpaulino Jan 16, 2025
e8854f9

Use channel ID over funding outpoint to track monitors in ChannelManager


wpaulino Jan 16, 2025
717db82

Remove funding script return value from ChannelMonitor::get_funding_txo


wpaulino Jan 31, 2025

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


92 changes: 48 additions & 44 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,7 @@ struct TestChainMonitor {
 Arc<TestPersister>,
 >,
	>,
	pub latest_monitors: Mutex<HashMap<OutPoint, LatestMonitorState>>,
	pub latest_monitors: Mutex<HashMap<ChannelId, LatestMonitorState>>,
}
impl TestChainMonitor {
	pub fn new(
Expand All@@ -213,12 +213,12 @@ impl TestChainMonitor {
}
impl chain::Watch<TestChannelSigner> for TestChainMonitor {
	fn watch_channel(
 &self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
 &self, channel_id: ChannelId, monitor: channelmonitor::ChannelMonitor<TestChannelSigner>,
	) -> Result<chain::ChannelMonitorUpdateStatus, ()> {
 let mut ser = VecWriter(Vec::new());
 monitor.write(&mut ser).unwrap();
 let monitor_id = monitor.get_latest_update_id();
 let res = self.chain_monitor.watch_channel(funding_txo, monitor);
 let res = self.chain_monitor.watch_channel(channel_id, monitor);
 let state = match res {
 Ok(chain::ChannelMonitorUpdateStatus::Completed) => LatestMonitorState {
 persisted_monitor_id: monitor_id,
Expand All@@ -231,17 +231,17 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 Ok(chain::ChannelMonitorUpdateStatus::UnrecoverableError) => panic!(),
 Err(()) => panic!(),
 };
 if self.latest_monitors.lock().unwrap().insert(funding_txo, state).is_some() {
 if self.latest_monitors.lock().unwrap().insert(channel_id, state).is_some() {
 panic!("Already had monitor pre-watch_channel");
 }
 res
	}

	fn update_channel(
 &self, funding_txo: OutPoint, update: &channelmonitor::ChannelMonitorUpdate,
 &self, channel_id: ChannelId, update: &channelmonitor::ChannelMonitorUpdate,
	) -> chain::ChannelMonitorUpdateStatus {
 let mut map_lock = self.latest_monitors.lock().unwrap();
 let map_entry = map_lock.get_mut(&funding_txo).expect("Didn't have monitor on update call");
 let map_entry = map_lock.get_mut(&channel_id).expect("Didn't have monitor on update call");
 let latest_monitor_data = map_entry
 .pending_monitors
 .last()
Expand All@@ -265,7 +265,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 .unwrap();
 let mut ser = VecWriter(Vec::new());
 deserialized_monitor.write(&mut ser).unwrap();
 let res = self.chain_monitor.update_channel(funding_txo, update);
 let res = self.chain_monitor.update_channel(channel_id, update);
 match res {
 chain::ChannelMonitorUpdateStatus::Completed => {
 map_entry.persisted_monitor_id = update.update_id;
Expand DownExpand Up@@ -711,9 +711,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

 let mut monitors = new_hash_map();
 let mut old_monitors = $old_monitors.latest_monitors.lock().unwrap();
 for (outpoint, mut prev_state) in old_monitors.drain() {
 for (channel_id, mut prev_state) in old_monitors.drain() {
 monitors.insert(
outpoint,
channel_id,
 <(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
 &mut Cursor::new(&prev_state.persisted_monitor),
 (&*$keys_manager, &*$keys_manager),
Expand All@@ -725,11 +725,11 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 // considering them discarded. LDK should replay these for us as they're stored in
 // the `ChannelManager`.
 prev_state.pending_monitors.clear();
 chain_monitor.latest_monitors.lock().unwrap().insert(outpoint, prev_state);
 chain_monitor.latest_monitors.lock().unwrap().insert(channel_id, prev_state);
 }
 let mut monitor_refs = new_hash_map();
 for (outpoint, monitor) in monitors.iter() {
 monitor_refs.insert(*outpoint, monitor);
 for (channel_id, monitor) in monitors.iter() {
 monitor_refs.insert(*channel_id, monitor);
 }

 let read_args = ChannelManagerReadArgs {
Expand All@@ -752,9 +752,9 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 .1,
 chain_monitor.clone(),
 );
 for (funding_txo, mon) in monitors.drain() {
 for (channel_id, mon) in monitors.drain() {
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(funding_txo, mon),
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 );
 }
Expand DownExpand Up@@ -825,7 +825,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 };

 $source.handle_accept_channel($dest.get_our_node_id(), &accept_channel);
 let funding_output;
 {
 let mut events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -845,7 +844,6 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 script_pubkey: output_script,
 }],
 };
 funding_output = OutPoint { txid: tx.compute_txid(), index: 0 };
 $source
 .funding_transaction_generated(
 temporary_channel_id,
Expand DownExpand Up@@ -890,13 +888,19 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 $source.handle_funding_signed($dest.get_our_node_id(), &funding_signed);
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
 if let events::Event::ChannelPending { ref counterparty_node_id, .. } = events[0] {
 let channel_id = if let events::Event::ChannelPending {
 ref counterparty_node_id,
 ref channel_id,
 ..
 } = events[0]
 {
 assert_eq!(counterparty_node_id, &$dest.get_our_node_id());
 channel_id.clone()
 } else {
 panic!("Wrong event type");
 }
 };

funding_output
channel_id
 }};
	}

Expand DownExpand Up@@ -963,8 +967,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {

	let mut nodes = [node_a, node_b, node_c];

	let chan_1_funding = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_funding = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);
	let chan_1_id = make_channel!(nodes[0], nodes[1], keys_manager_b, 0);
	let chan_2_id = make_channel!(nodes[1], nodes[2], keys_manager_c, 1);

	for node in nodes.iter() {
 confirm_txn!(node);
Expand DownExpand Up@@ -1363,14 +1367,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 }
 };

 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_funding| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
 let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_id| {
 if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_id) {
 assert!(
 state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
 "updates should be sorted by id"
 );
 for (id, data) in state.pending_monitors.drain(..) {
 monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
 monitor.chain_monitor.channel_monitor_updated(*chan_id, id).unwrap();
 if id > state.persisted_monitor_id {
 state.persisted_monitor_id = id;
 state.persisted_monitor = data;
Expand DownExpand Up@@ -1410,10 +1414,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 ChannelMonitorUpdateStatus::Completed
 },

 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_funding),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_funding),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_funding),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_funding),
 0x08 => complete_all_monitor_updates(&monitor_a, &chan_1_id),
 0x09 => complete_all_monitor_updates(&monitor_b, &chan_1_id),
 0x0a => complete_all_monitor_updates(&monitor_b, &chan_2_id),
 0x0b => complete_all_monitor_updates(&monitor_c, &chan_2_id),

 0x0c => {
 if !chan_a_disconnected {
Expand DownExpand Up@@ -1683,21 +1687,21 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 nodes[2].maybe_update_chan_fees();
 },

 0xf0 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_funding, &Vec::pop),
 0xf0 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_first),
 0xf1 => complete_monitor_update(&monitor_a, &chan_1_id, &complete_second),
 0xf2 => complete_monitor_update(&monitor_a, &chan_1_id, &Vec::pop),

 0xf4 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_funding, &Vec::pop),
 0xf4 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_first),
 0xf5 => complete_monitor_update(&monitor_b, &chan_1_id, &complete_second),
 0xf6 => complete_monitor_update(&monitor_b, &chan_1_id, &Vec::pop),

 0xf8 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_funding, &Vec::pop),
 0xf8 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_first),
 0xf9 => complete_monitor_update(&monitor_b, &chan_2_id, &complete_second),
 0xfa => complete_monitor_update(&monitor_b, &chan_2_id, &Vec::pop),

 0xfc => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_funding, &Vec::pop),
 0xfc => complete_monitor_update(&monitor_c, &chan_2_id, &complete_first),
 0xfd => complete_monitor_update(&monitor_c, &chan_2_id, &complete_second),
 0xfe => complete_monitor_update(&monitor_c, &chan_2_id, &Vec::pop),

 0xff => {
 // Test that no channel is in a stuck state where neither party can send funds even
Expand All@@ -1711,10 +1715,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 *monitor_c.persister.update_ret.lock().unwrap() =
 ChannelMonitorUpdateStatus::Completed;

 complete_all_monitor_updates(&monitor_a, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_1_funding);
 complete_all_monitor_updates(&monitor_b, &chan_2_funding);
 complete_all_monitor_updates(&monitor_c, &chan_2_funding);
 complete_all_monitor_updates(&monitor_a, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_1_id);
 complete_all_monitor_updates(&monitor_b, &chan_2_id);
 complete_all_monitor_updates(&monitor_c, &chan_2_id);

 // Next, make sure peers are all connected to each other
 if chan_a_disconnected {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ where
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
/// chain_monitor.watch_channel(monitor.channel_id(), monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
/// let chain_poller = poll::ChainPoller::new(block_source, Network::Bitcoin);
Expand Down
Loading