Remove Channel's ChannelMonitor copy#667

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 2 commits into from
Aug 25, 2020
Merged

Remove Channel's ChannelMonitor copy #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad18c4d
Add commitment transaction broadcast as a ChannelMonitor event
valentinewallace Aug 24, 2020
28d9036
Remove Channel's ChannelMonitor copy
valentinewallace Aug 13, 2020
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
6 changes: 3 additions & 3 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil,ChainWatchInterface};
use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, MonitorEvent};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
Expand DownExpand Up@@ -135,8 +135,8 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
self.update_ret.lock().unwrap().clone()
}

fn get_and_clear_pending_htlcs_updated(&self) -> Vec<HTLCUpdate> {
return self.simple_monitor.get_and_clear_pending_htlcs_updated();
fn get_and_clear_pending_monitor_events(&self) -> Vec<MonitorEvent> {
return self.simple_monitor.get_and_clear_pending_monitor_events();
}
}

Expand Down
35 changes: 0 additions & 35 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -386,9 +386,6 @@ pub(super) struct Channel<ChanSigner: ChannelKeys> {

their_shutdown_scriptpubkey: Option<Script>,

/// Used exclusively to broadcast the latest local state, mostly a historical quirk that this
/// is here:
channel_monitor: Option<ChannelMonitor<ChanSigner>>,
commitment_secrets: CounterpartyCommitmentSecrets,

network_sync: UpdateStatus,
Expand DownExpand Up@@ -557,7 +554,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

their_shutdown_scriptpubkey: None,

channel_monitor: None,
commitment_secrets: CounterpartyCommitmentSecrets::new(),

network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -786,7 +782,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

their_shutdown_scriptpubkey,

channel_monitor: None,
commitment_secrets: CounterpartyCommitmentSecrets::new(),

network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -1222,7 +1217,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
payment_preimage: payment_preimage_arg.clone(),
}],
};
self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
for pending_update in self.holding_cell_htlc_updates.iter() {
Expand DownExpand Up@@ -1552,7 +1546,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
} }
}

self.channel_monitor = Some(create_monitor!());
let channel_monitor = create_monitor!();

self.channel_state = ChannelState::FundingSent as u32;
Expand DownExpand Up@@ -1618,7 +1611,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
} }
}

self.channel_monitor = Some(create_monitor!());
let channel_monitor = create_monitor!();

assert_eq!(self.channel_state & (ChannelState::MonitorUpdateFailed as u32), 0); // We have no had any monitor(s) yet to fail update!
Expand DownExpand Up@@ -2060,7 +2052,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
htlc_outputs: htlcs_and_sigs
}]
};
self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

for htlc in self.pending_inbound_htlcs.iter_mut() {
let new_forward = if let &InboundHTLCState::RemoteAnnounced(ref forward_info) = &htlc.state {
Expand DownExpand Up@@ -2280,7 +2271,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
secret: msg.per_commitment_secret,
}],
};
self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

// Update state now that we've passed all the can-fail calls...
// (note that we may still fail to generate the new commitment_signed message, but that's
Expand DownExpand Up@@ -3115,14 +3105,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
self.user_id
}

/// May only be called after funding has been initiated (ie is_funding_initiated() is true)
pub fn channel_monitor(&mut self) -> &mut ChannelMonitor<ChanSigner> {
if self.channel_state < ChannelState::FundingSent as u32 {
panic!("Can't get a channel monitor until funding has been created");
}
self.channel_monitor.as_mut().unwrap()
}

/// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
/// is_usable() returns true).
/// Allowed in any state (including after shutdown)
Expand DownExpand Up@@ -3397,9 +3379,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
if header.bitcoin_hash() != self.last_block_connected {
self.last_block_connected = header.bitcoin_hash();
self.update_time_counter = cmp::max(self.update_time_counter, header.time);
if let Some(channel_monitor) = self.channel_monitor.as_mut() {
channel_monitor.last_block_hash = self.last_block_connected;
}
if self.funding_tx_confirmations > 0 {
if self.funding_tx_confirmations == self.minimum_depth as u64 {
let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
Expand DownExpand Up@@ -3458,9 +3437,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
}
self.last_block_connected = header.bitcoin_hash();
if let Some(channel_monitor) = self.channel_monitor.as_mut() {
channel_monitor.last_block_hash = self.last_block_connected;
}
false
}

Expand DownExpand Up@@ -3871,7 +3847,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
their_revocation_point: self.their_cur_commitment_point.unwrap()
}]
};
self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();
self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
Ok((res, monitor_update))
}
Expand DownExpand Up@@ -4242,8 +4217,6 @@ impl<ChanSigner: ChannelKeys + Writeable> Writeable for Channel<ChanSigner> {
self.their_shutdown_scriptpubkey.write(writer)?;

self.commitment_secrets.write(writer)?;

self.channel_monitor.as_ref().unwrap().write_for_disk(writer)?;
Ok(())
}
}
Expand DownExpand Up@@ -4398,13 +4371,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {
let their_shutdown_scriptpubkey = Readable::read(reader)?;
let commitment_secrets = Readable::read(reader)?;

let (monitor_last_block, channel_monitor) = Readable::read(reader)?;
// We drop the ChannelMonitor's last block connected hash cause we don't actually bother
// doing full block connection operations on the internal ChannelMonitor copies
if monitor_last_block != last_block_connected {
return Err(DecodeError::InvalidValue);
}

Ok(Channel {
user_id,

Expand DownExpand Up@@ -4476,7 +4442,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

their_shutdown_scriptpubkey,

channel_monitor: Some(channel_monitor),
commitment_secrets,

network_sync: UpdateStatus::Fresh,
Expand Down
95 changes: 49 additions & 46 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use bitcoin::secp256k1;
use chain::chaininterface::{BroadcasterInterface,ChainListener,FeeEstimator};
use chain::transaction::OutPoint;
use ln::channel::{Channel, ChannelError};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent};
use ln::features::{InitFeatures, NodeFeatures};
use routing::router::{Route, RouteHop};
use ln::msgs;
Expand DownExpand Up@@ -2966,6 +2966,48 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
Err(e) => { Err(APIError::APIMisuseError { err: e.err })}
}
}

/// Process pending events from the ManyChannelMonitor.
fn process_pending_monitor_events(&self) {
let mut failed_channels = Vec::new();
{
for monitor_event in self.monitor.get_and_clear_pending_monitor_events() {
match monitor_event {
MonitorEvent::HTLCEvent(htlc_update) => {
if let Some(preimage) = htlc_update.payment_preimage {
log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
} else {
log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
}
},
MonitorEvent::CommitmentTxBroadcasted(funding_outpoint) => {
let mut channel_lock = self.channel_state.lock().unwrap();
let channel_state = &mut *channel_lock;
let by_id = &mut channel_state.by_id;
let short_to_id = &mut channel_state.short_to_id;
let pending_msg_events = &mut channel_state.pending_msg_events;
if let Some(mut chan) = by_id.remove(&funding_outpoint.to_channel_id()) {
if let Some(short_id) = chan.get_short_channel_id() {
short_to_id.remove(&short_id);
}
failed_channels.push(chan.force_shutdown(false));
if let Ok(update) = self.get_channel_update(&chan) {
pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
msg: update
});
}
}
},
}
}
}

for failure in failed_channels.drain(..) {
self.finish_force_close_channel(failure);
}
}
}

impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> events::MessageSendEventsProvider for ChannelManager<ChanSigner, M, T, K, F, L>
Expand All@@ -2976,21 +3018,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
L::Target: Logger,
{
fn get_and_clear_pending_msg_events(&self) -> Vec<events::MessageSendEvent> {
// TODO: Event release to users and serialization is currently race-y: it's very easy for a
// user to serialize a ChannelManager with pending events in it and lose those events on
// restart. This is doubly true for the fail/fulfill-backs from monitor events!
{
//TODO: This behavior should be documented.
for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
if let Some(preimage) = htlc_update.payment_preimage {
log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
} else {
log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
}
}
}
//TODO: This behavior should be documented. It's non-intuitive that we query
// ChannelMonitors when clearing other events.
self.process_pending_monitor_events();

let mut ret = Vec::new();
let mut channel_state = self.channel_state.lock().unwrap();
Expand All@@ -3007,21 +3037,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
L::Target: Logger,
{
fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
// TODO: Event release to users and serialization is currently race-y: it's very easy for a
// user to serialize a ChannelManager with pending events in it and lose those events on
// restart. This is doubly true for the fail/fulfill-backs from monitor events!
{
//TODO: This behavior should be documented.
for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
if let Some(preimage) = htlc_update.payment_preimage {
log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
} else {
log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
}
}
}
//TODO: This behavior should be documented. It's non-intuitive that we query
// ChannelMonitors when clearing other events.
self.process_pending_monitor_events();

let mut ret = Vec::new();
let mut pending_events = self.pending_events.lock().unwrap();
Expand DownExpand Up@@ -3104,21 +3122,6 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
}
}
}
if channel.is_funding_initiated() && channel.channel_monitor().would_broadcast_at_height(height, &self.logger) {
if let Some(short_id) = channel.get_short_channel_id() {
short_to_id.remove(&short_id);
}
// If would_broadcast_at_height() is true, the channel_monitor will broadcast
// the latest local tx for us, so we should skip that here (it doesn't really
// hurt anything, but does make tests a bit simpler).
failed_channels.push(channel.force_shutdown(false));
if let Ok(update) = self.get_channel_update(&channel) {
pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
msg: update
});
}
return false;
}
true
});

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
Remove Channel's ChannelMonitor copy#667

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 2 commits into

from

Aug 25, 2020
 Merged


Remove Channel's ChannelMonitor copy
#667
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ad18c4d

Add commitment transaction broadcast as a ChannelMonitor event


valentinewallace Aug 24, 2020
28d9036

Remove Channel's ChannelMonitor copy


valentinewallace Aug 13, 2020

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


6 changes: 3 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil,ChainWatchInterface};
use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, MonitorEvent};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
Expand DownExpand Up@@ -135,8 +135,8 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 self.update_ret.lock().unwrap().clone()
	}

	fn get_and_clear_pending_htlcs_updated(&self) -> Vec<HTLCUpdate> {
 return self.simple_monitor.get_and_clear_pending_htlcs_updated();
	fn get_and_clear_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 return self.simple_monitor.get_and_clear_pending_monitor_events();
	}
}

Expand Down

35 changes: 0 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -386,9 +386,6 @@ pub(super) struct Channel<ChanSigner: ChannelKeys> {

	their_shutdown_scriptpubkey: Option<Script>,

	/// Used exclusively to broadcast the latest local state, mostly a historical quirk that this
	/// is here:
	channel_monitor: Option<ChannelMonitor<ChanSigner>>,
	commitment_secrets: CounterpartyCommitmentSecrets,

	network_sync: UpdateStatus,
Expand DownExpand Up@@ -557,7 +554,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey: None,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -786,7 +782,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -1222,7 +1217,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 payment_preimage: payment_preimage_arg.clone(),
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
 for pending_update in self.holding_cell_htlc_updates.iter() {
Expand DownExpand Up@@ -1552,7 +1546,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 self.channel_state = ChannelState::FundingSent as u32;
Expand DownExpand Up@@ -1618,7 +1611,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 assert_eq!(self.channel_state & (ChannelState::MonitorUpdateFailed as u32), 0); // We have no had any monitor(s) yet to fail update!
Expand DownExpand Up@@ -2060,7 +2052,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 htlc_outputs: htlcs_and_sigs
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 for htlc in self.pending_inbound_htlcs.iter_mut() {
 let new_forward = if let &InboundHTLCState::RemoteAnnounced(ref forward_info) = &htlc.state {
Expand DownExpand Up@@ -2280,7 +2271,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 secret: msg.per_commitment_secret,
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 // Update state now that we've passed all the can-fail calls...
 // (note that we may still fail to generate the new commitment_signed message, but that's
Expand DownExpand Up@@ -3115,14 +3105,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.user_id
	}

	/// May only be called after funding has been initiated (ie is_funding_initiated() is true)
	pub fn channel_monitor(&mut self) -> &mut ChannelMonitor<ChanSigner> {
 if self.channel_state < ChannelState::FundingSent as u32 {
 panic!("Can't get a channel monitor until funding has been created");
 }
 self.channel_monitor.as_mut().unwrap()
	}

	/// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
	/// is_usable() returns true).
	/// Allowed in any state (including after shutdown)
Expand DownExpand Up@@ -3397,9 +3379,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
 let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
Expand DownExpand Up@@ -3458,9 +3437,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 false
	}

Expand DownExpand Up@@ -3871,7 +3847,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 their_revocation_point: self.their_cur_commitment_point.unwrap()
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();
 self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
 Ok((res, monitor_update))
	}
Expand DownExpand Up@@ -4242,8 +4217,6 @@ impl<ChanSigner: ChannelKeys + Writeable> Writeable for Channel<ChanSigner> {
 self.their_shutdown_scriptpubkey.write(writer)?;

 self.commitment_secrets.write(writer)?;

 self.channel_monitor.as_ref().unwrap().write_for_disk(writer)?;
 Ok(())
	}
}
Expand DownExpand Up@@ -4398,13 +4371,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {
 let their_shutdown_scriptpubkey = Readable::read(reader)?;
 let commitment_secrets = Readable::read(reader)?;

 let (monitor_last_block, channel_monitor) = Readable::read(reader)?;
 // We drop the ChannelMonitor's last block connected hash cause we don't actually bother
 // doing full block connection operations on the internal ChannelMonitor copies
 if monitor_last_block != last_block_connected {
 return Err(DecodeError::InvalidValue);
 }

 Ok(Channel {
 user_id,

Expand DownExpand Up@@ -4476,7 +4442,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: Some(channel_monitor),
 commitment_secrets,

 network_sync: UpdateStatus::Fresh,
Expand Down

95 changes: 49 additions & 46 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use bitcoin::secp256k1;
use chain::chaininterface::{BroadcasterInterface,ChainListener,FeeEstimator};
use chain::transaction::OutPoint;
use ln::channel::{Channel, ChannelError};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent};
use ln::features::{InitFeatures, NodeFeatures};
use routing::router::{Route, RouteHop};
use ln::msgs;
Expand DownExpand Up@@ -2966,6 +2966,48 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 Err(e) => { Err(APIError::APIMisuseError { err: e.err })}
 }
	}

	/// Process pending events from the ManyChannelMonitor.
	fn process_pending_monitor_events(&self) {
 let mut failed_channels = Vec::new();
 {
 for monitor_event in self.monitor.get_and_clear_pending_monitor_events() {
 match monitor_event {
 MonitorEvent::HTLCEvent(htlc_update) => {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 },
 MonitorEvent::CommitmentTxBroadcasted(funding_outpoint) => {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let by_id = &mut channel_state.by_id;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 if let Some(mut chan) = by_id.remove(&funding_outpoint.to_channel_id()) {
 if let Some(short_id) = chan.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 failed_channels.push(chan.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 }
 },
 }
 }
 }

 for failure in failed_channels.drain(..) {
 self.finish_force_close_channel(failure);
 }
	}
}

impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> events::MessageSendEventsProvider for ChannelManager<ChanSigner, M, T, K, F, L>
Expand All@@ -2976,21 +3018,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_msg_events(&self) -> Vec<events::MessageSendEvent> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut channel_state = self.channel_state.lock().unwrap();
Expand All@@ -3007,21 +3037,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut pending_events = self.pending_events.lock().unwrap();
Expand DownExpand Up@@ -3104,21 +3122,6 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 }
 }
 }
 if channel.is_funding_initiated() && channel.channel_monitor().would_broadcast_at_height(height, &self.logger) {
 if let Some(short_id) = channel.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 // If would_broadcast_at_height() is true, the channel_monitor will broadcast
 // the latest local tx for us, so we should skip that here (it doesn't really
 // hurt anything, but does make tests a bit simpler).
 failed_channels.push(channel.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&channel) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 return false;
 }
 true
 });

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
Remove Channel's ChannelMonitor copy#667

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 2 commits into

from

Aug 25, 2020
 Merged


Remove Channel's ChannelMonitor copy
#667
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ad18c4d

Add commitment transaction broadcast as a ChannelMonitor event


valentinewallace Aug 24, 2020
28d9036

Remove Channel's ChannelMonitor copy


valentinewallace Aug 13, 2020

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


6 changes: 3 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil,ChainWatchInterface};
use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, MonitorEvent};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
Expand DownExpand Up@@ -135,8 +135,8 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 self.update_ret.lock().unwrap().clone()
	}

	fn get_and_clear_pending_htlcs_updated(&self) -> Vec<HTLCUpdate> {
 return self.simple_monitor.get_and_clear_pending_htlcs_updated();
	fn get_and_clear_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 return self.simple_monitor.get_and_clear_pending_monitor_events();
	}
}

Expand Down

35 changes: 0 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -386,9 +386,6 @@ pub(super) struct Channel<ChanSigner: ChannelKeys> {

	their_shutdown_scriptpubkey: Option<Script>,

	/// Used exclusively to broadcast the latest local state, mostly a historical quirk that this
	/// is here:
	channel_monitor: Option<ChannelMonitor<ChanSigner>>,
	commitment_secrets: CounterpartyCommitmentSecrets,

	network_sync: UpdateStatus,
Expand DownExpand Up@@ -557,7 +554,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey: None,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -786,7 +782,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -1222,7 +1217,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 payment_preimage: payment_preimage_arg.clone(),
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
 for pending_update in self.holding_cell_htlc_updates.iter() {
Expand DownExpand Up@@ -1552,7 +1546,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 self.channel_state = ChannelState::FundingSent as u32;
Expand DownExpand Up@@ -1618,7 +1611,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 assert_eq!(self.channel_state & (ChannelState::MonitorUpdateFailed as u32), 0); // We have no had any monitor(s) yet to fail update!
Expand DownExpand Up@@ -2060,7 +2052,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 htlc_outputs: htlcs_and_sigs
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 for htlc in self.pending_inbound_htlcs.iter_mut() {
 let new_forward = if let &InboundHTLCState::RemoteAnnounced(ref forward_info) = &htlc.state {
Expand DownExpand Up@@ -2280,7 +2271,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 secret: msg.per_commitment_secret,
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 // Update state now that we've passed all the can-fail calls...
 // (note that we may still fail to generate the new commitment_signed message, but that's
Expand DownExpand Up@@ -3115,14 +3105,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.user_id
	}

	/// May only be called after funding has been initiated (ie is_funding_initiated() is true)
	pub fn channel_monitor(&mut self) -> &mut ChannelMonitor<ChanSigner> {
 if self.channel_state < ChannelState::FundingSent as u32 {
 panic!("Can't get a channel monitor until funding has been created");
 }
 self.channel_monitor.as_mut().unwrap()
	}

	/// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
	/// is_usable() returns true).
	/// Allowed in any state (including after shutdown)
Expand DownExpand Up@@ -3397,9 +3379,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
 let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
Expand DownExpand Up@@ -3458,9 +3437,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 false
	}

Expand DownExpand Up@@ -3871,7 +3847,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 their_revocation_point: self.their_cur_commitment_point.unwrap()
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();
 self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
 Ok((res, monitor_update))
	}
Expand DownExpand Up@@ -4242,8 +4217,6 @@ impl<ChanSigner: ChannelKeys + Writeable> Writeable for Channel<ChanSigner> {
 self.their_shutdown_scriptpubkey.write(writer)?;

 self.commitment_secrets.write(writer)?;

 self.channel_monitor.as_ref().unwrap().write_for_disk(writer)?;
 Ok(())
	}
}
Expand DownExpand Up@@ -4398,13 +4371,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {
 let their_shutdown_scriptpubkey = Readable::read(reader)?;
 let commitment_secrets = Readable::read(reader)?;

 let (monitor_last_block, channel_monitor) = Readable::read(reader)?;
 // We drop the ChannelMonitor's last block connected hash cause we don't actually bother
 // doing full block connection operations on the internal ChannelMonitor copies
 if monitor_last_block != last_block_connected {
 return Err(DecodeError::InvalidValue);
 }

 Ok(Channel {
 user_id,

Expand DownExpand Up@@ -4476,7 +4442,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: Some(channel_monitor),
 commitment_secrets,

 network_sync: UpdateStatus::Fresh,
Expand Down

95 changes: 49 additions & 46 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use bitcoin::secp256k1;
use chain::chaininterface::{BroadcasterInterface,ChainListener,FeeEstimator};
use chain::transaction::OutPoint;
use ln::channel::{Channel, ChannelError};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent};
use ln::features::{InitFeatures, NodeFeatures};
use routing::router::{Route, RouteHop};
use ln::msgs;
Expand DownExpand Up@@ -2966,6 +2966,48 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 Err(e) => { Err(APIError::APIMisuseError { err: e.err })}
 }
	}

	/// Process pending events from the ManyChannelMonitor.
	fn process_pending_monitor_events(&self) {
 let mut failed_channels = Vec::new();
 {
 for monitor_event in self.monitor.get_and_clear_pending_monitor_events() {
 match monitor_event {
 MonitorEvent::HTLCEvent(htlc_update) => {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 },
 MonitorEvent::CommitmentTxBroadcasted(funding_outpoint) => {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let by_id = &mut channel_state.by_id;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 if let Some(mut chan) = by_id.remove(&funding_outpoint.to_channel_id()) {
 if let Some(short_id) = chan.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 failed_channels.push(chan.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 }
 },
 }
 }
 }

 for failure in failed_channels.drain(..) {
 self.finish_force_close_channel(failure);
 }
	}
}

impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> events::MessageSendEventsProvider for ChannelManager<ChanSigner, M, T, K, F, L>
Expand All@@ -2976,21 +3018,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_msg_events(&self) -> Vec<events::MessageSendEvent> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut channel_state = self.channel_state.lock().unwrap();
Expand All@@ -3007,21 +3037,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut pending_events = self.pending_events.lock().unwrap();
Expand DownExpand Up@@ -3104,21 +3122,6 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 }
 }
 }
 if channel.is_funding_initiated() && channel.channel_monitor().would_broadcast_at_height(height, &self.logger) {
 if let Some(short_id) = channel.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 // If would_broadcast_at_height() is true, the channel_monitor will broadcast
 // the latest local tx for us, so we should skip that here (it doesn't really
 // hurt anything, but does make tests a bit simpler).
 failed_channels.push(channel.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&channel) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 return false;
 }
 true
 });

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
Remove Channel's ChannelMonitor copy#667

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 2 commits into

from

Aug 25, 2020
 Merged


Remove Channel's ChannelMonitor copy
#667
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ad18c4d

Add commitment transaction broadcast as a ChannelMonitor event


valentinewallace Aug 24, 2020
28d9036

Remove Channel's ChannelMonitor copy


valentinewallace Aug 13, 2020

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


6 changes: 3 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil,ChainWatchInterface};
use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, MonitorEvent};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
Expand DownExpand Up@@ -135,8 +135,8 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 self.update_ret.lock().unwrap().clone()
	}

	fn get_and_clear_pending_htlcs_updated(&self) -> Vec<HTLCUpdate> {
 return self.simple_monitor.get_and_clear_pending_htlcs_updated();
	fn get_and_clear_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 return self.simple_monitor.get_and_clear_pending_monitor_events();
	}
}

Expand Down

35 changes: 0 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -386,9 +386,6 @@ pub(super) struct Channel<ChanSigner: ChannelKeys> {

	their_shutdown_scriptpubkey: Option<Script>,

	/// Used exclusively to broadcast the latest local state, mostly a historical quirk that this
	/// is here:
	channel_monitor: Option<ChannelMonitor<ChanSigner>>,
	commitment_secrets: CounterpartyCommitmentSecrets,

	network_sync: UpdateStatus,
Expand DownExpand Up@@ -557,7 +554,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey: None,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -786,7 +782,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -1222,7 +1217,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 payment_preimage: payment_preimage_arg.clone(),
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
 for pending_update in self.holding_cell_htlc_updates.iter() {
Expand DownExpand Up@@ -1552,7 +1546,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 self.channel_state = ChannelState::FundingSent as u32;
Expand DownExpand Up@@ -1618,7 +1611,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 assert_eq!(self.channel_state & (ChannelState::MonitorUpdateFailed as u32), 0); // We have no had any monitor(s) yet to fail update!
Expand DownExpand Up@@ -2060,7 +2052,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 htlc_outputs: htlcs_and_sigs
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 for htlc in self.pending_inbound_htlcs.iter_mut() {
 let new_forward = if let &InboundHTLCState::RemoteAnnounced(ref forward_info) = &htlc.state {
Expand DownExpand Up@@ -2280,7 +2271,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 secret: msg.per_commitment_secret,
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 // Update state now that we've passed all the can-fail calls...
 // (note that we may still fail to generate the new commitment_signed message, but that's
Expand DownExpand Up@@ -3115,14 +3105,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.user_id
	}

	/// May only be called after funding has been initiated (ie is_funding_initiated() is true)
	pub fn channel_monitor(&mut self) -> &mut ChannelMonitor<ChanSigner> {
 if self.channel_state < ChannelState::FundingSent as u32 {
 panic!("Can't get a channel monitor until funding has been created");
 }
 self.channel_monitor.as_mut().unwrap()
	}

	/// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
	/// is_usable() returns true).
	/// Allowed in any state (including after shutdown)
Expand DownExpand Up@@ -3397,9 +3379,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
 let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
Expand DownExpand Up@@ -3458,9 +3437,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 false
	}

Expand DownExpand Up@@ -3871,7 +3847,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 their_revocation_point: self.their_cur_commitment_point.unwrap()
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();
 self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
 Ok((res, monitor_update))
	}
Expand DownExpand Up@@ -4242,8 +4217,6 @@ impl<ChanSigner: ChannelKeys + Writeable> Writeable for Channel<ChanSigner> {
 self.their_shutdown_scriptpubkey.write(writer)?;

 self.commitment_secrets.write(writer)?;

 self.channel_monitor.as_ref().unwrap().write_for_disk(writer)?;
 Ok(())
	}
}
Expand DownExpand Up@@ -4398,13 +4371,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {
 let their_shutdown_scriptpubkey = Readable::read(reader)?;
 let commitment_secrets = Readable::read(reader)?;

 let (monitor_last_block, channel_monitor) = Readable::read(reader)?;
 // We drop the ChannelMonitor's last block connected hash cause we don't actually bother
 // doing full block connection operations on the internal ChannelMonitor copies
 if monitor_last_block != last_block_connected {
 return Err(DecodeError::InvalidValue);
 }

 Ok(Channel {
 user_id,

Expand DownExpand Up@@ -4476,7 +4442,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: Some(channel_monitor),
 commitment_secrets,

 network_sync: UpdateStatus::Fresh,
Expand Down

95 changes: 49 additions & 46 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use bitcoin::secp256k1;
use chain::chaininterface::{BroadcasterInterface,ChainListener,FeeEstimator};
use chain::transaction::OutPoint;
use ln::channel::{Channel, ChannelError};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent};
use ln::features::{InitFeatures, NodeFeatures};
use routing::router::{Route, RouteHop};
use ln::msgs;
Expand DownExpand Up@@ -2966,6 +2966,48 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 Err(e) => { Err(APIError::APIMisuseError { err: e.err })}
 }
	}

	/// Process pending events from the ManyChannelMonitor.
	fn process_pending_monitor_events(&self) {
 let mut failed_channels = Vec::new();
 {
 for monitor_event in self.monitor.get_and_clear_pending_monitor_events() {
 match monitor_event {
 MonitorEvent::HTLCEvent(htlc_update) => {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 },
 MonitorEvent::CommitmentTxBroadcasted(funding_outpoint) => {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let by_id = &mut channel_state.by_id;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 if let Some(mut chan) = by_id.remove(&funding_outpoint.to_channel_id()) {
 if let Some(short_id) = chan.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 failed_channels.push(chan.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 }
 },
 }
 }
 }

 for failure in failed_channels.drain(..) {
 self.finish_force_close_channel(failure);
 }
	}
}

impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> events::MessageSendEventsProvider for ChannelManager<ChanSigner, M, T, K, F, L>
Expand All@@ -2976,21 +3018,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_msg_events(&self) -> Vec<events::MessageSendEvent> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut channel_state = self.channel_state.lock().unwrap();
Expand All@@ -3007,21 +3037,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut pending_events = self.pending_events.lock().unwrap();
Expand DownExpand Up@@ -3104,21 +3122,6 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 }
 }
 }
 if channel.is_funding_initiated() && channel.channel_monitor().would_broadcast_at_height(height, &self.logger) {
 if let Some(short_id) = channel.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 // If would_broadcast_at_height() is true, the channel_monitor will broadcast
 // the latest local tx for us, so we should skip that here (it doesn't really
 // hurt anything, but does make tests a bit simpler).
 failed_channels.push(channel.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&channel) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 return false;
 }
 true
 });

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
Remove Channel's ChannelMonitor copy#667

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 2 commits into

from

Aug 25, 2020
 Merged


Remove Channel's ChannelMonitor copy
#667
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ad18c4d

Add commitment transaction broadcast as a ChannelMonitor event


valentinewallace Aug 24, 2020
28d9036

Remove Channel's ChannelMonitor copy


valentinewallace Aug 13, 2020

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


6 changes: 3 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil,ChainWatchInterface};
use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, MonitorEvent};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
Expand DownExpand Up@@ -135,8 +135,8 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 self.update_ret.lock().unwrap().clone()
	}

	fn get_and_clear_pending_htlcs_updated(&self) -> Vec<HTLCUpdate> {
 return self.simple_monitor.get_and_clear_pending_htlcs_updated();
	fn get_and_clear_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 return self.simple_monitor.get_and_clear_pending_monitor_events();
	}
}

Expand Down

35 changes: 0 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -386,9 +386,6 @@ pub(super) struct Channel<ChanSigner: ChannelKeys> {

	their_shutdown_scriptpubkey: Option<Script>,

	/// Used exclusively to broadcast the latest local state, mostly a historical quirk that this
	/// is here:
	channel_monitor: Option<ChannelMonitor<ChanSigner>>,
	commitment_secrets: CounterpartyCommitmentSecrets,

	network_sync: UpdateStatus,
Expand DownExpand Up@@ -557,7 +554,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey: None,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -786,7 +782,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -1222,7 +1217,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 payment_preimage: payment_preimage_arg.clone(),
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
 for pending_update in self.holding_cell_htlc_updates.iter() {
Expand DownExpand Up@@ -1552,7 +1546,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 self.channel_state = ChannelState::FundingSent as u32;
Expand DownExpand Up@@ -1618,7 +1611,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 assert_eq!(self.channel_state & (ChannelState::MonitorUpdateFailed as u32), 0); // We have no had any monitor(s) yet to fail update!
Expand DownExpand Up@@ -2060,7 +2052,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 htlc_outputs: htlcs_and_sigs
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 for htlc in self.pending_inbound_htlcs.iter_mut() {
 let new_forward = if let &InboundHTLCState::RemoteAnnounced(ref forward_info) = &htlc.state {
Expand DownExpand Up@@ -2280,7 +2271,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 secret: msg.per_commitment_secret,
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 // Update state now that we've passed all the can-fail calls...
 // (note that we may still fail to generate the new commitment_signed message, but that's
Expand DownExpand Up@@ -3115,14 +3105,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.user_id
	}

	/// May only be called after funding has been initiated (ie is_funding_initiated() is true)
	pub fn channel_monitor(&mut self) -> &mut ChannelMonitor<ChanSigner> {
 if self.channel_state < ChannelState::FundingSent as u32 {
 panic!("Can't get a channel monitor until funding has been created");
 }
 self.channel_monitor.as_mut().unwrap()
	}

	/// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
	/// is_usable() returns true).
	/// Allowed in any state (including after shutdown)
Expand DownExpand Up@@ -3397,9 +3379,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
 let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
Expand DownExpand Up@@ -3458,9 +3437,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 false
	}

Expand DownExpand Up@@ -3871,7 +3847,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 their_revocation_point: self.their_cur_commitment_point.unwrap()
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();
 self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
 Ok((res, monitor_update))
	}
Expand DownExpand Up@@ -4242,8 +4217,6 @@ impl<ChanSigner: ChannelKeys + Writeable> Writeable for Channel<ChanSigner> {
 self.their_shutdown_scriptpubkey.write(writer)?;

 self.commitment_secrets.write(writer)?;

 self.channel_monitor.as_ref().unwrap().write_for_disk(writer)?;
 Ok(())
	}
}
Expand DownExpand Up@@ -4398,13 +4371,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {
 let their_shutdown_scriptpubkey = Readable::read(reader)?;
 let commitment_secrets = Readable::read(reader)?;

 let (monitor_last_block, channel_monitor) = Readable::read(reader)?;
 // We drop the ChannelMonitor's last block connected hash cause we don't actually bother
 // doing full block connection operations on the internal ChannelMonitor copies
 if monitor_last_block != last_block_connected {
 return Err(DecodeError::InvalidValue);
 }

 Ok(Channel {
 user_id,

Expand DownExpand Up@@ -4476,7 +4442,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: Some(channel_monitor),
 commitment_secrets,

 network_sync: UpdateStatus::Fresh,
Expand Down

95 changes: 49 additions & 46 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use bitcoin::secp256k1;
use chain::chaininterface::{BroadcasterInterface,ChainListener,FeeEstimator};
use chain::transaction::OutPoint;
use ln::channel::{Channel, ChannelError};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent};
use ln::features::{InitFeatures, NodeFeatures};
use routing::router::{Route, RouteHop};
use ln::msgs;
Expand DownExpand Up@@ -2966,6 +2966,48 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 Err(e) => { Err(APIError::APIMisuseError { err: e.err })}
 }
	}

	/// Process pending events from the ManyChannelMonitor.
	fn process_pending_monitor_events(&self) {
 let mut failed_channels = Vec::new();
 {
 for monitor_event in self.monitor.get_and_clear_pending_monitor_events() {
 match monitor_event {
 MonitorEvent::HTLCEvent(htlc_update) => {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 },
 MonitorEvent::CommitmentTxBroadcasted(funding_outpoint) => {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let by_id = &mut channel_state.by_id;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 if let Some(mut chan) = by_id.remove(&funding_outpoint.to_channel_id()) {
 if let Some(short_id) = chan.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 failed_channels.push(chan.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 }
 },
 }
 }
 }

 for failure in failed_channels.drain(..) {
 self.finish_force_close_channel(failure);
 }
	}
}

impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> events::MessageSendEventsProvider for ChannelManager<ChanSigner, M, T, K, F, L>
Expand All@@ -2976,21 +3018,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_msg_events(&self) -> Vec<events::MessageSendEvent> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut channel_state = self.channel_state.lock().unwrap();
Expand All@@ -3007,21 +3037,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut pending_events = self.pending_events.lock().unwrap();
Expand DownExpand Up@@ -3104,21 +3122,6 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 }
 }
 }
 if channel.is_funding_initiated() && channel.channel_monitor().would_broadcast_at_height(height, &self.logger) {
 if let Some(short_id) = channel.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 // If would_broadcast_at_height() is true, the channel_monitor will broadcast
 // the latest local tx for us, so we should skip that here (it doesn't really
 // hurt anything, but does make tests a bit simpler).
 failed_channels.push(channel.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&channel) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 return false;
 }
 true
 });

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
Remove Channel's ChannelMonitor copy#667

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 2 commits into

from

Aug 25, 2020
 Merged


Remove Channel's ChannelMonitor copy
#667
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ad18c4d

Add commitment transaction broadcast as a ChannelMonitor event


valentinewallace Aug 24, 2020
28d9036

Remove Channel's ChannelMonitor copy


valentinewallace Aug 13, 2020

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


6 changes: 3 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil,ChainWatchInterface};
use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, MonitorEvent};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
Expand DownExpand Up@@ -135,8 +135,8 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 self.update_ret.lock().unwrap().clone()
	}

	fn get_and_clear_pending_htlcs_updated(&self) -> Vec<HTLCUpdate> {
 return self.simple_monitor.get_and_clear_pending_htlcs_updated();
	fn get_and_clear_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 return self.simple_monitor.get_and_clear_pending_monitor_events();
	}
}

Expand Down

35 changes: 0 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -386,9 +386,6 @@ pub(super) struct Channel<ChanSigner: ChannelKeys> {

	their_shutdown_scriptpubkey: Option<Script>,

	/// Used exclusively to broadcast the latest local state, mostly a historical quirk that this
	/// is here:
	channel_monitor: Option<ChannelMonitor<ChanSigner>>,
	commitment_secrets: CounterpartyCommitmentSecrets,

	network_sync: UpdateStatus,
Expand DownExpand Up@@ -557,7 +554,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey: None,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -786,7 +782,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -1222,7 +1217,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 payment_preimage: payment_preimage_arg.clone(),
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
 for pending_update in self.holding_cell_htlc_updates.iter() {
Expand DownExpand Up@@ -1552,7 +1546,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 self.channel_state = ChannelState::FundingSent as u32;
Expand DownExpand Up@@ -1618,7 +1611,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 assert_eq!(self.channel_state & (ChannelState::MonitorUpdateFailed as u32), 0); // We have no had any monitor(s) yet to fail update!
Expand DownExpand Up@@ -2060,7 +2052,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 htlc_outputs: htlcs_and_sigs
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 for htlc in self.pending_inbound_htlcs.iter_mut() {
 let new_forward = if let &InboundHTLCState::RemoteAnnounced(ref forward_info) = &htlc.state {
Expand DownExpand Up@@ -2280,7 +2271,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 secret: msg.per_commitment_secret,
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 // Update state now that we've passed all the can-fail calls...
 // (note that we may still fail to generate the new commitment_signed message, but that's
Expand DownExpand Up@@ -3115,14 +3105,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.user_id
	}

	/// May only be called after funding has been initiated (ie is_funding_initiated() is true)
	pub fn channel_monitor(&mut self) -> &mut ChannelMonitor<ChanSigner> {
 if self.channel_state < ChannelState::FundingSent as u32 {
 panic!("Can't get a channel monitor until funding has been created");
 }
 self.channel_monitor.as_mut().unwrap()
	}

	/// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
	/// is_usable() returns true).
	/// Allowed in any state (including after shutdown)
Expand DownExpand Up@@ -3397,9 +3379,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
 let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
Expand DownExpand Up@@ -3458,9 +3437,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 false
	}

Expand DownExpand Up@@ -3871,7 +3847,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 their_revocation_point: self.their_cur_commitment_point.unwrap()
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();
 self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
 Ok((res, monitor_update))
	}
Expand DownExpand Up@@ -4242,8 +4217,6 @@ impl<ChanSigner: ChannelKeys + Writeable> Writeable for Channel<ChanSigner> {
 self.their_shutdown_scriptpubkey.write(writer)?;

 self.commitment_secrets.write(writer)?;

 self.channel_monitor.as_ref().unwrap().write_for_disk(writer)?;
 Ok(())
	}
}
Expand DownExpand Up@@ -4398,13 +4371,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {
 let their_shutdown_scriptpubkey = Readable::read(reader)?;
 let commitment_secrets = Readable::read(reader)?;

 let (monitor_last_block, channel_monitor) = Readable::read(reader)?;
 // We drop the ChannelMonitor's last block connected hash cause we don't actually bother
 // doing full block connection operations on the internal ChannelMonitor copies
 if monitor_last_block != last_block_connected {
 return Err(DecodeError::InvalidValue);
 }

 Ok(Channel {
 user_id,

Expand DownExpand Up@@ -4476,7 +4442,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: Some(channel_monitor),
 commitment_secrets,

 network_sync: UpdateStatus::Fresh,
Expand Down

95 changes: 49 additions & 46 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use bitcoin::secp256k1;
use chain::chaininterface::{BroadcasterInterface,ChainListener,FeeEstimator};
use chain::transaction::OutPoint;
use ln::channel::{Channel, ChannelError};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent};
use ln::features::{InitFeatures, NodeFeatures};
use routing::router::{Route, RouteHop};
use ln::msgs;
Expand DownExpand Up@@ -2966,6 +2966,48 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 Err(e) => { Err(APIError::APIMisuseError { err: e.err })}
 }
	}

	/// Process pending events from the ManyChannelMonitor.
	fn process_pending_monitor_events(&self) {
 let mut failed_channels = Vec::new();
 {
 for monitor_event in self.monitor.get_and_clear_pending_monitor_events() {
 match monitor_event {
 MonitorEvent::HTLCEvent(htlc_update) => {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 },
 MonitorEvent::CommitmentTxBroadcasted(funding_outpoint) => {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let by_id = &mut channel_state.by_id;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 if let Some(mut chan) = by_id.remove(&funding_outpoint.to_channel_id()) {
 if let Some(short_id) = chan.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 failed_channels.push(chan.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 }
 },
 }
 }
 }

 for failure in failed_channels.drain(..) {
 self.finish_force_close_channel(failure);
 }
	}
}

impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> events::MessageSendEventsProvider for ChannelManager<ChanSigner, M, T, K, F, L>
Expand All@@ -2976,21 +3018,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_msg_events(&self) -> Vec<events::MessageSendEvent> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut channel_state = self.channel_state.lock().unwrap();
Expand All@@ -3007,21 +3037,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut pending_events = self.pending_events.lock().unwrap();
Expand DownExpand Up@@ -3104,21 +3122,6 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 }
 }
 }
 if channel.is_funding_initiated() && channel.channel_monitor().would_broadcast_at_height(height, &self.logger) {
 if let Some(short_id) = channel.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 // If would_broadcast_at_height() is true, the channel_monitor will broadcast
 // the latest local tx for us, so we should skip that here (it doesn't really
 // hurt anything, but does make tests a bit simpler).
 failed_channels.push(channel.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&channel) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 return false;
 }
 true
 });

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
Remove Channel's ChannelMonitor copy#667

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 2 commits into

from

Aug 25, 2020
 Merged


Remove Channel's ChannelMonitor copy
#667
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ad18c4d

Add commitment transaction broadcast as a ChannelMonitor event


valentinewallace Aug 24, 2020
28d9036

Remove Channel's ChannelMonitor copy


valentinewallace Aug 13, 2020

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


6 changes: 3 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil,ChainWatchInterface};
use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, MonitorEvent};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
Expand DownExpand Up@@ -135,8 +135,8 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 self.update_ret.lock().unwrap().clone()
	}

	fn get_and_clear_pending_htlcs_updated(&self) -> Vec<HTLCUpdate> {
 return self.simple_monitor.get_and_clear_pending_htlcs_updated();
	fn get_and_clear_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 return self.simple_monitor.get_and_clear_pending_monitor_events();
	}
}

Expand Down

35 changes: 0 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -386,9 +386,6 @@ pub(super) struct Channel<ChanSigner: ChannelKeys> {

	their_shutdown_scriptpubkey: Option<Script>,

	/// Used exclusively to broadcast the latest local state, mostly a historical quirk that this
	/// is here:
	channel_monitor: Option<ChannelMonitor<ChanSigner>>,
	commitment_secrets: CounterpartyCommitmentSecrets,

	network_sync: UpdateStatus,
Expand DownExpand Up@@ -557,7 +554,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey: None,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -786,7 +782,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -1222,7 +1217,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 payment_preimage: payment_preimage_arg.clone(),
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
 for pending_update in self.holding_cell_htlc_updates.iter() {
Expand DownExpand Up@@ -1552,7 +1546,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 self.channel_state = ChannelState::FundingSent as u32;
Expand DownExpand Up@@ -1618,7 +1611,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 assert_eq!(self.channel_state & (ChannelState::MonitorUpdateFailed as u32), 0); // We have no had any monitor(s) yet to fail update!
Expand DownExpand Up@@ -2060,7 +2052,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 htlc_outputs: htlcs_and_sigs
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 for htlc in self.pending_inbound_htlcs.iter_mut() {
 let new_forward = if let &InboundHTLCState::RemoteAnnounced(ref forward_info) = &htlc.state {
Expand DownExpand Up@@ -2280,7 +2271,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 secret: msg.per_commitment_secret,
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 // Update state now that we've passed all the can-fail calls...
 // (note that we may still fail to generate the new commitment_signed message, but that's
Expand DownExpand Up@@ -3115,14 +3105,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.user_id
	}

	/// May only be called after funding has been initiated (ie is_funding_initiated() is true)
	pub fn channel_monitor(&mut self) -> &mut ChannelMonitor<ChanSigner> {
 if self.channel_state < ChannelState::FundingSent as u32 {
 panic!("Can't get a channel monitor until funding has been created");
 }
 self.channel_monitor.as_mut().unwrap()
	}

	/// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
	/// is_usable() returns true).
	/// Allowed in any state (including after shutdown)
Expand DownExpand Up@@ -3397,9 +3379,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
 let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
Expand DownExpand Up@@ -3458,9 +3437,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 false
	}

Expand DownExpand Up@@ -3871,7 +3847,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 their_revocation_point: self.their_cur_commitment_point.unwrap()
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();
 self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
 Ok((res, monitor_update))
	}
Expand DownExpand Up@@ -4242,8 +4217,6 @@ impl<ChanSigner: ChannelKeys + Writeable> Writeable for Channel<ChanSigner> {
 self.their_shutdown_scriptpubkey.write(writer)?;

 self.commitment_secrets.write(writer)?;

 self.channel_monitor.as_ref().unwrap().write_for_disk(writer)?;
 Ok(())
	}
}
Expand DownExpand Up@@ -4398,13 +4371,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {
 let their_shutdown_scriptpubkey = Readable::read(reader)?;
 let commitment_secrets = Readable::read(reader)?;

 let (monitor_last_block, channel_monitor) = Readable::read(reader)?;
 // We drop the ChannelMonitor's last block connected hash cause we don't actually bother
 // doing full block connection operations on the internal ChannelMonitor copies
 if monitor_last_block != last_block_connected {
 return Err(DecodeError::InvalidValue);
 }

 Ok(Channel {
 user_id,

Expand DownExpand Up@@ -4476,7 +4442,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: Some(channel_monitor),
 commitment_secrets,

 network_sync: UpdateStatus::Fresh,
Expand Down

95 changes: 49 additions & 46 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use bitcoin::secp256k1;
use chain::chaininterface::{BroadcasterInterface,ChainListener,FeeEstimator};
use chain::transaction::OutPoint;
use ln::channel::{Channel, ChannelError};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent};
use ln::features::{InitFeatures, NodeFeatures};
use routing::router::{Route, RouteHop};
use ln::msgs;
Expand DownExpand Up@@ -2966,6 +2966,48 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 Err(e) => { Err(APIError::APIMisuseError { err: e.err })}
 }
	}

	/// Process pending events from the ManyChannelMonitor.
	fn process_pending_monitor_events(&self) {
 let mut failed_channels = Vec::new();
 {
 for monitor_event in self.monitor.get_and_clear_pending_monitor_events() {
 match monitor_event {
 MonitorEvent::HTLCEvent(htlc_update) => {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 },
 MonitorEvent::CommitmentTxBroadcasted(funding_outpoint) => {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let by_id = &mut channel_state.by_id;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 if let Some(mut chan) = by_id.remove(&funding_outpoint.to_channel_id()) {
 if let Some(short_id) = chan.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 failed_channels.push(chan.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 }
 },
 }
 }
 }

 for failure in failed_channels.drain(..) {
 self.finish_force_close_channel(failure);
 }
	}
}

impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> events::MessageSendEventsProvider for ChannelManager<ChanSigner, M, T, K, F, L>
Expand All@@ -2976,21 +3018,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_msg_events(&self) -> Vec<events::MessageSendEvent> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut channel_state = self.channel_state.lock().unwrap();
Expand All@@ -3007,21 +3037,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut pending_events = self.pending_events.lock().unwrap();
Expand DownExpand Up@@ -3104,21 +3122,6 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 }
 }
 }
 if channel.is_funding_initiated() && channel.channel_monitor().would_broadcast_at_height(height, &self.logger) {
 if let Some(short_id) = channel.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 // If would_broadcast_at_height() is true, the channel_monitor will broadcast
 // the latest local tx for us, so we should skip that here (it doesn't really
 // hurt anything, but does make tests a bit simpler).
 failed_channels.push(channel.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&channel) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 return false;
 }
 true
 });

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
Remove Channel's ChannelMonitor copy#667

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 2 commits into

from

Aug 25, 2020
 Merged


Remove Channel's ChannelMonitor copy
#667
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ad18c4d

Add commitment transaction broadcast as a ChannelMonitor event


valentinewallace Aug 24, 2020
28d9036

Remove Channel's ChannelMonitor copy


valentinewallace Aug 13, 2020

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


6 changes: 3 additions & 3 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil,ChainWatchInterface};
use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, MonitorEvent};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
Expand DownExpand Up@@ -135,8 +135,8 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 self.update_ret.lock().unwrap().clone()
	}

	fn get_and_clear_pending_htlcs_updated(&self) -> Vec<HTLCUpdate> {
 return self.simple_monitor.get_and_clear_pending_htlcs_updated();
	fn get_and_clear_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 return self.simple_monitor.get_and_clear_pending_monitor_events();
	}
}

Expand Down

35 changes: 0 additions & 35 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -386,9 +386,6 @@ pub(super) struct Channel<ChanSigner: ChannelKeys> {

	their_shutdown_scriptpubkey: Option<Script>,

	/// Used exclusively to broadcast the latest local state, mostly a historical quirk that this
	/// is here:
	channel_monitor: Option<ChannelMonitor<ChanSigner>>,
	commitment_secrets: CounterpartyCommitmentSecrets,

	network_sync: UpdateStatus,
Expand DownExpand Up@@ -557,7 +554,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey: None,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -786,7 +782,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: None,
 commitment_secrets: CounterpartyCommitmentSecrets::new(),

 network_sync: UpdateStatus::Fresh,
Expand DownExpand Up@@ -1222,7 +1217,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 payment_preimage: payment_preimage_arg.clone(),
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
 for pending_update in self.holding_cell_htlc_updates.iter() {
Expand DownExpand Up@@ -1552,7 +1546,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 self.channel_state = ChannelState::FundingSent as u32;
Expand DownExpand Up@@ -1618,7 +1611,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 } }
 }

 self.channel_monitor = Some(create_monitor!());
 let channel_monitor = create_monitor!();

 assert_eq!(self.channel_state & (ChannelState::MonitorUpdateFailed as u32), 0); // We have no had any monitor(s) yet to fail update!
Expand DownExpand Up@@ -2060,7 +2052,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 htlc_outputs: htlcs_and_sigs
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 for htlc in self.pending_inbound_htlcs.iter_mut() {
 let new_forward = if let &InboundHTLCState::RemoteAnnounced(ref forward_info) = &htlc.state {
Expand DownExpand Up@@ -2280,7 +2271,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 secret: msg.per_commitment_secret,
 }],
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();

 // Update state now that we've passed all the can-fail calls...
 // (note that we may still fail to generate the new commitment_signed message, but that's
Expand DownExpand Up@@ -3115,14 +3105,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.user_id
	}

	/// May only be called after funding has been initiated (ie is_funding_initiated() is true)
	pub fn channel_monitor(&mut self) -> &mut ChannelMonitor<ChanSigner> {
 if self.channel_state < ChannelState::FundingSent as u32 {
 panic!("Can't get a channel monitor until funding has been created");
 }
 self.channel_monitor.as_mut().unwrap()
	}

	/// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
	/// is_usable() returns true).
	/// Allowed in any state (including after shutdown)
Expand DownExpand Up@@ -3397,9 +3379,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
 let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
Expand DownExpand Up@@ -3458,9 +3437,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 if let Some(channel_monitor) = self.channel_monitor.as_mut() {
 channel_monitor.last_block_hash = self.last_block_connected;
 }
 false
	}

Expand DownExpand Up@@ -3871,7 +3847,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 their_revocation_point: self.their_cur_commitment_point.unwrap()
 }]
 };
 self.channel_monitor.as_mut().unwrap().update_monitor_ooo(monitor_update.clone(), logger).unwrap();
 self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
 Ok((res, monitor_update))
	}
Expand DownExpand Up@@ -4242,8 +4217,6 @@ impl<ChanSigner: ChannelKeys + Writeable> Writeable for Channel<ChanSigner> {
 self.their_shutdown_scriptpubkey.write(writer)?;

 self.commitment_secrets.write(writer)?;

 self.channel_monitor.as_ref().unwrap().write_for_disk(writer)?;
 Ok(())
	}
}
Expand DownExpand Up@@ -4398,13 +4371,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {
 let their_shutdown_scriptpubkey = Readable::read(reader)?;
 let commitment_secrets = Readable::read(reader)?;

 let (monitor_last_block, channel_monitor) = Readable::read(reader)?;
 // We drop the ChannelMonitor's last block connected hash cause we don't actually bother
 // doing full block connection operations on the internal ChannelMonitor copies
 if monitor_last_block != last_block_connected {
 return Err(DecodeError::InvalidValue);
 }

 Ok(Channel {
 user_id,

Expand DownExpand Up@@ -4476,7 +4442,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

 their_shutdown_scriptpubkey,

 channel_monitor: Some(channel_monitor),
 commitment_secrets,

 network_sync: UpdateStatus::Fresh,
Expand Down

95 changes: 49 additions & 46 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use bitcoin::secp256k1;
use chain::chaininterface::{BroadcasterInterface,ChainListener,FeeEstimator};
use chain::transaction::OutPoint;
use ln::channel::{Channel, ChannelError};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent};
use ln::features::{InitFeatures, NodeFeatures};
use routing::router::{Route, RouteHop};
use ln::msgs;
Expand DownExpand Up@@ -2966,6 +2966,48 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 Err(e) => { Err(APIError::APIMisuseError { err: e.err })}
 }
	}

	/// Process pending events from the ManyChannelMonitor.
	fn process_pending_monitor_events(&self) {
 let mut failed_channels = Vec::new();
 {
 for monitor_event in self.monitor.get_and_clear_pending_monitor_events() {
 match monitor_event {
 MonitorEvent::HTLCEvent(htlc_update) => {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 },
 MonitorEvent::CommitmentTxBroadcasted(funding_outpoint) => {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let by_id = &mut channel_state.by_id;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 if let Some(mut chan) = by_id.remove(&funding_outpoint.to_channel_id()) {
 if let Some(short_id) = chan.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 failed_channels.push(chan.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 }
 },
 }
 }
 }

 for failure in failed_channels.drain(..) {
 self.finish_force_close_channel(failure);
 }
	}
}

impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> events::MessageSendEventsProvider for ChannelManager<ChanSigner, M, T, K, F, L>
Expand All@@ -2976,21 +3018,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_msg_events(&self) -> Vec<events::MessageSendEvent> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut channel_state = self.channel_state.lock().unwrap();
Expand All@@ -3007,21 +3037,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 L::Target: Logger,
{
	fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
 // TODO: Event release to users and serialization is currently race-y: it's very easy for a
 // user to serialize a ChannelManager with pending events in it and lose those events on
 // restart. This is doubly true for the fail/fulfill-backs from monitor events!
 {
 //TODO: This behavior should be documented.
 for htlc_update in self.monitor.get_and_clear_pending_htlcs_updated() {
 if let Some(preimage) = htlc_update.payment_preimage {
 log_trace!(self.logger, "Claiming HTLC with preimage {} from our monitor", log_bytes!(preimage.0));
 self.claim_funds_internal(self.channel_state.lock().unwrap(), htlc_update.source, preimage);
 } else {
 log_trace!(self.logger, "Failing HTLC with hash {} from our monitor", log_bytes!(htlc_update.payment_hash.0));
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_update.source, &htlc_update.payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 8, data: Vec::new() });
 }
 }
 }
 //TODO: This behavior should be documented. It's non-intuitive that we query
 // ChannelMonitors when clearing other events.
 self.process_pending_monitor_events();

 let mut ret = Vec::new();
 let mut pending_events = self.pending_events.lock().unwrap();
Expand DownExpand Up@@ -3104,21 +3122,6 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 }
 }
 }
 if channel.is_funding_initiated() && channel.channel_monitor().would_broadcast_at_height(height, &self.logger) {
 if let Some(short_id) = channel.get_short_channel_id() {
 short_to_id.remove(&short_id);
 }
 // If would_broadcast_at_height() is true, the channel_monitor will broadcast
 // the latest local tx for us, so we should skip that here (it doesn't really
 // hurt anything, but does make tests a bit simpler).
 failed_channels.push(channel.force_shutdown(false));
 if let Ok(update) = self.get_channel_update(&channel) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 return false;
 }
 true
 });

Expand Down
Loading