Skip to content

Free holding cell on monitor-updating-restored when there's no upd#755

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

Closed
TheBlueMatt wants to merge 1 commit into from
+68 −33
Closed

Free holding cell on monitor-updating-restored when there's no upd #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 22 additions & 5 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2605,7 +2605,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
/// Indicates that the latest ChannelMonitor update has been committed by the client
/// successfully and we should restore normal operation. Returns messages which should be sent
/// to the remote side.
pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, bool, Option<msgs::FundingLocked>) where L::Target: Logger {
pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (
Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Option<ChannelMonitorUpdate>,
Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, Vec<(HTLCSource, PaymentHash)>,
bool, Option<msgs::FundingLocked>) where L::Target: Logger {
assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, ChannelState::MonitorUpdateFailed as u32);
self.channel_state &= !(ChannelState::MonitorUpdateFailed as u32);

Expand DownExpand Up@@ -2635,25 +2638,39 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
if self.channel_state & (ChannelState::PeerDisconnected as u32) != 0 {
self.monitor_pending_revoke_and_ack = false;
self.monitor_pending_commitment_signed = false;
return (None, None, RAACommitmentOrder::RevokeAndACKFirst, forwards, failures, needs_broadcast_safe, funding_locked);
return (None, None, RAACommitmentOrder::RevokeAndACKFirst, None, forwards, failures, Vec::new(), needs_broadcast_safe, funding_locked);
}

let raa = if self.monitor_pending_revoke_and_ack {
Some(self.get_last_revoke_and_ack())
} else { None };
let commitment_update = if self.monitor_pending_commitment_signed {
let mut commitment_update = if self.monitor_pending_commitment_signed {
Some(self.get_last_commitment_update(logger))
} else { None };

let mut order = self.resend_order.clone();
self.monitor_pending_revoke_and_ack = false;
self.monitor_pending_commitment_signed = false;
let order = self.resend_order.clone();

let mut htlcs_failed_to_forward = Vec::new();
let mut chanmon_update = None;
if commitment_update.is_none() && self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32) == 0 {
order = RAACommitmentOrder::RevokeAndACKFirst;

let (update_opt, mut failed_htlcs) = self.free_holding_cell_htlcs(logger).unwrap();
htlcs_failed_to_forward.append(&mut failed_htlcs);
if let Some((com_update, mon_update)) = update_opt {
commitment_update = Some(com_update);
chanmon_update = Some(mon_update);
}
}

log_trace!(logger, "Restored monitor updating resulting in {}{} commitment update and {} RAA, with {} first",
if needs_broadcast_safe { "a funding broadcast safe, " } else { "" },
if commitment_update.is_some() { "a" } else { "no" },
if raa.is_some() { "an" } else { "no" },
match order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
(raa, commitment_update, order, forwards, failures, needs_broadcast_safe, funding_locked)
(raa, commitment_update, order, chanmon_update, forwards, failures, htlcs_failed_to_forward, needs_broadcast_safe, funding_locked)
}

pub fn update_fee<F: Deref>(&mut self, fee_estimator: &F, msg: &msgs::UpdateFee) -> Result<(), ChannelError>
Expand Down
74 changes: 46 additions & 28 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2198,6 +2198,10 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
/// ChannelMonitorUpdateErr::TemporaryFailures is fine. The highest_applied_update_id field
/// exists largely only to prevent races between this and concurrent update_monitor calls.
///
/// XXX: Update to note re-entrancy - this is really terrible - the reentrancy only happens in
/// a really rare case making it incredibly likely users will miss it and never hit it in
/// testing.
///
/// Thus, the anticipated use is, at a high level:
/// 1) You register a chain::Watch with this ChannelManager,
/// 2) it stores each update to disk, and begins updating any remote (eg watchtower) copies of
Expand All@@ -2209,42 +2213,53 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
pub fn channel_monitor_updated(&self, funding_txo: &OutPoint, highest_applied_update_id: u64) {
let _consistency_lock = self.total_consistency_lock.read().unwrap();

let mut close_results = Vec::new();
let mut htlc_forwards = Vec::new();
let mut htlc_failures = Vec::new();
let mut pending_events = Vec::new();
let mut htlc_forwards = None;
let mut htlc_failures;
let htlc_forwarding_failures;
let mut pending_event = None;

{
let (counterparty_node_id, res) = loop {
let mut channel_lock = self.channel_state.lock().unwrap();
let channel_state = &mut *channel_lock;
let short_to_id = &mut channel_state.short_to_id;
let pending_msg_events = &mut channel_state.pending_msg_events;
let channel = match channel_state.by_id.get_mut(&funding_txo.to_channel_id()) {
Some(chan) => chan,
None => return,
let mut channel = match channel_state.by_id.entry(funding_txo.to_channel_id()) {
hash_map::Entry::Vacant(_) => return,
hash_map::Entry::Occupied(e) => e,
};
if !channel.is_awaiting_monitor_update() || channel.get_latest_monitor_update_id() != highest_applied_update_id {
if !channel.get().is_awaiting_monitor_update() || channel.get().get_latest_monitor_update_id() != highest_applied_update_id {
return;
}
let counterparty_node_id = channel.get().get_counterparty_node_id();

let (raa, commitment_update, order, pending_forwards, mut pending_failures, needs_broadcast_safe, funding_locked) = channel.monitor_updating_restored(&self.logger);
let (raa, commitment_update, order, chanmon_update, pending_forwards, pending_failures, forwarding_failds, needs_broadcast_safe, funding_locked) = channel.get_mut().monitor_updating_restored(&self.logger);
if !pending_forwards.is_empty() {
htlc_forwards.push((channel.get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
htlc_forwards = Some((channel.get().get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
}
htlc_failures.append(&mut pending_failures);
htlc_failures = pending_failures;
htlc_forwarding_failures = forwarding_failds;

macro_rules! handle_cs { () => {
if let Some(monitor_update) = chanmon_update {
assert!(order == RAACommitmentOrder::RevokeAndACKFirst);
assert!(!needs_broadcast_safe);
assert!(funding_locked.is_none());
assert!(commitment_update.is_some());
if let Err(e) = self.chain_monitor.update_channel(*funding_txo, monitor_update) {
break (counterparty_node_id,
handle_monitor_err!(self, e, channel_state, channel, RAACommitmentOrder::CommitmentFirst, false, true));
}
}
if let Some(update) = commitment_update {
pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
node_id: channel.get_counterparty_node_id(),
node_id: counterparty_node_id,
updates: update,
});
}
} }
macro_rules! handle_raa { () => {
if let Some(revoke_and_ack) = raa {
pending_msg_events.push(events::MessageSendEvent::SendRevokeAndACK {
node_id: channel.get_counterparty_node_id(),
node_id: counterparty_node_id,
msg: revoke_and_ack,
});
}
Expand All@@ -2260,35 +2275,38 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
},
}
if needs_broadcast_safe {
pending_events.push(events::Event::FundingBroadcastSafe {
funding_txo: channel.get_funding_txo().unwrap(),
user_channel_id: channel.get_user_id(),
pending_event = Some(events::Event::FundingBroadcastSafe {
funding_txo: channel.get().get_funding_txo().unwrap(),
user_channel_id: channel.get().get_user_id(),
});
}
if let Some(msg) = funding_locked {
pending_msg_events.push(events::MessageSendEvent::SendFundingLocked {
node_id: channel.get_counterparty_node_id(),
node_id: counterparty_node_id,
msg,
});
if let Some(announcement_sigs) = self.get_announcement_sigs(channel) {
if let Some(announcement_sigs) = self.get_announcement_sigs(channel.get()) {
pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
node_id: channel.get_counterparty_node_id(),
node_id: counterparty_node_id,
msg: announcement_sigs,
});
}
short_to_id.insert(channel.get_short_channel_id().unwrap(), channel.channel_id());
channel_state.short_to_id.insert(channel.get().get_short_channel_id().unwrap(), channel.get().channel_id());
}
}
break (counterparty_node_id, Ok(()));
};
let _ = handle_error!(self, res, counterparty_node_id);

self.pending_events.lock().unwrap().append(&mut pending_events);
if let Some(ev) = pending_event {
self.pending_events.lock().unwrap().push(ev);
}

self.fail_holding_cell_htlcs(htlc_forwarding_failures, funding_txo.to_channel_id());
for failure in htlc_failures.drain(..) {
self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
}
self.forward_htlcs(&mut htlc_forwards[..]);

for res in close_results.drain(..) {
self.finish_force_close_channel(res);
if let Some(forwards) = htlc_forwards {
self.forward_htlcs(&mut [forwards][..]);
}
}

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Free holding cell on monitor-updating-restored when there's no upd by TheBlueMatt · Pull Request #755 · lightningdevkit/rust-lightning · GitHub
Skip to content
Free holding cell on monitor-updating-restored when there's no upd#755

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

 Closed

TheBlueMatt
wants to merge
1
commit into

from


+68

−33

 Closed


Free holding cell on monitor-updating-restored when there's no upd
#755
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 22 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2605,7 +2605,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
	/// Indicates that the latest ChannelMonitor update has been committed by the client
	/// successfully and we should restore normal operation. Returns messages which should be sent
	/// to the remote side.
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, bool, Option<msgs::FundingLocked>) where L::Target: Logger {
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (
 Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Option<ChannelMonitorUpdate>,
 Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, Vec<(HTLCSource, PaymentHash)>,
 bool, Option<msgs::FundingLocked>) where L::Target: Logger {
 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, ChannelState::MonitorUpdateFailed as u32);
 self.channel_state &= !(ChannelState::MonitorUpdateFailed as u32);

Expand DownExpand Up@@ -2635,25 +2638,39 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if self.channel_state & (ChannelState::PeerDisconnected as u32) != 0 {
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, forwards, failures, needs_broadcast_safe, funding_locked);
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, None, forwards, failures, Vec::new(), needs_broadcast_safe, funding_locked);
 }

 let raa = if self.monitor_pending_revoke_and_ack {
 Some(self.get_last_revoke_and_ack())
 } else { None };
 let commitment_update = if self.monitor_pending_commitment_signed {
 let mut commitment_update = if self.monitor_pending_commitment_signed {
 Some(self.get_last_commitment_update(logger))
 } else { None };

 let mut order = self.resend_order.clone();
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 let order = self.resend_order.clone();

 let mut htlcs_failed_to_forward = Vec::new();
 let mut chanmon_update = None;
 if commitment_update.is_none() && self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32) == 0 {
 order = RAACommitmentOrder::RevokeAndACKFirst;

 let (update_opt, mut failed_htlcs) = self.free_holding_cell_htlcs(logger).unwrap();
 htlcs_failed_to_forward.append(&mut failed_htlcs);
 if let Some((com_update, mon_update)) = update_opt {
 commitment_update = Some(com_update);
 chanmon_update = Some(mon_update);
 }
 }

 log_trace!(logger, "Restored monitor updating resulting in {}{} commitment update and {} RAA, with {} first",
 if needs_broadcast_safe { "a funding broadcast safe, " } else { "" },
 if commitment_update.is_some() { "a" } else { "no" },
 if raa.is_some() { "an" } else { "no" },
 match order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
 (raa, commitment_update, order, forwards, failures, needs_broadcast_safe, funding_locked)
 (raa, commitment_update, order, chanmon_update, forwards, failures, htlcs_failed_to_forward, needs_broadcast_safe, funding_locked)
	}

	pub fn update_fee<F: Deref>(&mut self, fee_estimator: &F, msg: &msgs::UpdateFee) -> Result<(), ChannelError>
Expand Down

74 changes: 46 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2198,6 +2198,10 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	/// ChannelMonitorUpdateErr::TemporaryFailures is fine. The highest_applied_update_id field
	/// exists largely only to prevent races between this and concurrent update_monitor calls.
	///
	/// XXX: Update to note re-entrancy - this is really terrible - the reentrancy only happens in
	/// a really rare case making it incredibly likely users will miss it and never hit it in
	/// testing.
	///
	/// Thus, the anticipated use is, at a high level:
	/// 1) You register a chain::Watch with this ChannelManager,
	/// 2) it stores each update to disk, and begins updating any remote (eg watchtower) copies of
Expand All@@ -2209,42 +2213,53 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	pub fn channel_monitor_updated(&self, funding_txo: &OutPoint, highest_applied_update_id: u64) {
 let _consistency_lock = self.total_consistency_lock.read().unwrap();

 let mut close_results = Vec::new();
 let mut htlc_forwards = Vec::new();
 let mut htlc_failures = Vec::new();
 let mut pending_events = Vec::new();
 let mut htlc_forwards = None;
 let mut htlc_failures;
 let htlc_forwarding_failures;
 let mut pending_event = None;

 {
let (counterparty_node_id, res) = loop {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 let channel = match channel_state.by_id.get_mut(&funding_txo.to_channel_id()) {
Some(chan) => chan,
None => return,
 let mut channel = match channel_state.by_id.entry(funding_txo.to_channel_id()) {
hash_map::Entry::Vacant(_) => return,
hash_map::Entry::Occupied(e) => e,
 };
 if !channel.is_awaiting_monitor_update() || channel.get_latest_monitor_update_id() != highest_applied_update_id {
 if !channel.get().is_awaiting_monitor_update() || channel.get().get_latest_monitor_update_id() != highest_applied_update_id {
 return;
 }
 let counterparty_node_id = channel.get().get_counterparty_node_id();

 let (raa, commitment_update, order, pending_forwards, mut pending_failures, needs_broadcast_safe, funding_locked) = channel.monitor_updating_restored(&self.logger);
 let (raa, commitment_update, order, chanmon_update, pending_forwards, pending_failures, forwarding_failds, needs_broadcast_safe, funding_locked) = channel.get_mut().monitor_updating_restored(&self.logger);
 if !pending_forwards.is_empty() {
 htlc_forwards.push((channel.get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 htlc_forwards = Some((channel.get().get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 }
 htlc_failures.append(&mut pending_failures);
 htlc_failures = pending_failures;
 htlc_forwarding_failures = forwarding_failds;

 macro_rules! handle_cs { () => {
 if let Some(monitor_update) = chanmon_update {
 assert!(order == RAACommitmentOrder::RevokeAndACKFirst);
 assert!(!needs_broadcast_safe);
 assert!(funding_locked.is_none());
 assert!(commitment_update.is_some());
 if let Err(e) = self.chain_monitor.update_channel(*funding_txo, monitor_update) {
 break (counterparty_node_id,
 handle_monitor_err!(self, e, channel_state, channel, RAACommitmentOrder::CommitmentFirst, false, true));
 }
 }
 if let Some(update) = commitment_update {
 pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 updates: update,
 });
 }
 } }
 macro_rules! handle_raa { () => {
 if let Some(revoke_and_ack) = raa {
 pending_msg_events.push(events::MessageSendEvent::SendRevokeAndACK {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: revoke_and_ack,
 });
 }
Expand All@@ -2260,35 +2275,38 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 },
 }
 if needs_broadcast_safe {
pending_events.push(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get_funding_txo().unwrap(),
 user_channel_id: channel.get_user_id(),
pending_event = Some(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get().get_funding_txo().unwrap(),
 user_channel_id: channel.get().get_user_id(),
 });
 }
 if let Some(msg) = funding_locked {
 pending_msg_events.push(events::MessageSendEvent::SendFundingLocked {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg,
 });
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel) {
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel.get()) {
 pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: announcement_sigs,
 });
 }
 short_to_id.insert(channel.get_short_channel_id().unwrap(), channel.channel_id());
channel_state.short_to_id.insert(channel.get().get_short_channel_id().unwrap(), channel.get().channel_id());
 }
 }
 break (counterparty_node_id, Ok(()));
 };
 let _ = handle_error!(self, res, counterparty_node_id);

 self.pending_events.lock().unwrap().append(&mut pending_events);
 if let Some(ev) = pending_event {
 self.pending_events.lock().unwrap().push(ev);
 }

 self.fail_holding_cell_htlcs(htlc_forwarding_failures, funding_txo.to_channel_id());
 for failure in htlc_failures.drain(..) {
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
 }
 self.forward_htlcs(&mut htlc_forwards[..]);

 for res in close_results.drain(..) {
 self.finish_force_close_channel(res);
 if let Some(forwards) = htlc_forwards {
 self.forward_htlcs(&mut [forwards][..]);
 }
	}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Free holding cell on monitor-updating-restored when there's no upd by TheBlueMatt · Pull Request #755 · lightningdevkit/rust-lightning · GitHub
Skip to content
Free holding cell on monitor-updating-restored when there's no upd#755

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

 Closed

TheBlueMatt
wants to merge
1
commit into

from


+68

−33

 Closed


Free holding cell on monitor-updating-restored when there's no upd
#755
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 22 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2605,7 +2605,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
	/// Indicates that the latest ChannelMonitor update has been committed by the client
	/// successfully and we should restore normal operation. Returns messages which should be sent
	/// to the remote side.
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, bool, Option<msgs::FundingLocked>) where L::Target: Logger {
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (
 Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Option<ChannelMonitorUpdate>,
 Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, Vec<(HTLCSource, PaymentHash)>,
 bool, Option<msgs::FundingLocked>) where L::Target: Logger {
 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, ChannelState::MonitorUpdateFailed as u32);
 self.channel_state &= !(ChannelState::MonitorUpdateFailed as u32);

Expand DownExpand Up@@ -2635,25 +2638,39 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if self.channel_state & (ChannelState::PeerDisconnected as u32) != 0 {
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, forwards, failures, needs_broadcast_safe, funding_locked);
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, None, forwards, failures, Vec::new(), needs_broadcast_safe, funding_locked);
 }

 let raa = if self.monitor_pending_revoke_and_ack {
 Some(self.get_last_revoke_and_ack())
 } else { None };
 let commitment_update = if self.monitor_pending_commitment_signed {
 let mut commitment_update = if self.monitor_pending_commitment_signed {
 Some(self.get_last_commitment_update(logger))
 } else { None };

 let mut order = self.resend_order.clone();
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 let order = self.resend_order.clone();

 let mut htlcs_failed_to_forward = Vec::new();
 let mut chanmon_update = None;
 if commitment_update.is_none() && self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32) == 0 {
 order = RAACommitmentOrder::RevokeAndACKFirst;

 let (update_opt, mut failed_htlcs) = self.free_holding_cell_htlcs(logger).unwrap();
 htlcs_failed_to_forward.append(&mut failed_htlcs);
 if let Some((com_update, mon_update)) = update_opt {
 commitment_update = Some(com_update);
 chanmon_update = Some(mon_update);
 }
 }

 log_trace!(logger, "Restored monitor updating resulting in {}{} commitment update and {} RAA, with {} first",
 if needs_broadcast_safe { "a funding broadcast safe, " } else { "" },
 if commitment_update.is_some() { "a" } else { "no" },
 if raa.is_some() { "an" } else { "no" },
 match order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
 (raa, commitment_update, order, forwards, failures, needs_broadcast_safe, funding_locked)
 (raa, commitment_update, order, chanmon_update, forwards, failures, htlcs_failed_to_forward, needs_broadcast_safe, funding_locked)
	}

	pub fn update_fee<F: Deref>(&mut self, fee_estimator: &F, msg: &msgs::UpdateFee) -> Result<(), ChannelError>
Expand Down

74 changes: 46 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2198,6 +2198,10 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	/// ChannelMonitorUpdateErr::TemporaryFailures is fine. The highest_applied_update_id field
	/// exists largely only to prevent races between this and concurrent update_monitor calls.
	///
	/// XXX: Update to note re-entrancy - this is really terrible - the reentrancy only happens in
	/// a really rare case making it incredibly likely users will miss it and never hit it in
	/// testing.
	///
	/// Thus, the anticipated use is, at a high level:
	/// 1) You register a chain::Watch with this ChannelManager,
	/// 2) it stores each update to disk, and begins updating any remote (eg watchtower) copies of
Expand All@@ -2209,42 +2213,53 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	pub fn channel_monitor_updated(&self, funding_txo: &OutPoint, highest_applied_update_id: u64) {
 let _consistency_lock = self.total_consistency_lock.read().unwrap();

 let mut close_results = Vec::new();
 let mut htlc_forwards = Vec::new();
 let mut htlc_failures = Vec::new();
 let mut pending_events = Vec::new();
 let mut htlc_forwards = None;
 let mut htlc_failures;
 let htlc_forwarding_failures;
 let mut pending_event = None;

 {
let (counterparty_node_id, res) = loop {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 let channel = match channel_state.by_id.get_mut(&funding_txo.to_channel_id()) {
Some(chan) => chan,
None => return,
 let mut channel = match channel_state.by_id.entry(funding_txo.to_channel_id()) {
hash_map::Entry::Vacant(_) => return,
hash_map::Entry::Occupied(e) => e,
 };
 if !channel.is_awaiting_monitor_update() || channel.get_latest_monitor_update_id() != highest_applied_update_id {
 if !channel.get().is_awaiting_monitor_update() || channel.get().get_latest_monitor_update_id() != highest_applied_update_id {
 return;
 }
 let counterparty_node_id = channel.get().get_counterparty_node_id();

 let (raa, commitment_update, order, pending_forwards, mut pending_failures, needs_broadcast_safe, funding_locked) = channel.monitor_updating_restored(&self.logger);
 let (raa, commitment_update, order, chanmon_update, pending_forwards, pending_failures, forwarding_failds, needs_broadcast_safe, funding_locked) = channel.get_mut().monitor_updating_restored(&self.logger);
 if !pending_forwards.is_empty() {
 htlc_forwards.push((channel.get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 htlc_forwards = Some((channel.get().get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 }
 htlc_failures.append(&mut pending_failures);
 htlc_failures = pending_failures;
 htlc_forwarding_failures = forwarding_failds;

 macro_rules! handle_cs { () => {
 if let Some(monitor_update) = chanmon_update {
 assert!(order == RAACommitmentOrder::RevokeAndACKFirst);
 assert!(!needs_broadcast_safe);
 assert!(funding_locked.is_none());
 assert!(commitment_update.is_some());
 if let Err(e) = self.chain_monitor.update_channel(*funding_txo, monitor_update) {
 break (counterparty_node_id,
 handle_monitor_err!(self, e, channel_state, channel, RAACommitmentOrder::CommitmentFirst, false, true));
 }
 }
 if let Some(update) = commitment_update {
 pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 updates: update,
 });
 }
 } }
 macro_rules! handle_raa { () => {
 if let Some(revoke_and_ack) = raa {
 pending_msg_events.push(events::MessageSendEvent::SendRevokeAndACK {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: revoke_and_ack,
 });
 }
Expand All@@ -2260,35 +2275,38 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 },
 }
 if needs_broadcast_safe {
pending_events.push(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get_funding_txo().unwrap(),
 user_channel_id: channel.get_user_id(),
pending_event = Some(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get().get_funding_txo().unwrap(),
 user_channel_id: channel.get().get_user_id(),
 });
 }
 if let Some(msg) = funding_locked {
 pending_msg_events.push(events::MessageSendEvent::SendFundingLocked {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg,
 });
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel) {
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel.get()) {
 pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: announcement_sigs,
 });
 }
 short_to_id.insert(channel.get_short_channel_id().unwrap(), channel.channel_id());
channel_state.short_to_id.insert(channel.get().get_short_channel_id().unwrap(), channel.get().channel_id());
 }
 }
 break (counterparty_node_id, Ok(()));
 };
 let _ = handle_error!(self, res, counterparty_node_id);

 self.pending_events.lock().unwrap().append(&mut pending_events);
 if let Some(ev) = pending_event {
 self.pending_events.lock().unwrap().push(ev);
 }

 self.fail_holding_cell_htlcs(htlc_forwarding_failures, funding_txo.to_channel_id());
 for failure in htlc_failures.drain(..) {
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
 }
 self.forward_htlcs(&mut htlc_forwards[..]);

 for res in close_results.drain(..) {
 self.finish_force_close_channel(res);
 if let Some(forwards) = htlc_forwards {
 self.forward_htlcs(&mut [forwards][..]);
 }
	}

Expand Down

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

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

 Closed

TheBlueMatt
wants to merge
1
commit into

from


+68

−33

 Closed


Free holding cell on monitor-updating-restored when there's no upd
#755
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 22 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2605,7 +2605,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
	/// Indicates that the latest ChannelMonitor update has been committed by the client
	/// successfully and we should restore normal operation. Returns messages which should be sent
	/// to the remote side.
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, bool, Option<msgs::FundingLocked>) where L::Target: Logger {
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (
 Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Option<ChannelMonitorUpdate>,
 Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, Vec<(HTLCSource, PaymentHash)>,
 bool, Option<msgs::FundingLocked>) where L::Target: Logger {
 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, ChannelState::MonitorUpdateFailed as u32);
 self.channel_state &= !(ChannelState::MonitorUpdateFailed as u32);

Expand DownExpand Up@@ -2635,25 +2638,39 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if self.channel_state & (ChannelState::PeerDisconnected as u32) != 0 {
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, forwards, failures, needs_broadcast_safe, funding_locked);
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, None, forwards, failures, Vec::new(), needs_broadcast_safe, funding_locked);
 }

 let raa = if self.monitor_pending_revoke_and_ack {
 Some(self.get_last_revoke_and_ack())
 } else { None };
 let commitment_update = if self.monitor_pending_commitment_signed {
 let mut commitment_update = if self.monitor_pending_commitment_signed {
 Some(self.get_last_commitment_update(logger))
 } else { None };

 let mut order = self.resend_order.clone();
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 let order = self.resend_order.clone();

 let mut htlcs_failed_to_forward = Vec::new();
 let mut chanmon_update = None;
 if commitment_update.is_none() && self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32) == 0 {
 order = RAACommitmentOrder::RevokeAndACKFirst;

 let (update_opt, mut failed_htlcs) = self.free_holding_cell_htlcs(logger).unwrap();
 htlcs_failed_to_forward.append(&mut failed_htlcs);
 if let Some((com_update, mon_update)) = update_opt {
 commitment_update = Some(com_update);
 chanmon_update = Some(mon_update);
 }
 }

 log_trace!(logger, "Restored monitor updating resulting in {}{} commitment update and {} RAA, with {} first",
 if needs_broadcast_safe { "a funding broadcast safe, " } else { "" },
 if commitment_update.is_some() { "a" } else { "no" },
 if raa.is_some() { "an" } else { "no" },
 match order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
 (raa, commitment_update, order, forwards, failures, needs_broadcast_safe, funding_locked)
 (raa, commitment_update, order, chanmon_update, forwards, failures, htlcs_failed_to_forward, needs_broadcast_safe, funding_locked)
	}

	pub fn update_fee<F: Deref>(&mut self, fee_estimator: &F, msg: &msgs::UpdateFee) -> Result<(), ChannelError>
Expand Down

74 changes: 46 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2198,6 +2198,10 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	/// ChannelMonitorUpdateErr::TemporaryFailures is fine. The highest_applied_update_id field
	/// exists largely only to prevent races between this and concurrent update_monitor calls.
	///
	/// XXX: Update to note re-entrancy - this is really terrible - the reentrancy only happens in
	/// a really rare case making it incredibly likely users will miss it and never hit it in
	/// testing.
	///
	/// Thus, the anticipated use is, at a high level:
	/// 1) You register a chain::Watch with this ChannelManager,
	/// 2) it stores each update to disk, and begins updating any remote (eg watchtower) copies of
Expand All@@ -2209,42 +2213,53 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	pub fn channel_monitor_updated(&self, funding_txo: &OutPoint, highest_applied_update_id: u64) {
 let _consistency_lock = self.total_consistency_lock.read().unwrap();

 let mut close_results = Vec::new();
 let mut htlc_forwards = Vec::new();
 let mut htlc_failures = Vec::new();
 let mut pending_events = Vec::new();
 let mut htlc_forwards = None;
 let mut htlc_failures;
 let htlc_forwarding_failures;
 let mut pending_event = None;

 {
let (counterparty_node_id, res) = loop {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 let channel = match channel_state.by_id.get_mut(&funding_txo.to_channel_id()) {
Some(chan) => chan,
None => return,
 let mut channel = match channel_state.by_id.entry(funding_txo.to_channel_id()) {
hash_map::Entry::Vacant(_) => return,
hash_map::Entry::Occupied(e) => e,
 };
 if !channel.is_awaiting_monitor_update() || channel.get_latest_monitor_update_id() != highest_applied_update_id {
 if !channel.get().is_awaiting_monitor_update() || channel.get().get_latest_monitor_update_id() != highest_applied_update_id {
 return;
 }
 let counterparty_node_id = channel.get().get_counterparty_node_id();

 let (raa, commitment_update, order, pending_forwards, mut pending_failures, needs_broadcast_safe, funding_locked) = channel.monitor_updating_restored(&self.logger);
 let (raa, commitment_update, order, chanmon_update, pending_forwards, pending_failures, forwarding_failds, needs_broadcast_safe, funding_locked) = channel.get_mut().monitor_updating_restored(&self.logger);
 if !pending_forwards.is_empty() {
 htlc_forwards.push((channel.get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 htlc_forwards = Some((channel.get().get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 }
 htlc_failures.append(&mut pending_failures);
 htlc_failures = pending_failures;
 htlc_forwarding_failures = forwarding_failds;

 macro_rules! handle_cs { () => {
 if let Some(monitor_update) = chanmon_update {
 assert!(order == RAACommitmentOrder::RevokeAndACKFirst);
 assert!(!needs_broadcast_safe);
 assert!(funding_locked.is_none());
 assert!(commitment_update.is_some());
 if let Err(e) = self.chain_monitor.update_channel(*funding_txo, monitor_update) {
 break (counterparty_node_id,
 handle_monitor_err!(self, e, channel_state, channel, RAACommitmentOrder::CommitmentFirst, false, true));
 }
 }
 if let Some(update) = commitment_update {
 pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 updates: update,
 });
 }
 } }
 macro_rules! handle_raa { () => {
 if let Some(revoke_and_ack) = raa {
 pending_msg_events.push(events::MessageSendEvent::SendRevokeAndACK {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: revoke_and_ack,
 });
 }
Expand All@@ -2260,35 +2275,38 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 },
 }
 if needs_broadcast_safe {
pending_events.push(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get_funding_txo().unwrap(),
 user_channel_id: channel.get_user_id(),
pending_event = Some(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get().get_funding_txo().unwrap(),
 user_channel_id: channel.get().get_user_id(),
 });
 }
 if let Some(msg) = funding_locked {
 pending_msg_events.push(events::MessageSendEvent::SendFundingLocked {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg,
 });
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel) {
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel.get()) {
 pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: announcement_sigs,
 });
 }
 short_to_id.insert(channel.get_short_channel_id().unwrap(), channel.channel_id());
channel_state.short_to_id.insert(channel.get().get_short_channel_id().unwrap(), channel.get().channel_id());
 }
 }
 break (counterparty_node_id, Ok(()));
 };
 let _ = handle_error!(self, res, counterparty_node_id);

 self.pending_events.lock().unwrap().append(&mut pending_events);
 if let Some(ev) = pending_event {
 self.pending_events.lock().unwrap().push(ev);
 }

 self.fail_holding_cell_htlcs(htlc_forwarding_failures, funding_txo.to_channel_id());
 for failure in htlc_failures.drain(..) {
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
 }
 self.forward_htlcs(&mut htlc_forwards[..]);

 for res in close_results.drain(..) {
 self.finish_force_close_channel(res);
 if let Some(forwards) = htlc_forwards {
 self.forward_htlcs(&mut [forwards][..]);
 }
	}

Expand Down

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

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

 Closed

TheBlueMatt
wants to merge
1
commit into

from


+68

−33

 Closed


Free holding cell on monitor-updating-restored when there's no upd
#755
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 22 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2605,7 +2605,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
	/// Indicates that the latest ChannelMonitor update has been committed by the client
	/// successfully and we should restore normal operation. Returns messages which should be sent
	/// to the remote side.
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, bool, Option<msgs::FundingLocked>) where L::Target: Logger {
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (
 Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Option<ChannelMonitorUpdate>,
 Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, Vec<(HTLCSource, PaymentHash)>,
 bool, Option<msgs::FundingLocked>) where L::Target: Logger {
 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, ChannelState::MonitorUpdateFailed as u32);
 self.channel_state &= !(ChannelState::MonitorUpdateFailed as u32);

Expand DownExpand Up@@ -2635,25 +2638,39 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if self.channel_state & (ChannelState::PeerDisconnected as u32) != 0 {
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, forwards, failures, needs_broadcast_safe, funding_locked);
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, None, forwards, failures, Vec::new(), needs_broadcast_safe, funding_locked);
 }

 let raa = if self.monitor_pending_revoke_and_ack {
 Some(self.get_last_revoke_and_ack())
 } else { None };
 let commitment_update = if self.monitor_pending_commitment_signed {
 let mut commitment_update = if self.monitor_pending_commitment_signed {
 Some(self.get_last_commitment_update(logger))
 } else { None };

 let mut order = self.resend_order.clone();
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 let order = self.resend_order.clone();

 let mut htlcs_failed_to_forward = Vec::new();
 let mut chanmon_update = None;
 if commitment_update.is_none() && self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32) == 0 {
 order = RAACommitmentOrder::RevokeAndACKFirst;

 let (update_opt, mut failed_htlcs) = self.free_holding_cell_htlcs(logger).unwrap();
 htlcs_failed_to_forward.append(&mut failed_htlcs);
 if let Some((com_update, mon_update)) = update_opt {
 commitment_update = Some(com_update);
 chanmon_update = Some(mon_update);
 }
 }

 log_trace!(logger, "Restored monitor updating resulting in {}{} commitment update and {} RAA, with {} first",
 if needs_broadcast_safe { "a funding broadcast safe, " } else { "" },
 if commitment_update.is_some() { "a" } else { "no" },
 if raa.is_some() { "an" } else { "no" },
 match order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
 (raa, commitment_update, order, forwards, failures, needs_broadcast_safe, funding_locked)
 (raa, commitment_update, order, chanmon_update, forwards, failures, htlcs_failed_to_forward, needs_broadcast_safe, funding_locked)
	}

	pub fn update_fee<F: Deref>(&mut self, fee_estimator: &F, msg: &msgs::UpdateFee) -> Result<(), ChannelError>
Expand Down

74 changes: 46 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2198,6 +2198,10 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	/// ChannelMonitorUpdateErr::TemporaryFailures is fine. The highest_applied_update_id field
	/// exists largely only to prevent races between this and concurrent update_monitor calls.
	///
	/// XXX: Update to note re-entrancy - this is really terrible - the reentrancy only happens in
	/// a really rare case making it incredibly likely users will miss it and never hit it in
	/// testing.
	///
	/// Thus, the anticipated use is, at a high level:
	/// 1) You register a chain::Watch with this ChannelManager,
	/// 2) it stores each update to disk, and begins updating any remote (eg watchtower) copies of
Expand All@@ -2209,42 +2213,53 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	pub fn channel_monitor_updated(&self, funding_txo: &OutPoint, highest_applied_update_id: u64) {
 let _consistency_lock = self.total_consistency_lock.read().unwrap();

 let mut close_results = Vec::new();
 let mut htlc_forwards = Vec::new();
 let mut htlc_failures = Vec::new();
 let mut pending_events = Vec::new();
 let mut htlc_forwards = None;
 let mut htlc_failures;
 let htlc_forwarding_failures;
 let mut pending_event = None;

 {
let (counterparty_node_id, res) = loop {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 let channel = match channel_state.by_id.get_mut(&funding_txo.to_channel_id()) {
Some(chan) => chan,
None => return,
 let mut channel = match channel_state.by_id.entry(funding_txo.to_channel_id()) {
hash_map::Entry::Vacant(_) => return,
hash_map::Entry::Occupied(e) => e,
 };
 if !channel.is_awaiting_monitor_update() || channel.get_latest_monitor_update_id() != highest_applied_update_id {
 if !channel.get().is_awaiting_monitor_update() || channel.get().get_latest_monitor_update_id() != highest_applied_update_id {
 return;
 }
 let counterparty_node_id = channel.get().get_counterparty_node_id();

 let (raa, commitment_update, order, pending_forwards, mut pending_failures, needs_broadcast_safe, funding_locked) = channel.monitor_updating_restored(&self.logger);
 let (raa, commitment_update, order, chanmon_update, pending_forwards, pending_failures, forwarding_failds, needs_broadcast_safe, funding_locked) = channel.get_mut().monitor_updating_restored(&self.logger);
 if !pending_forwards.is_empty() {
 htlc_forwards.push((channel.get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 htlc_forwards = Some((channel.get().get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 }
 htlc_failures.append(&mut pending_failures);
 htlc_failures = pending_failures;
 htlc_forwarding_failures = forwarding_failds;

 macro_rules! handle_cs { () => {
 if let Some(monitor_update) = chanmon_update {
 assert!(order == RAACommitmentOrder::RevokeAndACKFirst);
 assert!(!needs_broadcast_safe);
 assert!(funding_locked.is_none());
 assert!(commitment_update.is_some());
 if let Err(e) = self.chain_monitor.update_channel(*funding_txo, monitor_update) {
 break (counterparty_node_id,
 handle_monitor_err!(self, e, channel_state, channel, RAACommitmentOrder::CommitmentFirst, false, true));
 }
 }
 if let Some(update) = commitment_update {
 pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 updates: update,
 });
 }
 } }
 macro_rules! handle_raa { () => {
 if let Some(revoke_and_ack) = raa {
 pending_msg_events.push(events::MessageSendEvent::SendRevokeAndACK {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: revoke_and_ack,
 });
 }
Expand All@@ -2260,35 +2275,38 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 },
 }
 if needs_broadcast_safe {
pending_events.push(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get_funding_txo().unwrap(),
 user_channel_id: channel.get_user_id(),
pending_event = Some(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get().get_funding_txo().unwrap(),
 user_channel_id: channel.get().get_user_id(),
 });
 }
 if let Some(msg) = funding_locked {
 pending_msg_events.push(events::MessageSendEvent::SendFundingLocked {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg,
 });
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel) {
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel.get()) {
 pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: announcement_sigs,
 });
 }
 short_to_id.insert(channel.get_short_channel_id().unwrap(), channel.channel_id());
channel_state.short_to_id.insert(channel.get().get_short_channel_id().unwrap(), channel.get().channel_id());
 }
 }
 break (counterparty_node_id, Ok(()));
 };
 let _ = handle_error!(self, res, counterparty_node_id);

 self.pending_events.lock().unwrap().append(&mut pending_events);
 if let Some(ev) = pending_event {
 self.pending_events.lock().unwrap().push(ev);
 }

 self.fail_holding_cell_htlcs(htlc_forwarding_failures, funding_txo.to_channel_id());
 for failure in htlc_failures.drain(..) {
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
 }
 self.forward_htlcs(&mut htlc_forwards[..]);

 for res in close_results.drain(..) {
 self.finish_force_close_channel(res);
 if let Some(forwards) = htlc_forwards {
 self.forward_htlcs(&mut [forwards][..]);
 }
	}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Free holding cell on monitor-updating-restored when there's no upd by TheBlueMatt · Pull Request #755 · lightningdevkit/rust-lightning · GitHub
Skip to content
Free holding cell on monitor-updating-restored when there's no upd#755

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

 Closed

TheBlueMatt
wants to merge
1
commit into

from


+68

−33

 Closed


Free holding cell on monitor-updating-restored when there's no upd
#755
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 22 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2605,7 +2605,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
	/// Indicates that the latest ChannelMonitor update has been committed by the client
	/// successfully and we should restore normal operation. Returns messages which should be sent
	/// to the remote side.
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, bool, Option<msgs::FundingLocked>) where L::Target: Logger {
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (
 Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Option<ChannelMonitorUpdate>,
 Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, Vec<(HTLCSource, PaymentHash)>,
 bool, Option<msgs::FundingLocked>) where L::Target: Logger {
 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, ChannelState::MonitorUpdateFailed as u32);
 self.channel_state &= !(ChannelState::MonitorUpdateFailed as u32);

Expand DownExpand Up@@ -2635,25 +2638,39 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if self.channel_state & (ChannelState::PeerDisconnected as u32) != 0 {
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, forwards, failures, needs_broadcast_safe, funding_locked);
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, None, forwards, failures, Vec::new(), needs_broadcast_safe, funding_locked);
 }

 let raa = if self.monitor_pending_revoke_and_ack {
 Some(self.get_last_revoke_and_ack())
 } else { None };
 let commitment_update = if self.monitor_pending_commitment_signed {
 let mut commitment_update = if self.monitor_pending_commitment_signed {
 Some(self.get_last_commitment_update(logger))
 } else { None };

 let mut order = self.resend_order.clone();
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 let order = self.resend_order.clone();

 let mut htlcs_failed_to_forward = Vec::new();
 let mut chanmon_update = None;
 if commitment_update.is_none() && self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32) == 0 {
 order = RAACommitmentOrder::RevokeAndACKFirst;

 let (update_opt, mut failed_htlcs) = self.free_holding_cell_htlcs(logger).unwrap();
 htlcs_failed_to_forward.append(&mut failed_htlcs);
 if let Some((com_update, mon_update)) = update_opt {
 commitment_update = Some(com_update);
 chanmon_update = Some(mon_update);
 }
 }

 log_trace!(logger, "Restored monitor updating resulting in {}{} commitment update and {} RAA, with {} first",
 if needs_broadcast_safe { "a funding broadcast safe, " } else { "" },
 if commitment_update.is_some() { "a" } else { "no" },
 if raa.is_some() { "an" } else { "no" },
 match order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
 (raa, commitment_update, order, forwards, failures, needs_broadcast_safe, funding_locked)
 (raa, commitment_update, order, chanmon_update, forwards, failures, htlcs_failed_to_forward, needs_broadcast_safe, funding_locked)
	}

	pub fn update_fee<F: Deref>(&mut self, fee_estimator: &F, msg: &msgs::UpdateFee) -> Result<(), ChannelError>
Expand Down

74 changes: 46 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2198,6 +2198,10 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	/// ChannelMonitorUpdateErr::TemporaryFailures is fine. The highest_applied_update_id field
	/// exists largely only to prevent races between this and concurrent update_monitor calls.
	///
	/// XXX: Update to note re-entrancy - this is really terrible - the reentrancy only happens in
	/// a really rare case making it incredibly likely users will miss it and never hit it in
	/// testing.
	///
	/// Thus, the anticipated use is, at a high level:
	/// 1) You register a chain::Watch with this ChannelManager,
	/// 2) it stores each update to disk, and begins updating any remote (eg watchtower) copies of
Expand All@@ -2209,42 +2213,53 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	pub fn channel_monitor_updated(&self, funding_txo: &OutPoint, highest_applied_update_id: u64) {
 let _consistency_lock = self.total_consistency_lock.read().unwrap();

 let mut close_results = Vec::new();
 let mut htlc_forwards = Vec::new();
 let mut htlc_failures = Vec::new();
 let mut pending_events = Vec::new();
 let mut htlc_forwards = None;
 let mut htlc_failures;
 let htlc_forwarding_failures;
 let mut pending_event = None;

 {
let (counterparty_node_id, res) = loop {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 let channel = match channel_state.by_id.get_mut(&funding_txo.to_channel_id()) {
Some(chan) => chan,
None => return,
 let mut channel = match channel_state.by_id.entry(funding_txo.to_channel_id()) {
hash_map::Entry::Vacant(_) => return,
hash_map::Entry::Occupied(e) => e,
 };
 if !channel.is_awaiting_monitor_update() || channel.get_latest_monitor_update_id() != highest_applied_update_id {
 if !channel.get().is_awaiting_monitor_update() || channel.get().get_latest_monitor_update_id() != highest_applied_update_id {
 return;
 }
 let counterparty_node_id = channel.get().get_counterparty_node_id();

 let (raa, commitment_update, order, pending_forwards, mut pending_failures, needs_broadcast_safe, funding_locked) = channel.monitor_updating_restored(&self.logger);
 let (raa, commitment_update, order, chanmon_update, pending_forwards, pending_failures, forwarding_failds, needs_broadcast_safe, funding_locked) = channel.get_mut().monitor_updating_restored(&self.logger);
 if !pending_forwards.is_empty() {
 htlc_forwards.push((channel.get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 htlc_forwards = Some((channel.get().get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 }
 htlc_failures.append(&mut pending_failures);
 htlc_failures = pending_failures;
 htlc_forwarding_failures = forwarding_failds;

 macro_rules! handle_cs { () => {
 if let Some(monitor_update) = chanmon_update {
 assert!(order == RAACommitmentOrder::RevokeAndACKFirst);
 assert!(!needs_broadcast_safe);
 assert!(funding_locked.is_none());
 assert!(commitment_update.is_some());
 if let Err(e) = self.chain_monitor.update_channel(*funding_txo, monitor_update) {
 break (counterparty_node_id,
 handle_monitor_err!(self, e, channel_state, channel, RAACommitmentOrder::CommitmentFirst, false, true));
 }
 }
 if let Some(update) = commitment_update {
 pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 updates: update,
 });
 }
 } }
 macro_rules! handle_raa { () => {
 if let Some(revoke_and_ack) = raa {
 pending_msg_events.push(events::MessageSendEvent::SendRevokeAndACK {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: revoke_and_ack,
 });
 }
Expand All@@ -2260,35 +2275,38 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 },
 }
 if needs_broadcast_safe {
pending_events.push(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get_funding_txo().unwrap(),
 user_channel_id: channel.get_user_id(),
pending_event = Some(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get().get_funding_txo().unwrap(),
 user_channel_id: channel.get().get_user_id(),
 });
 }
 if let Some(msg) = funding_locked {
 pending_msg_events.push(events::MessageSendEvent::SendFundingLocked {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg,
 });
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel) {
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel.get()) {
 pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: announcement_sigs,
 });
 }
 short_to_id.insert(channel.get_short_channel_id().unwrap(), channel.channel_id());
channel_state.short_to_id.insert(channel.get().get_short_channel_id().unwrap(), channel.get().channel_id());
 }
 }
 break (counterparty_node_id, Ok(()));
 };
 let _ = handle_error!(self, res, counterparty_node_id);

 self.pending_events.lock().unwrap().append(&mut pending_events);
 if let Some(ev) = pending_event {
 self.pending_events.lock().unwrap().push(ev);
 }

 self.fail_holding_cell_htlcs(htlc_forwarding_failures, funding_txo.to_channel_id());
 for failure in htlc_failures.drain(..) {
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
 }
 self.forward_htlcs(&mut htlc_forwards[..]);

 for res in close_results.drain(..) {
 self.finish_force_close_channel(res);
 if let Some(forwards) = htlc_forwards {
 self.forward_htlcs(&mut [forwards][..]);
 }
	}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Free holding cell on monitor-updating-restored when there's no upd by TheBlueMatt · Pull Request #755 · lightningdevkit/rust-lightning · GitHub
Skip to content
Free holding cell on monitor-updating-restored when there's no upd#755

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

 Closed

TheBlueMatt
wants to merge
1
commit into

from


+68

−33

 Closed


Free holding cell on monitor-updating-restored when there's no upd
#755
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 22 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2605,7 +2605,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
	/// Indicates that the latest ChannelMonitor update has been committed by the client
	/// successfully and we should restore normal operation. Returns messages which should be sent
	/// to the remote side.
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, bool, Option<msgs::FundingLocked>) where L::Target: Logger {
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (
 Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Option<ChannelMonitorUpdate>,
 Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, Vec<(HTLCSource, PaymentHash)>,
 bool, Option<msgs::FundingLocked>) where L::Target: Logger {
 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, ChannelState::MonitorUpdateFailed as u32);
 self.channel_state &= !(ChannelState::MonitorUpdateFailed as u32);

Expand DownExpand Up@@ -2635,25 +2638,39 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if self.channel_state & (ChannelState::PeerDisconnected as u32) != 0 {
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, forwards, failures, needs_broadcast_safe, funding_locked);
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, None, forwards, failures, Vec::new(), needs_broadcast_safe, funding_locked);
 }

 let raa = if self.monitor_pending_revoke_and_ack {
 Some(self.get_last_revoke_and_ack())
 } else { None };
 let commitment_update = if self.monitor_pending_commitment_signed {
 let mut commitment_update = if self.monitor_pending_commitment_signed {
 Some(self.get_last_commitment_update(logger))
 } else { None };

 let mut order = self.resend_order.clone();
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 let order = self.resend_order.clone();

 let mut htlcs_failed_to_forward = Vec::new();
 let mut chanmon_update = None;
 if commitment_update.is_none() && self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32) == 0 {
 order = RAACommitmentOrder::RevokeAndACKFirst;

 let (update_opt, mut failed_htlcs) = self.free_holding_cell_htlcs(logger).unwrap();
 htlcs_failed_to_forward.append(&mut failed_htlcs);
 if let Some((com_update, mon_update)) = update_opt {
 commitment_update = Some(com_update);
 chanmon_update = Some(mon_update);
 }
 }

 log_trace!(logger, "Restored monitor updating resulting in {}{} commitment update and {} RAA, with {} first",
 if needs_broadcast_safe { "a funding broadcast safe, " } else { "" },
 if commitment_update.is_some() { "a" } else { "no" },
 if raa.is_some() { "an" } else { "no" },
 match order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
 (raa, commitment_update, order, forwards, failures, needs_broadcast_safe, funding_locked)
 (raa, commitment_update, order, chanmon_update, forwards, failures, htlcs_failed_to_forward, needs_broadcast_safe, funding_locked)
	}

	pub fn update_fee<F: Deref>(&mut self, fee_estimator: &F, msg: &msgs::UpdateFee) -> Result<(), ChannelError>
Expand Down

74 changes: 46 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2198,6 +2198,10 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	/// ChannelMonitorUpdateErr::TemporaryFailures is fine. The highest_applied_update_id field
	/// exists largely only to prevent races between this and concurrent update_monitor calls.
	///
	/// XXX: Update to note re-entrancy - this is really terrible - the reentrancy only happens in
	/// a really rare case making it incredibly likely users will miss it and never hit it in
	/// testing.
	///
	/// Thus, the anticipated use is, at a high level:
	/// 1) You register a chain::Watch with this ChannelManager,
	/// 2) it stores each update to disk, and begins updating any remote (eg watchtower) copies of
Expand All@@ -2209,42 +2213,53 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	pub fn channel_monitor_updated(&self, funding_txo: &OutPoint, highest_applied_update_id: u64) {
 let _consistency_lock = self.total_consistency_lock.read().unwrap();

 let mut close_results = Vec::new();
 let mut htlc_forwards = Vec::new();
 let mut htlc_failures = Vec::new();
 let mut pending_events = Vec::new();
 let mut htlc_forwards = None;
 let mut htlc_failures;
 let htlc_forwarding_failures;
 let mut pending_event = None;

 {
let (counterparty_node_id, res) = loop {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 let channel = match channel_state.by_id.get_mut(&funding_txo.to_channel_id()) {
Some(chan) => chan,
None => return,
 let mut channel = match channel_state.by_id.entry(funding_txo.to_channel_id()) {
hash_map::Entry::Vacant(_) => return,
hash_map::Entry::Occupied(e) => e,
 };
 if !channel.is_awaiting_monitor_update() || channel.get_latest_monitor_update_id() != highest_applied_update_id {
 if !channel.get().is_awaiting_monitor_update() || channel.get().get_latest_monitor_update_id() != highest_applied_update_id {
 return;
 }
 let counterparty_node_id = channel.get().get_counterparty_node_id();

 let (raa, commitment_update, order, pending_forwards, mut pending_failures, needs_broadcast_safe, funding_locked) = channel.monitor_updating_restored(&self.logger);
 let (raa, commitment_update, order, chanmon_update, pending_forwards, pending_failures, forwarding_failds, needs_broadcast_safe, funding_locked) = channel.get_mut().monitor_updating_restored(&self.logger);
 if !pending_forwards.is_empty() {
 htlc_forwards.push((channel.get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 htlc_forwards = Some((channel.get().get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 }
 htlc_failures.append(&mut pending_failures);
 htlc_failures = pending_failures;
 htlc_forwarding_failures = forwarding_failds;

 macro_rules! handle_cs { () => {
 if let Some(monitor_update) = chanmon_update {
 assert!(order == RAACommitmentOrder::RevokeAndACKFirst);
 assert!(!needs_broadcast_safe);
 assert!(funding_locked.is_none());
 assert!(commitment_update.is_some());
 if let Err(e) = self.chain_monitor.update_channel(*funding_txo, monitor_update) {
 break (counterparty_node_id,
 handle_monitor_err!(self, e, channel_state, channel, RAACommitmentOrder::CommitmentFirst, false, true));
 }
 }
 if let Some(update) = commitment_update {
 pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 updates: update,
 });
 }
 } }
 macro_rules! handle_raa { () => {
 if let Some(revoke_and_ack) = raa {
 pending_msg_events.push(events::MessageSendEvent::SendRevokeAndACK {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: revoke_and_ack,
 });
 }
Expand All@@ -2260,35 +2275,38 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 },
 }
 if needs_broadcast_safe {
pending_events.push(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get_funding_txo().unwrap(),
 user_channel_id: channel.get_user_id(),
pending_event = Some(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get().get_funding_txo().unwrap(),
 user_channel_id: channel.get().get_user_id(),
 });
 }
 if let Some(msg) = funding_locked {
 pending_msg_events.push(events::MessageSendEvent::SendFundingLocked {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg,
 });
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel) {
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel.get()) {
 pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: announcement_sigs,
 });
 }
 short_to_id.insert(channel.get_short_channel_id().unwrap(), channel.channel_id());
channel_state.short_to_id.insert(channel.get().get_short_channel_id().unwrap(), channel.get().channel_id());
 }
 }
 break (counterparty_node_id, Ok(()));
 };
 let _ = handle_error!(self, res, counterparty_node_id);

 self.pending_events.lock().unwrap().append(&mut pending_events);
 if let Some(ev) = pending_event {
 self.pending_events.lock().unwrap().push(ev);
 }

 self.fail_holding_cell_htlcs(htlc_forwarding_failures, funding_txo.to_channel_id());
 for failure in htlc_failures.drain(..) {
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
 }
 self.forward_htlcs(&mut htlc_forwards[..]);

 for res in close_results.drain(..) {
 self.finish_force_close_channel(res);
 if let Some(forwards) = htlc_forwards {
 self.forward_htlcs(&mut [forwards][..]);
 }
	}

Expand Down

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

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

 Closed

TheBlueMatt
wants to merge
1
commit into

from


+68

−33

 Closed


Free holding cell on monitor-updating-restored when there's no upd
#755
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 22 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2605,7 +2605,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
	/// Indicates that the latest ChannelMonitor update has been committed by the client
	/// successfully and we should restore normal operation. Returns messages which should be sent
	/// to the remote side.
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, bool, Option<msgs::FundingLocked>) where L::Target: Logger {
	pub fn monitor_updating_restored<L: Deref>(&mut self, logger: &L) -> (
 Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Option<ChannelMonitorUpdate>,
 Vec<(PendingHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, Vec<(HTLCSource, PaymentHash)>,
 bool, Option<msgs::FundingLocked>) where L::Target: Logger {
 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, ChannelState::MonitorUpdateFailed as u32);
 self.channel_state &= !(ChannelState::MonitorUpdateFailed as u32);

Expand DownExpand Up@@ -2635,25 +2638,39 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 if self.channel_state & (ChannelState::PeerDisconnected as u32) != 0 {
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, forwards, failures, needs_broadcast_safe, funding_locked);
 return (None, None, RAACommitmentOrder::RevokeAndACKFirst, None, forwards, failures, Vec::new(), needs_broadcast_safe, funding_locked);
 }

 let raa = if self.monitor_pending_revoke_and_ack {
 Some(self.get_last_revoke_and_ack())
 } else { None };
 let commitment_update = if self.monitor_pending_commitment_signed {
 let mut commitment_update = if self.monitor_pending_commitment_signed {
 Some(self.get_last_commitment_update(logger))
 } else { None };

 let mut order = self.resend_order.clone();
 self.monitor_pending_revoke_and_ack = false;
 self.monitor_pending_commitment_signed = false;
 let order = self.resend_order.clone();

 let mut htlcs_failed_to_forward = Vec::new();
 let mut chanmon_update = None;
 if commitment_update.is_none() && self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32) == 0 {
 order = RAACommitmentOrder::RevokeAndACKFirst;

 let (update_opt, mut failed_htlcs) = self.free_holding_cell_htlcs(logger).unwrap();
 htlcs_failed_to_forward.append(&mut failed_htlcs);
 if let Some((com_update, mon_update)) = update_opt {
 commitment_update = Some(com_update);
 chanmon_update = Some(mon_update);
 }
 }

 log_trace!(logger, "Restored monitor updating resulting in {}{} commitment update and {} RAA, with {} first",
 if needs_broadcast_safe { "a funding broadcast safe, " } else { "" },
 if commitment_update.is_some() { "a" } else { "no" },
 if raa.is_some() { "an" } else { "no" },
 match order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
 (raa, commitment_update, order, forwards, failures, needs_broadcast_safe, funding_locked)
 (raa, commitment_update, order, chanmon_update, forwards, failures, htlcs_failed_to_forward, needs_broadcast_safe, funding_locked)
	}

	pub fn update_fee<F: Deref>(&mut self, fee_estimator: &F, msg: &msgs::UpdateFee) -> Result<(), ChannelError>
Expand Down

74 changes: 46 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2198,6 +2198,10 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	/// ChannelMonitorUpdateErr::TemporaryFailures is fine. The highest_applied_update_id field
	/// exists largely only to prevent races between this and concurrent update_monitor calls.
	///
	/// XXX: Update to note re-entrancy - this is really terrible - the reentrancy only happens in
	/// a really rare case making it incredibly likely users will miss it and never hit it in
	/// testing.
	///
	/// Thus, the anticipated use is, at a high level:
	/// 1) You register a chain::Watch with this ChannelManager,
	/// 2) it stores each update to disk, and begins updating any remote (eg watchtower) copies of
Expand All@@ -2209,42 +2213,53 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
	pub fn channel_monitor_updated(&self, funding_txo: &OutPoint, highest_applied_update_id: u64) {
 let _consistency_lock = self.total_consistency_lock.read().unwrap();

 let mut close_results = Vec::new();
 let mut htlc_forwards = Vec::new();
 let mut htlc_failures = Vec::new();
 let mut pending_events = Vec::new();
 let mut htlc_forwards = None;
 let mut htlc_failures;
 let htlc_forwarding_failures;
 let mut pending_event = None;

 {
let (counterparty_node_id, res) = loop {
 let mut channel_lock = self.channel_state.lock().unwrap();
 let channel_state = &mut *channel_lock;
 let short_to_id = &mut channel_state.short_to_id;
 let pending_msg_events = &mut channel_state.pending_msg_events;
 let channel = match channel_state.by_id.get_mut(&funding_txo.to_channel_id()) {
Some(chan) => chan,
None => return,
 let mut channel = match channel_state.by_id.entry(funding_txo.to_channel_id()) {
hash_map::Entry::Vacant(_) => return,
hash_map::Entry::Occupied(e) => e,
 };
 if !channel.is_awaiting_monitor_update() || channel.get_latest_monitor_update_id() != highest_applied_update_id {
 if !channel.get().is_awaiting_monitor_update() || channel.get().get_latest_monitor_update_id() != highest_applied_update_id {
 return;
 }
 let counterparty_node_id = channel.get().get_counterparty_node_id();

 let (raa, commitment_update, order, pending_forwards, mut pending_failures, needs_broadcast_safe, funding_locked) = channel.monitor_updating_restored(&self.logger);
 let (raa, commitment_update, order, chanmon_update, pending_forwards, pending_failures, forwarding_failds, needs_broadcast_safe, funding_locked) = channel.get_mut().monitor_updating_restored(&self.logger);
 if !pending_forwards.is_empty() {
 htlc_forwards.push((channel.get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 htlc_forwards = Some((channel.get().get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), funding_txo.clone(), pending_forwards));
 }
 htlc_failures.append(&mut pending_failures);
 htlc_failures = pending_failures;
 htlc_forwarding_failures = forwarding_failds;

 macro_rules! handle_cs { () => {
 if let Some(monitor_update) = chanmon_update {
 assert!(order == RAACommitmentOrder::RevokeAndACKFirst);
 assert!(!needs_broadcast_safe);
 assert!(funding_locked.is_none());
 assert!(commitment_update.is_some());
 if let Err(e) = self.chain_monitor.update_channel(*funding_txo, monitor_update) {
 break (counterparty_node_id,
 handle_monitor_err!(self, e, channel_state, channel, RAACommitmentOrder::CommitmentFirst, false, true));
 }
 }
 if let Some(update) = commitment_update {
 pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 updates: update,
 });
 }
 } }
 macro_rules! handle_raa { () => {
 if let Some(revoke_and_ack) = raa {
 pending_msg_events.push(events::MessageSendEvent::SendRevokeAndACK {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: revoke_and_ack,
 });
 }
Expand All@@ -2260,35 +2275,38 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 },
 }
 if needs_broadcast_safe {
pending_events.push(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get_funding_txo().unwrap(),
 user_channel_id: channel.get_user_id(),
pending_event = Some(events::Event::FundingBroadcastSafe {
 funding_txo: channel.get().get_funding_txo().unwrap(),
 user_channel_id: channel.get().get_user_id(),
 });
 }
 if let Some(msg) = funding_locked {
 pending_msg_events.push(events::MessageSendEvent::SendFundingLocked {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg,
 });
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel) {
 if let Some(announcement_sigs) = self.get_announcement_sigs(channel.get()) {
 pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
 node_id: channel.get_counterparty_node_id(),
 node_id: counterparty_node_id,
 msg: announcement_sigs,
 });
 }
 short_to_id.insert(channel.get_short_channel_id().unwrap(), channel.channel_id());
channel_state.short_to_id.insert(channel.get().get_short_channel_id().unwrap(), channel.get().channel_id());
 }
 }
 break (counterparty_node_id, Ok(()));
 };
 let _ = handle_error!(self, res, counterparty_node_id);

 self.pending_events.lock().unwrap().append(&mut pending_events);
 if let Some(ev) = pending_event {
 self.pending_events.lock().unwrap().push(ev);
 }

 self.fail_holding_cell_htlcs(htlc_forwarding_failures, funding_txo.to_channel_id());
 for failure in htlc_failures.drain(..) {
 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
 }
 self.forward_htlcs(&mut htlc_forwards[..]);

 for res in close_results.drain(..) {
 self.finish_force_close_channel(res);
 if let Some(forwards) = htlc_forwards {
 self.forward_htlcs(&mut [forwards][..]);
 }
	}

Expand Down