Add Event::ChannelClosed generation#997

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 5 commits into from
Sep 21, 2021
Merged

Add Event::ChannelClosed generation #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e64467f
Add Event::ChannelClosed generation at channel shutdown
ariard Jul 13, 2021
ea03b94
Rename MonitorEvent::CommitmentTxBroadcasted to CommitmentTxConfirmed
ariard Sep 21, 2021
c29092c
Extend MsgHandleErrInternal with a new chan_id field Option<[u8; 32]>
ariard Jul 13, 2021
6ce7f3e
Add ChannelClosed generation at cooperative/force-close/error processing
ariard Sep 21, 2021
d13c5cf
Add `pending_events` deadlock detection in `handle_error`
ariard Jul 13, 2021
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
1 change: 1 addition & 0 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -614,6 +614,7 @@ mod tests {
.expect("SpendableOutputs not handled within deadline");
match event {
Event::SpendableOutputs { .. } => {},
Event::ChannelClosed { .. } => {},
_ => panic!("Unexpected event: {:?}", event),
}

Expand Down
7 changes: 5 additions & 2 deletions lightning-persister/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,11 +182,11 @@ mod tests {
use bitcoin::Txid;
use lightning::chain::channelmonitor::{Persist, ChannelMonitorUpdateErr};
use lightning::chain::transaction::OutPoint;
use lightning::{check_closed_broadcast, check_added_monitors};
use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
use lightning::ln::features::InitFeatures;
use lightning::ln::functional_test_utils::*;
use lightning::ln::msgs::ErrorAction;
use lightning::util::events::{MessageSendEventsProvider, MessageSendEvent};
use lightning::util::events::{ClosureReason, Event, MessageSendEventsProvider, MessageSendEvent};
use lightning::util::test_utils;
use std::fs;
#[cfg(target_os = "windows")]
Expand DownExpand Up@@ -259,6 +259,7 @@ mod tests {
// Force close because cooperative close doesn't result in any persisted
// updates.
nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
check_closed_broadcast!(nodes[0], true);
check_added_monitors!(nodes[0], 1);

Expand All@@ -268,6 +269,7 @@ mod tests {
let header = BlockHeader { version: 0x20000000, prev_blockhash: nodes[0].best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
connect_block(&nodes[1], &Block { header, txdata: vec![node_txn[0].clone(), node_txn[0].clone()]});
check_closed_broadcast!(nodes[1], true);
check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed);
check_added_monitors!(nodes[1], 1);

// Make sure everything is persisted as expected after close.
Expand All@@ -291,6 +293,7 @@ mod tests {
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
nodes[1].node.force_close_channel(&chan.2).unwrap();
check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();

// Set the persister's directory to read-only, which should result in
Expand Down
14 changes: 7 additions & 7 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@ pub enum MonitorEvent {
/// A monitor event containing an HTLCUpdate.
HTLCEvent(HTLCUpdate),

/// A monitor event that the Channel's commitment transaction was broadcasted.
CommitmentTxBroadcasted(OutPoint),
/// A monitor event that the Channel's commitment transaction was confirmed.
CommitmentTxConfirmed(OutPoint),
}

/// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
Expand DownExpand Up@@ -918,7 +918,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
0u8.write(writer)?;
upd.write(writer)?;
},
MonitorEvent::CommitmentTxBroadcasted(_) => 1u8.write(writer)?
MonitorEvent::CommitmentTxConfirmed(_) => 1u8.write(writer)?
}
}

Expand DownExpand Up@@ -1787,7 +1787,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
log_info!(logger, "Broadcasting local {}", log_tx!(tx));
broadcaster.broadcast_transaction(tx);
}
self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
}

pub fn update_monitor<B: Deref, F: Deref, L: Deref>(&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &L) -> Result<(), MonitorUpdateError>
Expand DownExpand Up@@ -1835,7 +1835,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
} else if !self.holder_tx_signed {
log_error!(logger, "You have a toxic holder commitment transaction avaible in channel monitor, read comment in ChannelMonitor::get_latest_holder_commitment_txn to be informed of manual action to take");
} else {
// If we generated a MonitorEvent::CommitmentTxBroadcasted, the ChannelManager
// If we generated a MonitorEvent::CommitmentTxConfirmed, the ChannelManager
// will still give us a ChannelForceClosed event with !should_broadcast, but we
// shouldn't print the scary warning above.
log_info!(logger, "Channel off-chain state closed after we broadcasted our latest commitment transaction.");
Expand DownExpand Up@@ -2357,7 +2357,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), false, self.best_block.height());
claimable_outpoints.push(commitment_package);
self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);
self.holder_tx_signed = true;
// Because we're broadcasting a commitment transaction, we should construct the package
Expand DownExpand Up@@ -3110,7 +3110,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
for _ in 0..pending_monitor_events_len {
let ev = match <u8 as Readable>::read(reader)? {
0 => MonitorEvent::HTLCEvent(Readable::read(reader)?),
1 => MonitorEvent::CommitmentTxBroadcasted(funding_info.0),
1 => MonitorEvent::CommitmentTxConfirmed(funding_info.0),
_ => return Err(DecodeError::InvalidValue)
};
pending_monitor_events.push(ev);
Expand Down
10 changes: 9 additions & 1 deletion lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use util::config::UserConfig;
use util::enforcing_trait_impls::EnforcingSigner;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
use util::errors::APIError;
use util::ser::{ReadableArgs, Writeable};
use util::test_utils::TestBroadcaster;
Expand DownExpand Up@@ -81,6 +81,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
// PaymentFailed event

assert_eq!(nodes[0].node.list_channels().len(), 0);
check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand DownExpand Up@@ -269,6 +270,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
// PaymentFailed event

assert_eq!(nodes[0].node.list_channels().len(), 0);
check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
}

#[test]
Expand DownExpand Up@@ -1985,6 +1987,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:

send_payment(&nodes[0], &[&nodes[1]], 8000000);
close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand DownExpand Up@@ -2610,6 +2614,8 @@ fn test_temporary_error_during_shutdown() {
assert_eq!(txn_a, txn_b);
assert_eq!(txn_a.len(), 1);
check_spends!(txn_a[0], funding_tx);
check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand All@@ -2630,6 +2636,7 @@ fn test_permanent_error_during_sending_shutdown() {
assert!(nodes[0].node.close_channel(&channel_id).is_ok());
check_closed_broadcast!(nodes[0], true);
check_added_monitors!(nodes[0], 2);
check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand All@@ -2652,6 +2659,7 @@ fn test_permanent_error_during_handling_shutdown() {
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &shutdown);
check_closed_broadcast!(nodes[1], true);
check_added_monitors!(nodes[1], 2);
check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add Event::ChannelClosed generation#997

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Sep 21, 2021
 Merged


Add Event::ChannelClosed generation
#997
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e64467f

Add Event::ChannelClosed generation at channel shutdown


ariard Jul 13, 2021
ea03b94

Rename MonitorEvent::CommitmentTxBroadcasted to CommitmentTxConfirmed


ariard Sep 21, 2021
c29092c

Extend MsgHandleErrInternal with a new chan_id field Option<[u8; 32]>


ariard Jul 13, 2021
6ce7f3e

Add ChannelClosed generation at cooperative/force-close/error processing


ariard Sep 21, 2021
d13c5cf

Add `pending_events` deadlock detection in `handle_error`


ariard Jul 13, 2021

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


1 change: 1 addition & 0 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -614,6 +614,7 @@ mod tests {
 .expect("SpendableOutputs not handled within deadline");
 match event {
 Event::SpendableOutputs { .. } => {},
 Event::ChannelClosed { .. } => {},
 _ => panic!("Unexpected event: {:?}", event),
 }

Expand Down

7 changes: 5 additions & 2 deletions
lightning-persister/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,11 +182,11 @@ mod tests {
	use bitcoin::Txid;
	use lightning::chain::channelmonitor::{Persist, ChannelMonitorUpdateErr};
	use lightning::chain::transaction::OutPoint;
	use lightning::{check_closed_broadcast, check_added_monitors};
	use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
	use lightning::ln::features::InitFeatures;
	use lightning::ln::functional_test_utils::*;
	use lightning::ln::msgs::ErrorAction;
	use lightning::util::events::{MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::events::{ClosureReason, Event, MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::test_utils;
	use std::fs;
	#[cfg(target_os = "windows")]
Expand DownExpand Up@@ -259,6 +259,7 @@ mod tests {
 // Force close because cooperative close doesn't result in any persisted
 // updates.
 nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
 check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
 check_closed_broadcast!(nodes[0], true);
 check_added_monitors!(nodes[0], 1);

Expand All@@ -268,6 +269,7 @@ mod tests {
 let header = BlockHeader { version: 0x20000000, prev_blockhash: nodes[0].best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 connect_block(&nodes[1], &Block { header, txdata: vec![node_txn[0].clone(), node_txn[0].clone()]});
 check_closed_broadcast!(nodes[1], true);
 check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed);
 check_added_monitors!(nodes[1], 1);

 // Make sure everything is persisted as expected after close.
Expand All@@ -291,6 +293,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 nodes[1].node.force_close_channel(&chan.2).unwrap();
 check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();

 // Set the persister's directory to read-only, which should result in
Expand Down

14 changes: 7 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@ pub enum MonitorEvent {
	/// A monitor event containing an HTLCUpdate.
	HTLCEvent(HTLCUpdate),

	/// A monitor event that the Channel's commitment transaction was broadcasted.
CommitmentTxBroadcasted(OutPoint),
	/// A monitor event that the Channel's commitment transaction was confirmed.
CommitmentTxConfirmed(OutPoint),
}

/// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
Expand DownExpand Up@@ -918,7 +918,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 0u8.write(writer)?;
 upd.write(writer)?;
 },
 MonitorEvent::CommitmentTxBroadcasted(_) => 1u8.write(writer)?
 MonitorEvent::CommitmentTxConfirmed(_) => 1u8.write(writer)?
 }
 }

Expand DownExpand Up@@ -1787,7 +1787,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 log_info!(logger, "Broadcasting local {}", log_tx!(tx));
 broadcaster.broadcast_transaction(tx);
 }
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
	}

	pub fn update_monitor<B: Deref, F: Deref, L: Deref>(&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &L) -> Result<(), MonitorUpdateError>
Expand DownExpand Up@@ -1835,7 +1835,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 } else if !self.holder_tx_signed {
 log_error!(logger, "You have a toxic holder commitment transaction avaible in channel monitor, read comment in ChannelMonitor::get_latest_holder_commitment_txn to be informed of manual action to take");
 } else {
 // If we generated a MonitorEvent::CommitmentTxBroadcasted, the ChannelManager
 // If we generated a MonitorEvent::CommitmentTxConfirmed, the ChannelManager
 // will still give us a ChannelForceClosed event with !should_broadcast, but we
 // shouldn't print the scary warning above.
 log_info!(logger, "Channel off-chain state closed after we broadcasted our latest commitment transaction.");
Expand DownExpand Up@@ -2357,7 +2357,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), false, self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
 let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);
 self.holder_tx_signed = true;
 // Because we're broadcasting a commitment transaction, we should construct the package
Expand DownExpand Up@@ -3110,7 +3110,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 for _ in 0..pending_monitor_events_len {
 let ev = match <u8 as Readable>::read(reader)? {
 0 => MonitorEvent::HTLCEvent(Readable::read(reader)?),
 1 => MonitorEvent::CommitmentTxBroadcasted(funding_info.0),
 1 => MonitorEvent::CommitmentTxConfirmed(funding_info.0),
 _ => return Err(DecodeError::InvalidValue)
 };
 pending_monitor_events.push(ev);
Expand Down

10 changes: 9 additions & 1 deletion
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use util::config::UserConfig;
use util::enforcing_trait_impls::EnforcingSigner;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
use util::errors::APIError;
use util::ser::{ReadableArgs, Writeable};
use util::test_utils::TestBroadcaster;
Expand DownExpand Up@@ -81,6 +81,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand DownExpand Up@@ -269,6 +270,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
}

#[test]
Expand DownExpand Up@@ -1985,6 +1987,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:

	send_payment(&nodes[0], &[&nodes[1]], 8000000);
	close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand DownExpand Up@@ -2610,6 +2614,8 @@ fn test_temporary_error_during_shutdown() {
	assert_eq!(txn_a, txn_b);
	assert_eq!(txn_a.len(), 1);
	check_spends!(txn_a[0], funding_tx);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand All@@ -2630,6 +2636,7 @@ fn test_permanent_error_during_sending_shutdown() {
	assert!(nodes[0].node.close_channel(&channel_id).is_ok());
	check_closed_broadcast!(nodes[0], true);
	check_added_monitors!(nodes[0], 2);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand All@@ -2652,6 +2659,7 @@ fn test_permanent_error_during_handling_shutdown() {
	nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &shutdown);
	check_closed_broadcast!(nodes[1], true);
	check_added_monitors!(nodes[1], 2);
	check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand Down
Loading

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

Skip to content
Add Event::ChannelClosed generation#997

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Sep 21, 2021
 Merged


Add Event::ChannelClosed generation
#997
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e64467f

Add Event::ChannelClosed generation at channel shutdown


ariard Jul 13, 2021
ea03b94

Rename MonitorEvent::CommitmentTxBroadcasted to CommitmentTxConfirmed


ariard Sep 21, 2021
c29092c

Extend MsgHandleErrInternal with a new chan_id field Option<[u8; 32]>


ariard Jul 13, 2021
6ce7f3e

Add ChannelClosed generation at cooperative/force-close/error processing


ariard Sep 21, 2021
d13c5cf

Add `pending_events` deadlock detection in `handle_error`


ariard Jul 13, 2021

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


1 change: 1 addition & 0 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -614,6 +614,7 @@ mod tests {
 .expect("SpendableOutputs not handled within deadline");
 match event {
 Event::SpendableOutputs { .. } => {},
 Event::ChannelClosed { .. } => {},
 _ => panic!("Unexpected event: {:?}", event),
 }

Expand Down

7 changes: 5 additions & 2 deletions
lightning-persister/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,11 +182,11 @@ mod tests {
	use bitcoin::Txid;
	use lightning::chain::channelmonitor::{Persist, ChannelMonitorUpdateErr};
	use lightning::chain::transaction::OutPoint;
	use lightning::{check_closed_broadcast, check_added_monitors};
	use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
	use lightning::ln::features::InitFeatures;
	use lightning::ln::functional_test_utils::*;
	use lightning::ln::msgs::ErrorAction;
	use lightning::util::events::{MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::events::{ClosureReason, Event, MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::test_utils;
	use std::fs;
	#[cfg(target_os = "windows")]
Expand DownExpand Up@@ -259,6 +259,7 @@ mod tests {
 // Force close because cooperative close doesn't result in any persisted
 // updates.
 nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
 check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
 check_closed_broadcast!(nodes[0], true);
 check_added_monitors!(nodes[0], 1);

Expand All@@ -268,6 +269,7 @@ mod tests {
 let header = BlockHeader { version: 0x20000000, prev_blockhash: nodes[0].best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 connect_block(&nodes[1], &Block { header, txdata: vec![node_txn[0].clone(), node_txn[0].clone()]});
 check_closed_broadcast!(nodes[1], true);
 check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed);
 check_added_monitors!(nodes[1], 1);

 // Make sure everything is persisted as expected after close.
Expand All@@ -291,6 +293,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 nodes[1].node.force_close_channel(&chan.2).unwrap();
 check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();

 // Set the persister's directory to read-only, which should result in
Expand Down

14 changes: 7 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@ pub enum MonitorEvent {
	/// A monitor event containing an HTLCUpdate.
	HTLCEvent(HTLCUpdate),

	/// A monitor event that the Channel's commitment transaction was broadcasted.
CommitmentTxBroadcasted(OutPoint),
	/// A monitor event that the Channel's commitment transaction was confirmed.
CommitmentTxConfirmed(OutPoint),
}

/// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
Expand DownExpand Up@@ -918,7 +918,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 0u8.write(writer)?;
 upd.write(writer)?;
 },
 MonitorEvent::CommitmentTxBroadcasted(_) => 1u8.write(writer)?
 MonitorEvent::CommitmentTxConfirmed(_) => 1u8.write(writer)?
 }
 }

Expand DownExpand Up@@ -1787,7 +1787,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 log_info!(logger, "Broadcasting local {}", log_tx!(tx));
 broadcaster.broadcast_transaction(tx);
 }
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
	}

	pub fn update_monitor<B: Deref, F: Deref, L: Deref>(&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &L) -> Result<(), MonitorUpdateError>
Expand DownExpand Up@@ -1835,7 +1835,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 } else if !self.holder_tx_signed {
 log_error!(logger, "You have a toxic holder commitment transaction avaible in channel monitor, read comment in ChannelMonitor::get_latest_holder_commitment_txn to be informed of manual action to take");
 } else {
 // If we generated a MonitorEvent::CommitmentTxBroadcasted, the ChannelManager
 // If we generated a MonitorEvent::CommitmentTxConfirmed, the ChannelManager
 // will still give us a ChannelForceClosed event with !should_broadcast, but we
 // shouldn't print the scary warning above.
 log_info!(logger, "Channel off-chain state closed after we broadcasted our latest commitment transaction.");
Expand DownExpand Up@@ -2357,7 +2357,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), false, self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
 let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);
 self.holder_tx_signed = true;
 // Because we're broadcasting a commitment transaction, we should construct the package
Expand DownExpand Up@@ -3110,7 +3110,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 for _ in 0..pending_monitor_events_len {
 let ev = match <u8 as Readable>::read(reader)? {
 0 => MonitorEvent::HTLCEvent(Readable::read(reader)?),
 1 => MonitorEvent::CommitmentTxBroadcasted(funding_info.0),
 1 => MonitorEvent::CommitmentTxConfirmed(funding_info.0),
 _ => return Err(DecodeError::InvalidValue)
 };
 pending_monitor_events.push(ev);
Expand Down

10 changes: 9 additions & 1 deletion
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use util::config::UserConfig;
use util::enforcing_trait_impls::EnforcingSigner;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
use util::errors::APIError;
use util::ser::{ReadableArgs, Writeable};
use util::test_utils::TestBroadcaster;
Expand DownExpand Up@@ -81,6 +81,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand DownExpand Up@@ -269,6 +270,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
}

#[test]
Expand DownExpand Up@@ -1985,6 +1987,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:

	send_payment(&nodes[0], &[&nodes[1]], 8000000);
	close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand DownExpand Up@@ -2610,6 +2614,8 @@ fn test_temporary_error_during_shutdown() {
	assert_eq!(txn_a, txn_b);
	assert_eq!(txn_a.len(), 1);
	check_spends!(txn_a[0], funding_tx);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand All@@ -2630,6 +2636,7 @@ fn test_permanent_error_during_sending_shutdown() {
	assert!(nodes[0].node.close_channel(&channel_id).is_ok());
	check_closed_broadcast!(nodes[0], true);
	check_added_monitors!(nodes[0], 2);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand All@@ -2652,6 +2659,7 @@ fn test_permanent_error_during_handling_shutdown() {
	nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &shutdown);
	check_closed_broadcast!(nodes[1], true);
	check_added_monitors!(nodes[1], 2);
	check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand Down
Loading

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

Skip to content
Add Event::ChannelClosed generation#997

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Sep 21, 2021
 Merged


Add Event::ChannelClosed generation
#997
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e64467f

Add Event::ChannelClosed generation at channel shutdown


ariard Jul 13, 2021
ea03b94

Rename MonitorEvent::CommitmentTxBroadcasted to CommitmentTxConfirmed


ariard Sep 21, 2021
c29092c

Extend MsgHandleErrInternal with a new chan_id field Option<[u8; 32]>


ariard Jul 13, 2021
6ce7f3e

Add ChannelClosed generation at cooperative/force-close/error processing


ariard Sep 21, 2021
d13c5cf

Add `pending_events` deadlock detection in `handle_error`


ariard Jul 13, 2021

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


1 change: 1 addition & 0 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -614,6 +614,7 @@ mod tests {
 .expect("SpendableOutputs not handled within deadline");
 match event {
 Event::SpendableOutputs { .. } => {},
 Event::ChannelClosed { .. } => {},
 _ => panic!("Unexpected event: {:?}", event),
 }

Expand Down

7 changes: 5 additions & 2 deletions
lightning-persister/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,11 +182,11 @@ mod tests {
	use bitcoin::Txid;
	use lightning::chain::channelmonitor::{Persist, ChannelMonitorUpdateErr};
	use lightning::chain::transaction::OutPoint;
	use lightning::{check_closed_broadcast, check_added_monitors};
	use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
	use lightning::ln::features::InitFeatures;
	use lightning::ln::functional_test_utils::*;
	use lightning::ln::msgs::ErrorAction;
	use lightning::util::events::{MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::events::{ClosureReason, Event, MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::test_utils;
	use std::fs;
	#[cfg(target_os = "windows")]
Expand DownExpand Up@@ -259,6 +259,7 @@ mod tests {
 // Force close because cooperative close doesn't result in any persisted
 // updates.
 nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
 check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
 check_closed_broadcast!(nodes[0], true);
 check_added_monitors!(nodes[0], 1);

Expand All@@ -268,6 +269,7 @@ mod tests {
 let header = BlockHeader { version: 0x20000000, prev_blockhash: nodes[0].best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 connect_block(&nodes[1], &Block { header, txdata: vec![node_txn[0].clone(), node_txn[0].clone()]});
 check_closed_broadcast!(nodes[1], true);
 check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed);
 check_added_monitors!(nodes[1], 1);

 // Make sure everything is persisted as expected after close.
Expand All@@ -291,6 +293,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 nodes[1].node.force_close_channel(&chan.2).unwrap();
 check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();

 // Set the persister's directory to read-only, which should result in
Expand Down

14 changes: 7 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@ pub enum MonitorEvent {
	/// A monitor event containing an HTLCUpdate.
	HTLCEvent(HTLCUpdate),

	/// A monitor event that the Channel's commitment transaction was broadcasted.
CommitmentTxBroadcasted(OutPoint),
	/// A monitor event that the Channel's commitment transaction was confirmed.
CommitmentTxConfirmed(OutPoint),
}

/// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
Expand DownExpand Up@@ -918,7 +918,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 0u8.write(writer)?;
 upd.write(writer)?;
 },
 MonitorEvent::CommitmentTxBroadcasted(_) => 1u8.write(writer)?
 MonitorEvent::CommitmentTxConfirmed(_) => 1u8.write(writer)?
 }
 }

Expand DownExpand Up@@ -1787,7 +1787,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 log_info!(logger, "Broadcasting local {}", log_tx!(tx));
 broadcaster.broadcast_transaction(tx);
 }
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
	}

	pub fn update_monitor<B: Deref, F: Deref, L: Deref>(&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &L) -> Result<(), MonitorUpdateError>
Expand DownExpand Up@@ -1835,7 +1835,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 } else if !self.holder_tx_signed {
 log_error!(logger, "You have a toxic holder commitment transaction avaible in channel monitor, read comment in ChannelMonitor::get_latest_holder_commitment_txn to be informed of manual action to take");
 } else {
 // If we generated a MonitorEvent::CommitmentTxBroadcasted, the ChannelManager
 // If we generated a MonitorEvent::CommitmentTxConfirmed, the ChannelManager
 // will still give us a ChannelForceClosed event with !should_broadcast, but we
 // shouldn't print the scary warning above.
 log_info!(logger, "Channel off-chain state closed after we broadcasted our latest commitment transaction.");
Expand DownExpand Up@@ -2357,7 +2357,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), false, self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
 let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);
 self.holder_tx_signed = true;
 // Because we're broadcasting a commitment transaction, we should construct the package
Expand DownExpand Up@@ -3110,7 +3110,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 for _ in 0..pending_monitor_events_len {
 let ev = match <u8 as Readable>::read(reader)? {
 0 => MonitorEvent::HTLCEvent(Readable::read(reader)?),
 1 => MonitorEvent::CommitmentTxBroadcasted(funding_info.0),
 1 => MonitorEvent::CommitmentTxConfirmed(funding_info.0),
 _ => return Err(DecodeError::InvalidValue)
 };
 pending_monitor_events.push(ev);
Expand Down

10 changes: 9 additions & 1 deletion
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use util::config::UserConfig;
use util::enforcing_trait_impls::EnforcingSigner;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
use util::errors::APIError;
use util::ser::{ReadableArgs, Writeable};
use util::test_utils::TestBroadcaster;
Expand DownExpand Up@@ -81,6 +81,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand DownExpand Up@@ -269,6 +270,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
}

#[test]
Expand DownExpand Up@@ -1985,6 +1987,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:

	send_payment(&nodes[0], &[&nodes[1]], 8000000);
	close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand DownExpand Up@@ -2610,6 +2614,8 @@ fn test_temporary_error_during_shutdown() {
	assert_eq!(txn_a, txn_b);
	assert_eq!(txn_a.len(), 1);
	check_spends!(txn_a[0], funding_tx);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand All@@ -2630,6 +2636,7 @@ fn test_permanent_error_during_sending_shutdown() {
	assert!(nodes[0].node.close_channel(&channel_id).is_ok());
	check_closed_broadcast!(nodes[0], true);
	check_added_monitors!(nodes[0], 2);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand All@@ -2652,6 +2659,7 @@ fn test_permanent_error_during_handling_shutdown() {
	nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &shutdown);
	check_closed_broadcast!(nodes[1], true);
	check_added_monitors!(nodes[1], 2);
	check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand Down
Loading

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

Skip to content
Add Event::ChannelClosed generation#997

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Sep 21, 2021
 Merged


Add Event::ChannelClosed generation
#997
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e64467f

Add Event::ChannelClosed generation at channel shutdown


ariard Jul 13, 2021
ea03b94

Rename MonitorEvent::CommitmentTxBroadcasted to CommitmentTxConfirmed


ariard Sep 21, 2021
c29092c

Extend MsgHandleErrInternal with a new chan_id field Option<[u8; 32]>


ariard Jul 13, 2021
6ce7f3e

Add ChannelClosed generation at cooperative/force-close/error processing


ariard Sep 21, 2021
d13c5cf

Add `pending_events` deadlock detection in `handle_error`


ariard Jul 13, 2021

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


1 change: 1 addition & 0 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -614,6 +614,7 @@ mod tests {
 .expect("SpendableOutputs not handled within deadline");
 match event {
 Event::SpendableOutputs { .. } => {},
 Event::ChannelClosed { .. } => {},
 _ => panic!("Unexpected event: {:?}", event),
 }

Expand Down

7 changes: 5 additions & 2 deletions
lightning-persister/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,11 +182,11 @@ mod tests {
	use bitcoin::Txid;
	use lightning::chain::channelmonitor::{Persist, ChannelMonitorUpdateErr};
	use lightning::chain::transaction::OutPoint;
	use lightning::{check_closed_broadcast, check_added_monitors};
	use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
	use lightning::ln::features::InitFeatures;
	use lightning::ln::functional_test_utils::*;
	use lightning::ln::msgs::ErrorAction;
	use lightning::util::events::{MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::events::{ClosureReason, Event, MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::test_utils;
	use std::fs;
	#[cfg(target_os = "windows")]
Expand DownExpand Up@@ -259,6 +259,7 @@ mod tests {
 // Force close because cooperative close doesn't result in any persisted
 // updates.
 nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
 check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
 check_closed_broadcast!(nodes[0], true);
 check_added_monitors!(nodes[0], 1);

Expand All@@ -268,6 +269,7 @@ mod tests {
 let header = BlockHeader { version: 0x20000000, prev_blockhash: nodes[0].best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 connect_block(&nodes[1], &Block { header, txdata: vec![node_txn[0].clone(), node_txn[0].clone()]});
 check_closed_broadcast!(nodes[1], true);
 check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed);
 check_added_monitors!(nodes[1], 1);

 // Make sure everything is persisted as expected after close.
Expand All@@ -291,6 +293,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 nodes[1].node.force_close_channel(&chan.2).unwrap();
 check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();

 // Set the persister's directory to read-only, which should result in
Expand Down

14 changes: 7 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@ pub enum MonitorEvent {
	/// A monitor event containing an HTLCUpdate.
	HTLCEvent(HTLCUpdate),

	/// A monitor event that the Channel's commitment transaction was broadcasted.
CommitmentTxBroadcasted(OutPoint),
	/// A monitor event that the Channel's commitment transaction was confirmed.
CommitmentTxConfirmed(OutPoint),
}

/// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
Expand DownExpand Up@@ -918,7 +918,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 0u8.write(writer)?;
 upd.write(writer)?;
 },
 MonitorEvent::CommitmentTxBroadcasted(_) => 1u8.write(writer)?
 MonitorEvent::CommitmentTxConfirmed(_) => 1u8.write(writer)?
 }
 }

Expand DownExpand Up@@ -1787,7 +1787,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 log_info!(logger, "Broadcasting local {}", log_tx!(tx));
 broadcaster.broadcast_transaction(tx);
 }
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
	}

	pub fn update_monitor<B: Deref, F: Deref, L: Deref>(&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &L) -> Result<(), MonitorUpdateError>
Expand DownExpand Up@@ -1835,7 +1835,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 } else if !self.holder_tx_signed {
 log_error!(logger, "You have a toxic holder commitment transaction avaible in channel monitor, read comment in ChannelMonitor::get_latest_holder_commitment_txn to be informed of manual action to take");
 } else {
 // If we generated a MonitorEvent::CommitmentTxBroadcasted, the ChannelManager
 // If we generated a MonitorEvent::CommitmentTxConfirmed, the ChannelManager
 // will still give us a ChannelForceClosed event with !should_broadcast, but we
 // shouldn't print the scary warning above.
 log_info!(logger, "Channel off-chain state closed after we broadcasted our latest commitment transaction.");
Expand DownExpand Up@@ -2357,7 +2357,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), false, self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
 let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);
 self.holder_tx_signed = true;
 // Because we're broadcasting a commitment transaction, we should construct the package
Expand DownExpand Up@@ -3110,7 +3110,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 for _ in 0..pending_monitor_events_len {
 let ev = match <u8 as Readable>::read(reader)? {
 0 => MonitorEvent::HTLCEvent(Readable::read(reader)?),
 1 => MonitorEvent::CommitmentTxBroadcasted(funding_info.0),
 1 => MonitorEvent::CommitmentTxConfirmed(funding_info.0),
 _ => return Err(DecodeError::InvalidValue)
 };
 pending_monitor_events.push(ev);
Expand Down

10 changes: 9 additions & 1 deletion
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use util::config::UserConfig;
use util::enforcing_trait_impls::EnforcingSigner;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
use util::errors::APIError;
use util::ser::{ReadableArgs, Writeable};
use util::test_utils::TestBroadcaster;
Expand DownExpand Up@@ -81,6 +81,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand DownExpand Up@@ -269,6 +270,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
}

#[test]
Expand DownExpand Up@@ -1985,6 +1987,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:

	send_payment(&nodes[0], &[&nodes[1]], 8000000);
	close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand DownExpand Up@@ -2610,6 +2614,8 @@ fn test_temporary_error_during_shutdown() {
	assert_eq!(txn_a, txn_b);
	assert_eq!(txn_a.len(), 1);
	check_spends!(txn_a[0], funding_tx);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand All@@ -2630,6 +2636,7 @@ fn test_permanent_error_during_sending_shutdown() {
	assert!(nodes[0].node.close_channel(&channel_id).is_ok());
	check_closed_broadcast!(nodes[0], true);
	check_added_monitors!(nodes[0], 2);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand All@@ -2652,6 +2659,7 @@ fn test_permanent_error_during_handling_shutdown() {
	nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &shutdown);
	check_closed_broadcast!(nodes[1], true);
	check_added_monitors!(nodes[1], 2);
	check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Event::ChannelClosed generation#997

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Sep 21, 2021
 Merged


Add Event::ChannelClosed generation
#997
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e64467f

Add Event::ChannelClosed generation at channel shutdown


ariard Jul 13, 2021
ea03b94

Rename MonitorEvent::CommitmentTxBroadcasted to CommitmentTxConfirmed


ariard Sep 21, 2021
c29092c

Extend MsgHandleErrInternal with a new chan_id field Option<[u8; 32]>


ariard Jul 13, 2021
6ce7f3e

Add ChannelClosed generation at cooperative/force-close/error processing


ariard Sep 21, 2021
d13c5cf

Add `pending_events` deadlock detection in `handle_error`


ariard Jul 13, 2021

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


1 change: 1 addition & 0 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -614,6 +614,7 @@ mod tests {
 .expect("SpendableOutputs not handled within deadline");
 match event {
 Event::SpendableOutputs { .. } => {},
 Event::ChannelClosed { .. } => {},
 _ => panic!("Unexpected event: {:?}", event),
 }

Expand Down

7 changes: 5 additions & 2 deletions
lightning-persister/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,11 +182,11 @@ mod tests {
	use bitcoin::Txid;
	use lightning::chain::channelmonitor::{Persist, ChannelMonitorUpdateErr};
	use lightning::chain::transaction::OutPoint;
	use lightning::{check_closed_broadcast, check_added_monitors};
	use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
	use lightning::ln::features::InitFeatures;
	use lightning::ln::functional_test_utils::*;
	use lightning::ln::msgs::ErrorAction;
	use lightning::util::events::{MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::events::{ClosureReason, Event, MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::test_utils;
	use std::fs;
	#[cfg(target_os = "windows")]
Expand DownExpand Up@@ -259,6 +259,7 @@ mod tests {
 // Force close because cooperative close doesn't result in any persisted
 // updates.
 nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
 check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
 check_closed_broadcast!(nodes[0], true);
 check_added_monitors!(nodes[0], 1);

Expand All@@ -268,6 +269,7 @@ mod tests {
 let header = BlockHeader { version: 0x20000000, prev_blockhash: nodes[0].best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 connect_block(&nodes[1], &Block { header, txdata: vec![node_txn[0].clone(), node_txn[0].clone()]});
 check_closed_broadcast!(nodes[1], true);
 check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed);
 check_added_monitors!(nodes[1], 1);

 // Make sure everything is persisted as expected after close.
Expand All@@ -291,6 +293,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 nodes[1].node.force_close_channel(&chan.2).unwrap();
 check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();

 // Set the persister's directory to read-only, which should result in
Expand Down

14 changes: 7 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@ pub enum MonitorEvent {
	/// A monitor event containing an HTLCUpdate.
	HTLCEvent(HTLCUpdate),

	/// A monitor event that the Channel's commitment transaction was broadcasted.
CommitmentTxBroadcasted(OutPoint),
	/// A monitor event that the Channel's commitment transaction was confirmed.
CommitmentTxConfirmed(OutPoint),
}

/// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
Expand DownExpand Up@@ -918,7 +918,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 0u8.write(writer)?;
 upd.write(writer)?;
 },
 MonitorEvent::CommitmentTxBroadcasted(_) => 1u8.write(writer)?
 MonitorEvent::CommitmentTxConfirmed(_) => 1u8.write(writer)?
 }
 }

Expand DownExpand Up@@ -1787,7 +1787,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 log_info!(logger, "Broadcasting local {}", log_tx!(tx));
 broadcaster.broadcast_transaction(tx);
 }
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
	}

	pub fn update_monitor<B: Deref, F: Deref, L: Deref>(&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &L) -> Result<(), MonitorUpdateError>
Expand DownExpand Up@@ -1835,7 +1835,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 } else if !self.holder_tx_signed {
 log_error!(logger, "You have a toxic holder commitment transaction avaible in channel monitor, read comment in ChannelMonitor::get_latest_holder_commitment_txn to be informed of manual action to take");
 } else {
 // If we generated a MonitorEvent::CommitmentTxBroadcasted, the ChannelManager
 // If we generated a MonitorEvent::CommitmentTxConfirmed, the ChannelManager
 // will still give us a ChannelForceClosed event with !should_broadcast, but we
 // shouldn't print the scary warning above.
 log_info!(logger, "Channel off-chain state closed after we broadcasted our latest commitment transaction.");
Expand DownExpand Up@@ -2357,7 +2357,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), false, self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
 let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);
 self.holder_tx_signed = true;
 // Because we're broadcasting a commitment transaction, we should construct the package
Expand DownExpand Up@@ -3110,7 +3110,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 for _ in 0..pending_monitor_events_len {
 let ev = match <u8 as Readable>::read(reader)? {
 0 => MonitorEvent::HTLCEvent(Readable::read(reader)?),
 1 => MonitorEvent::CommitmentTxBroadcasted(funding_info.0),
 1 => MonitorEvent::CommitmentTxConfirmed(funding_info.0),
 _ => return Err(DecodeError::InvalidValue)
 };
 pending_monitor_events.push(ev);
Expand Down

10 changes: 9 additions & 1 deletion
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use util::config::UserConfig;
use util::enforcing_trait_impls::EnforcingSigner;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
use util::errors::APIError;
use util::ser::{ReadableArgs, Writeable};
use util::test_utils::TestBroadcaster;
Expand DownExpand Up@@ -81,6 +81,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand DownExpand Up@@ -269,6 +270,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
}

#[test]
Expand DownExpand Up@@ -1985,6 +1987,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:

	send_payment(&nodes[0], &[&nodes[1]], 8000000);
	close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand DownExpand Up@@ -2610,6 +2614,8 @@ fn test_temporary_error_during_shutdown() {
	assert_eq!(txn_a, txn_b);
	assert_eq!(txn_a.len(), 1);
	check_spends!(txn_a[0], funding_tx);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand All@@ -2630,6 +2636,7 @@ fn test_permanent_error_during_sending_shutdown() {
	assert!(nodes[0].node.close_channel(&channel_id).is_ok());
	check_closed_broadcast!(nodes[0], true);
	check_added_monitors!(nodes[0], 2);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand All@@ -2652,6 +2659,7 @@ fn test_permanent_error_during_handling_shutdown() {
	nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &shutdown);
	check_closed_broadcast!(nodes[1], true);
	check_added_monitors!(nodes[1], 2);
	check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Event::ChannelClosed generation#997

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Sep 21, 2021
 Merged


Add Event::ChannelClosed generation
#997
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e64467f

Add Event::ChannelClosed generation at channel shutdown


ariard Jul 13, 2021
ea03b94

Rename MonitorEvent::CommitmentTxBroadcasted to CommitmentTxConfirmed


ariard Sep 21, 2021
c29092c

Extend MsgHandleErrInternal with a new chan_id field Option<[u8; 32]>


ariard Jul 13, 2021
6ce7f3e

Add ChannelClosed generation at cooperative/force-close/error processing


ariard Sep 21, 2021
d13c5cf

Add `pending_events` deadlock detection in `handle_error`


ariard Jul 13, 2021

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


1 change: 1 addition & 0 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -614,6 +614,7 @@ mod tests {
 .expect("SpendableOutputs not handled within deadline");
 match event {
 Event::SpendableOutputs { .. } => {},
 Event::ChannelClosed { .. } => {},
 _ => panic!("Unexpected event: {:?}", event),
 }

Expand Down

7 changes: 5 additions & 2 deletions
lightning-persister/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,11 +182,11 @@ mod tests {
	use bitcoin::Txid;
	use lightning::chain::channelmonitor::{Persist, ChannelMonitorUpdateErr};
	use lightning::chain::transaction::OutPoint;
	use lightning::{check_closed_broadcast, check_added_monitors};
	use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
	use lightning::ln::features::InitFeatures;
	use lightning::ln::functional_test_utils::*;
	use lightning::ln::msgs::ErrorAction;
	use lightning::util::events::{MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::events::{ClosureReason, Event, MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::test_utils;
	use std::fs;
	#[cfg(target_os = "windows")]
Expand DownExpand Up@@ -259,6 +259,7 @@ mod tests {
 // Force close because cooperative close doesn't result in any persisted
 // updates.
 nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
 check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
 check_closed_broadcast!(nodes[0], true);
 check_added_monitors!(nodes[0], 1);

Expand All@@ -268,6 +269,7 @@ mod tests {
 let header = BlockHeader { version: 0x20000000, prev_blockhash: nodes[0].best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 connect_block(&nodes[1], &Block { header, txdata: vec![node_txn[0].clone(), node_txn[0].clone()]});
 check_closed_broadcast!(nodes[1], true);
 check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed);
 check_added_monitors!(nodes[1], 1);

 // Make sure everything is persisted as expected after close.
Expand All@@ -291,6 +293,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 nodes[1].node.force_close_channel(&chan.2).unwrap();
 check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();

 // Set the persister's directory to read-only, which should result in
Expand Down

14 changes: 7 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@ pub enum MonitorEvent {
	/// A monitor event containing an HTLCUpdate.
	HTLCEvent(HTLCUpdate),

	/// A monitor event that the Channel's commitment transaction was broadcasted.
CommitmentTxBroadcasted(OutPoint),
	/// A monitor event that the Channel's commitment transaction was confirmed.
CommitmentTxConfirmed(OutPoint),
}

/// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
Expand DownExpand Up@@ -918,7 +918,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 0u8.write(writer)?;
 upd.write(writer)?;
 },
 MonitorEvent::CommitmentTxBroadcasted(_) => 1u8.write(writer)?
 MonitorEvent::CommitmentTxConfirmed(_) => 1u8.write(writer)?
 }
 }

Expand DownExpand Up@@ -1787,7 +1787,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 log_info!(logger, "Broadcasting local {}", log_tx!(tx));
 broadcaster.broadcast_transaction(tx);
 }
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
	}

	pub fn update_monitor<B: Deref, F: Deref, L: Deref>(&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &L) -> Result<(), MonitorUpdateError>
Expand DownExpand Up@@ -1835,7 +1835,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 } else if !self.holder_tx_signed {
 log_error!(logger, "You have a toxic holder commitment transaction avaible in channel monitor, read comment in ChannelMonitor::get_latest_holder_commitment_txn to be informed of manual action to take");
 } else {
 // If we generated a MonitorEvent::CommitmentTxBroadcasted, the ChannelManager
 // If we generated a MonitorEvent::CommitmentTxConfirmed, the ChannelManager
 // will still give us a ChannelForceClosed event with !should_broadcast, but we
 // shouldn't print the scary warning above.
 log_info!(logger, "Channel off-chain state closed after we broadcasted our latest commitment transaction.");
Expand DownExpand Up@@ -2357,7 +2357,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), false, self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
 let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);
 self.holder_tx_signed = true;
 // Because we're broadcasting a commitment transaction, we should construct the package
Expand DownExpand Up@@ -3110,7 +3110,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 for _ in 0..pending_monitor_events_len {
 let ev = match <u8 as Readable>::read(reader)? {
 0 => MonitorEvent::HTLCEvent(Readable::read(reader)?),
 1 => MonitorEvent::CommitmentTxBroadcasted(funding_info.0),
 1 => MonitorEvent::CommitmentTxConfirmed(funding_info.0),
 _ => return Err(DecodeError::InvalidValue)
 };
 pending_monitor_events.push(ev);
Expand Down

10 changes: 9 additions & 1 deletion
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use util::config::UserConfig;
use util::enforcing_trait_impls::EnforcingSigner;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
use util::errors::APIError;
use util::ser::{ReadableArgs, Writeable};
use util::test_utils::TestBroadcaster;
Expand DownExpand Up@@ -81,6 +81,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand DownExpand Up@@ -269,6 +270,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
}

#[test]
Expand DownExpand Up@@ -1985,6 +1987,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:

	send_payment(&nodes[0], &[&nodes[1]], 8000000);
	close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand DownExpand Up@@ -2610,6 +2614,8 @@ fn test_temporary_error_during_shutdown() {
	assert_eq!(txn_a, txn_b);
	assert_eq!(txn_a.len(), 1);
	check_spends!(txn_a[0], funding_tx);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand All@@ -2630,6 +2636,7 @@ fn test_permanent_error_during_sending_shutdown() {
	assert!(nodes[0].node.close_channel(&channel_id).is_ok());
	check_closed_broadcast!(nodes[0], true);
	check_added_monitors!(nodes[0], 2);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand All@@ -2652,6 +2659,7 @@ fn test_permanent_error_during_handling_shutdown() {
	nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &shutdown);
	check_closed_broadcast!(nodes[1], true);
	check_added_monitors!(nodes[1], 2);
	check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand Down
Loading

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

Skip to content
Add Event::ChannelClosed generation#997

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Sep 21, 2021
 Merged


Add Event::ChannelClosed generation
#997
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e64467f

Add Event::ChannelClosed generation at channel shutdown


ariard Jul 13, 2021
ea03b94

Rename MonitorEvent::CommitmentTxBroadcasted to CommitmentTxConfirmed


ariard Sep 21, 2021
c29092c

Extend MsgHandleErrInternal with a new chan_id field Option<[u8; 32]>


ariard Jul 13, 2021
6ce7f3e

Add ChannelClosed generation at cooperative/force-close/error processing


ariard Sep 21, 2021
d13c5cf

Add `pending_events` deadlock detection in `handle_error`


ariard Jul 13, 2021

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


1 change: 1 addition & 0 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -614,6 +614,7 @@ mod tests {
 .expect("SpendableOutputs not handled within deadline");
 match event {
 Event::SpendableOutputs { .. } => {},
 Event::ChannelClosed { .. } => {},
 _ => panic!("Unexpected event: {:?}", event),
 }

Expand Down

7 changes: 5 additions & 2 deletions
lightning-persister/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,11 +182,11 @@ mod tests {
	use bitcoin::Txid;
	use lightning::chain::channelmonitor::{Persist, ChannelMonitorUpdateErr};
	use lightning::chain::transaction::OutPoint;
	use lightning::{check_closed_broadcast, check_added_monitors};
	use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
	use lightning::ln::features::InitFeatures;
	use lightning::ln::functional_test_utils::*;
	use lightning::ln::msgs::ErrorAction;
	use lightning::util::events::{MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::events::{ClosureReason, Event, MessageSendEventsProvider, MessageSendEvent};
	use lightning::util::test_utils;
	use std::fs;
	#[cfg(target_os = "windows")]
Expand DownExpand Up@@ -259,6 +259,7 @@ mod tests {
 // Force close because cooperative close doesn't result in any persisted
 // updates.
 nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
 check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
 check_closed_broadcast!(nodes[0], true);
 check_added_monitors!(nodes[0], 1);

Expand All@@ -268,6 +269,7 @@ mod tests {
 let header = BlockHeader { version: 0x20000000, prev_blockhash: nodes[0].best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 connect_block(&nodes[1], &Block { header, txdata: vec![node_txn[0].clone(), node_txn[0].clone()]});
 check_closed_broadcast!(nodes[1], true);
 check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed);
 check_added_monitors!(nodes[1], 1);

 // Make sure everything is persisted as expected after close.
Expand All@@ -291,6 +293,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 nodes[1].node.force_close_channel(&chan.2).unwrap();
 check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();

 // Set the persister's directory to read-only, which should result in
Expand Down

14 changes: 7 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@ pub enum MonitorEvent {
	/// A monitor event containing an HTLCUpdate.
	HTLCEvent(HTLCUpdate),

	/// A monitor event that the Channel's commitment transaction was broadcasted.
CommitmentTxBroadcasted(OutPoint),
	/// A monitor event that the Channel's commitment transaction was confirmed.
CommitmentTxConfirmed(OutPoint),
}

/// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
Expand DownExpand Up@@ -918,7 +918,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 0u8.write(writer)?;
 upd.write(writer)?;
 },
 MonitorEvent::CommitmentTxBroadcasted(_) => 1u8.write(writer)?
 MonitorEvent::CommitmentTxConfirmed(_) => 1u8.write(writer)?
 }
 }

Expand DownExpand Up@@ -1787,7 +1787,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 log_info!(logger, "Broadcasting local {}", log_tx!(tx));
 broadcaster.broadcast_transaction(tx);
 }
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
	}

	pub fn update_monitor<B: Deref, F: Deref, L: Deref>(&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &L) -> Result<(), MonitorUpdateError>
Expand DownExpand Up@@ -1835,7 +1835,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 } else if !self.holder_tx_signed {
 log_error!(logger, "You have a toxic holder commitment transaction avaible in channel monitor, read comment in ChannelMonitor::get_latest_holder_commitment_txn to be informed of manual action to take");
 } else {
 // If we generated a MonitorEvent::CommitmentTxBroadcasted, the ChannelManager
 // If we generated a MonitorEvent::CommitmentTxConfirmed, the ChannelManager
 // will still give us a ChannelForceClosed event with !should_broadcast, but we
 // shouldn't print the scary warning above.
 log_info!(logger, "Channel off-chain state closed after we broadcasted our latest commitment transaction.");
Expand DownExpand Up@@ -2357,7 +2357,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), false, self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
 let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);
 self.holder_tx_signed = true;
 // Because we're broadcasting a commitment transaction, we should construct the package
Expand DownExpand Up@@ -3110,7 +3110,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 for _ in 0..pending_monitor_events_len {
 let ev = match <u8 as Readable>::read(reader)? {
 0 => MonitorEvent::HTLCEvent(Readable::read(reader)?),
 1 => MonitorEvent::CommitmentTxBroadcasted(funding_info.0),
 1 => MonitorEvent::CommitmentTxConfirmed(funding_info.0),
 _ => return Err(DecodeError::InvalidValue)
 };
 pending_monitor_events.push(ev);
Expand Down

10 changes: 9 additions & 1 deletion
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use util::config::UserConfig;
use util::enforcing_trait_impls::EnforcingSigner;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
use util::errors::APIError;
use util::ser::{ReadableArgs, Writeable};
use util::test_utils::TestBroadcaster;
Expand DownExpand Up@@ -81,6 +81,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand DownExpand Up@@ -269,6 +270,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
	// PaymentFailed event

	assert_eq!(nodes[0].node.list_channels().len(), 0);
	check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
}

#[test]
Expand DownExpand Up@@ -1985,6 +1987,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:

	send_payment(&nodes[0], &[&nodes[1]], 8000000);
	close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand DownExpand Up@@ -2610,6 +2614,8 @@ fn test_temporary_error_during_shutdown() {
	assert_eq!(txn_a, txn_b);
	assert_eq!(txn_a.len(), 1);
	check_spends!(txn_a[0], funding_tx);
	check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
	check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
}

#[test]
Expand All@@ -2630,6 +2636,7 @@ fn test_permanent_error_during_sending_shutdown() {
	assert!(nodes[0].node.close_channel(&channel_id).is_ok());
	check_closed_broadcast!(nodes[0], true);
	check_added_monitors!(nodes[0], 2);
	check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand All@@ -2652,6 +2659,7 @@ fn test_permanent_error_during_handling_shutdown() {
	nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &shutdown);
	check_closed_broadcast!(nodes[1], true);
	check_added_monitors!(nodes[1], 2);
	check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
}

#[test]
Expand Down
Loading