Skip to content

Fix followups to PR2797#2864

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
dunxen merged 1 commit into from
Feb 1, 2024
Merged

Fix followups to PR2797 #2864

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
30 changes: 13 additions & 17 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,9 +1636,6 @@ pub struct ChannelDetails {
pub counterparty: ChannelCounterparty,
/// The Channel's funding transaction output, if we've negotiated the funding transaction with
/// our counterparty already.
///
/// Note that, if this has been set, `channel_id` for V1-established channels will be equivalent to
/// `ChannelId::v1_from_funding_outpoint(funding_txo.unwrap())`.
pub funding_txo: Option<OutPoint>,
/// The features which this channel operates with. See individual features for more info.
///
Expand DownExpand Up@@ -2296,7 +2293,7 @@ macro_rules! handle_new_monitor_update {
handle_new_monitor_update!($self, $update_res, $chan, _internal,
handle_monitor_update_completion!($self, $peer_state_lock, $peer_state, $per_peer_state_lock, $chan))
};
($self: ident, $funding_txo: expr, $channel_id: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
($self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
let in_flight_updates = $peer_state.in_flight_monitor_updates.entry($funding_txo)
.or_insert_with(Vec::new);
// During startup, we push monitor updates as background events through to here in
Expand DownExpand Up@@ -2753,7 +2750,7 @@ where

// Update the monitor with the shutdown script if necessary.
if let Some(monitor_update) = monitor_update_opt.take() {
handle_new_monitor_update!(self, funding_txo_opt.unwrap(), *channel_id, monitor_update,
handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
peer_state_lock, peer_state, per_peer_state, chan);
}
} else {
Expand DownExpand Up@@ -3414,7 +3411,7 @@ where
}, onion_packet, None, &self.fee_estimator, &&logger);
match break_chan_phase_entry!(self, send_res, chan_phase_entry) {
Some(monitor_update) => {
match handle_new_monitor_update!(self, funding_txo, channel_id, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
match handle_new_monitor_update!(self, funding_txo, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
false => {
// Note that MonitorUpdateInProgress here indicates (per function
// docs) that we will resend the commitment update once monitor
Expand DownExpand Up@@ -4770,7 +4767,7 @@ where
hash_map::Entry::Occupied(mut chan_phase) => {
if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
updated_chan = true;
handle_new_monitor_update!(self, funding_txo, channel_id, update.clone(),
handle_new_monitor_update!(self, funding_txo, update.clone(),
peer_state_lock, peer_state, per_peer_state, chan);
} else {
debug_assert!(false, "We shouldn't have an update for a non-funded channel");
Expand DownExpand Up@@ -5574,7 +5571,7 @@ where
peer_state.monitor_update_blocked_actions.entry(chan_id).or_insert(Vec::new()).push(action);
}
if !during_init {
handle_new_monitor_update!(self, prev_hop.outpoint, prev_hop.channel_id, monitor_update, peer_state_lock,
handle_new_monitor_update!(self, prev_hop.outpoint, monitor_update, peer_state_lock,
peer_state, per_peer_state, chan);
} else {
// If we're running during init we cannot update a monitor directly -
Expand DownExpand Up@@ -6570,7 +6567,7 @@ where
}
// Update the monitor with the shutdown script if necessary.
if let Some(monitor_update) = monitor_update_opt {
handle_new_monitor_update!(self, funding_txo_opt.unwrap(), chan.context.channel_id(), monitor_update,
handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
peer_state_lock, peer_state, per_peer_state, chan);
}
},
Expand DownExpand Up@@ -6852,7 +6849,7 @@ where
let funding_txo = chan.context.get_funding_txo();
let monitor_update_opt = try_chan_phase_entry!(self, chan.commitment_signed(&msg, &&logger), chan_phase_entry);
if let Some(monitor_update) = monitor_update_opt {
handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update, peer_state_lock,
handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update, peer_state_lock,
peer_state, per_peer_state, chan);
}
Ok(())
Expand DownExpand Up@@ -7031,7 +7028,7 @@ where
if let Some(monitor_update) = monitor_update_opt {
let funding_txo = funding_txo_opt
.expect("Funding outpoint must have been set for RAA handling to succeed");
handle_new_monitor_update!(self, funding_txo, chan.context.channel_id(), monitor_update,
handle_new_monitor_update!(self, funding_txo, monitor_update,
peer_state_lock, peer_state, per_peer_state, chan);
}
htlcs_to_fail
Expand DownExpand Up@@ -7372,7 +7369,7 @@ where
if let Some(monitor_update) = monitor_opt {
has_monitor_update = true;

handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update,
handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update,
peer_state_lock, peer_state, per_peer_state, chan);
continue 'peer_loop;
}
Expand DownExpand Up@@ -8141,7 +8138,7 @@ where
if let Some((monitor_update, further_update_exists)) = chan.unblock_next_blocked_monitor_update() {
log_debug!(logger, "Unlocking monitor updating for channel {} and updating monitor",
channel_id);
handle_new_monitor_update!(self, channel_funding_outpoint, channel_id, monitor_update,
handle_new_monitor_update!(self, channel_funding_outpoint, monitor_update,
peer_state_lck, peer_state, per_peer_state, chan);
if further_update_exists {
// If there are more `ChannelMonitorUpdate`s to process, restart at the
Expand DownExpand Up@@ -9816,7 +9813,7 @@ impl_writeable_tlv_based!(PendingAddHTLCInfo, {
(2, prev_short_channel_id, required),
(4, prev_htlc_id, required),
(6, prev_funding_outpoint, required),
// Note that by the time we get past the required read for type 2 above, prev_funding_outpoint will be
// Note that by the time we get past the required read for type 6 above, prev_funding_outpoint will be
// filled in, so we can safely unwrap it here.
(7, prev_channel_id, (default_value, ChannelId::v1_from_funding_outpoint(prev_funding_outpoint.0.unwrap()))),
});
Expand DownExpand Up@@ -11079,12 +11076,11 @@ where
Some((blocked_node_id, _blocked_channel_outpoint, blocked_channel_id, blocking_action)), ..
} = action {
if let Some(blocked_peer_state) = per_peer_state.get(&blocked_node_id) {
let channel_id = blocked_channel_id;
log_trace!(logger,
"Holding the next revoke_and_ack from {} until the preimage is durably persisted in the inbound edge's ChannelMonitor",
channel_id);
blocked_channel_id);
blocked_peer_state.lock().unwrap().actions_blocking_raa_monitor_updates
.entry(*channel_id)
.entry(*blocked_channel_id)
.or_insert_with(Vec::new).push(blocking_action.clone());
} else {
// If the channel we were blocking has closed, we don't need to
Expand Down
3 changes: 1 addition & 2 deletions lightning/src/ln/peer_handler.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use crate::ln::ChannelId;
use crate::ln::features::{InitFeatures, NodeFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, LightningError, SocketAddress, OnionMessageHandler, RoutingMessageHandler};
use crate::util::macro_logger::DebugFundingChannelId;
use crate::util::ser::{VecWriter, Writeable, Writer};
use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor, NextNoiseStep, MessageBuf, MSG_BUF_ALLOC_SIZE};
use crate::ln::wire;
Expand DownExpand Up@@ -2007,7 +2006,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.temporary_channel_id)), "Handling SendFundingCreated event in peer_handler for node {} for channel {} (which becomes {})",
log_pubkey!(node_id),
&msg.temporary_channel_id,
DebugFundingChannelId(&msg.funding_txid, msg.funding_output_index));
ChannelId::v1_from_funding_txid(msg.funding_txid.as_byte_array(), msg.funding_output_index));
// TODO: If the peer is gone we should generate a DiscardFunding event
// indicating to the wallet that they should just throw away this funding transaction
self.enqueue_message(&mut *get_peer_for_forwarding!(node_id), msg);
Expand Down
9 changes: 0 additions & 9 deletions lightning/src/util/macro_logger.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::chain::transaction::OutPoint;
use crate::ln::ChannelId;
use crate::sign::SpendableOutputDescriptor;

use bitcoin::hash_types::Txid;
use bitcoin::blockdata::transaction::Transaction;

use crate::routing::router::Route;
Expand DownExpand Up@@ -39,13 +37,6 @@ macro_rules! log_bytes {
}
}

pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
ChannelId::v1_from_funding_outpoint(OutPoint { txid: self.0.clone(), index: self.1 }).fmt(f)
}
}

pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
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" + '
Fix followups to PR2797 by dunxen · Pull Request #2864 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix followups to PR2797#2864

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dunxen
merged 1 commit into

from

Feb 1, 2024
 Merged


Fix followups to PR2797
#2864
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


30 changes: 13 additions & 17 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,9 +1636,6 @@ pub struct ChannelDetails {
	pub counterparty: ChannelCounterparty,
	/// The Channel's funding transaction output, if we've negotiated the funding transaction with
	/// our counterparty already.
	///
	/// Note that, if this has been set, `channel_id` for V1-established channels will be equivalent to
	/// `ChannelId::v1_from_funding_outpoint(funding_txo.unwrap())`.
	pub funding_txo: Option<OutPoint>,
	/// The features which this channel operates with. See individual features for more info.
	///
Expand DownExpand Up@@ -2296,7 +2293,7 @@ macro_rules! handle_new_monitor_update {
 handle_new_monitor_update!($self, $update_res, $chan, _internal,
 handle_monitor_update_completion!($self, $peer_state_lock, $peer_state, $per_peer_state_lock, $chan))
	};
	($self: ident, $funding_txo: expr, $channel_id: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
	($self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let in_flight_updates = $peer_state.in_flight_monitor_updates.entry($funding_txo)
 .or_insert_with(Vec::new);
 // During startup, we push monitor updates as background events through to here in
Expand DownExpand Up@@ -2753,7 +2750,7 @@ where

 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt.take() {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), *channel_id, monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
Expand DownExpand Up@@ -3414,7 +3411,7 @@ where
 }, onion_packet, None, &self.fee_estimator, &&logger);
 match break_chan_phase_entry!(self, send_res, chan_phase_entry) {
 Some(monitor_update) => {
 match handle_new_monitor_update!(self, funding_txo, channel_id, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 match handle_new_monitor_update!(self, funding_txo, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 false => {
 // Note that MonitorUpdateInProgress here indicates (per function
 // docs) that we will resend the commitment update once monitor
Expand DownExpand Up@@ -4770,7 +4767,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase) => {
 if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
 updated_chan = true;
 handle_new_monitor_update!(self, funding_txo, channel_id, update.clone(),
 handle_new_monitor_update!(self, funding_txo, update.clone(),
 peer_state_lock, peer_state, per_peer_state, chan);
 } else {
 debug_assert!(false, "We shouldn't have an update for a non-funded channel");
Expand DownExpand Up@@ -5574,7 +5571,7 @@ where
 peer_state.monitor_update_blocked_actions.entry(chan_id).or_insert(Vec::new()).push(action);
 }
 if !during_init {
 handle_new_monitor_update!(self, prev_hop.outpoint, prev_hop.channel_id, monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, prev_hop.outpoint, monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 } else {
 // If we're running during init we cannot update a monitor directly -
Expand DownExpand Up@@ -6570,7 +6567,7 @@ where
 }
 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 },
Expand DownExpand Up@@ -6852,7 +6849,7 @@ where
 let funding_txo = chan.context.get_funding_txo();
 let monitor_update_opt = try_chan_phase_entry!(self, chan.commitment_signed(&msg, &&logger), chan_phase_entry);
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 }
 Ok(())
Expand DownExpand Up@@ -7031,7 +7028,7 @@ where
 if let Some(monitor_update) = monitor_update_opt {
 let funding_txo = funding_txo_opt
 .expect("Funding outpoint must have been set for RAA handling to succeed");
 handle_new_monitor_update!(self, funding_txo, chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo, monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 htlcs_to_fail
Expand DownExpand Up@@ -7372,7 +7369,7 @@ where
 if let Some(monitor_update) = monitor_opt {
 has_monitor_update = true;

 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 continue 'peer_loop;
 }
Expand DownExpand Up@@ -8141,7 +8138,7 @@ where
 if let Some((monitor_update, further_update_exists)) = chan.unblock_next_blocked_monitor_update() {
 log_debug!(logger, "Unlocking monitor updating for channel {} and updating monitor",
 channel_id);
 handle_new_monitor_update!(self, channel_funding_outpoint, channel_id, monitor_update,
 handle_new_monitor_update!(self, channel_funding_outpoint, monitor_update,
 peer_state_lck, peer_state, per_peer_state, chan);
 if further_update_exists {
 // If there are more `ChannelMonitorUpdate`s to process, restart at the
Expand DownExpand Up@@ -9816,7 +9813,7 @@ impl_writeable_tlv_based!(PendingAddHTLCInfo, {
	(2, prev_short_channel_id, required),
	(4, prev_htlc_id, required),
	(6, prev_funding_outpoint, required),
	// Note that by the time we get past the required read for type 2 above, prev_funding_outpoint will be
	// Note that by the time we get past the required read for type 6 above, prev_funding_outpoint will be
	// filled in, so we can safely unwrap it here.
	(7, prev_channel_id, (default_value, ChannelId::v1_from_funding_outpoint(prev_funding_outpoint.0.unwrap()))),
});
Expand DownExpand Up@@ -11079,12 +11076,11 @@ where
 Some((blocked_node_id, _blocked_channel_outpoint, blocked_channel_id, blocking_action)), ..
 } = action {
 if let Some(blocked_peer_state) = per_peer_state.get(&blocked_node_id) {
 let channel_id = blocked_channel_id;
 log_trace!(logger,
 "Holding the next revoke_and_ack from {} until the preimage is durably persisted in the inbound edge's ChannelMonitor",
channel_id);
blocked_channel_id);
 blocked_peer_state.lock().unwrap().actions_blocking_raa_monitor_updates
 .entry(*channel_id)
 .entry(*blocked_channel_id)
 .or_insert_with(Vec::new).push(blocking_action.clone());
 } else {
 // If the channel we were blocking has closed, we don't need to
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use crate::ln::ChannelId;
use crate::ln::features::{InitFeatures, NodeFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, LightningError, SocketAddress, OnionMessageHandler, RoutingMessageHandler};
use crate::util::macro_logger::DebugFundingChannelId;
use crate::util::ser::{VecWriter, Writeable, Writer};
use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor, NextNoiseStep, MessageBuf, MSG_BUF_ALLOC_SIZE};
use crate::ln::wire;
Expand DownExpand Up@@ -2007,7 +2006,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.temporary_channel_id)), "Handling SendFundingCreated event in peer_handler for node {} for channel {} (which becomes {})",
 log_pubkey!(node_id),
 &msg.temporary_channel_id,
DebugFundingChannelId(&msg.funding_txid, msg.funding_output_index));
ChannelId::v1_from_funding_txid(msg.funding_txid.as_byte_array(), msg.funding_output_index));
 // TODO: If the peer is gone we should generate a DiscardFunding event
 // indicating to the wallet that they should just throw away this funding transaction
 self.enqueue_message(&mut *get_peer_for_forwarding!(node_id), msg);
Expand Down

9 changes: 0 additions & 9 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::chain::transaction::OutPoint;
use crate::ln::ChannelId;
use crate::sign::SpendableOutputDescriptor;

use bitcoin::hash_types::Txid;
use bitcoin::blockdata::transaction::Transaction;

use crate::routing::router::Route;
Expand DownExpand Up@@ -39,13 +37,6 @@ macro_rules! log_bytes {
	}
}

pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 ChannelId::v1_from_funding_outpoint(OutPoint { txid: self.0.clone(), index: self.1 }).fmt(f)
	}
}

pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
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('^' + ".*" + '
Fix followups to PR2797 by dunxen · Pull Request #2864 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix followups to PR2797#2864

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dunxen
merged 1 commit into

from

Feb 1, 2024
 Merged


Fix followups to PR2797
#2864
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


30 changes: 13 additions & 17 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,9 +1636,6 @@ pub struct ChannelDetails {
	pub counterparty: ChannelCounterparty,
	/// The Channel's funding transaction output, if we've negotiated the funding transaction with
	/// our counterparty already.
	///
	/// Note that, if this has been set, `channel_id` for V1-established channels will be equivalent to
	/// `ChannelId::v1_from_funding_outpoint(funding_txo.unwrap())`.
	pub funding_txo: Option<OutPoint>,
	/// The features which this channel operates with. See individual features for more info.
	///
Expand DownExpand Up@@ -2296,7 +2293,7 @@ macro_rules! handle_new_monitor_update {
 handle_new_monitor_update!($self, $update_res, $chan, _internal,
 handle_monitor_update_completion!($self, $peer_state_lock, $peer_state, $per_peer_state_lock, $chan))
	};
	($self: ident, $funding_txo: expr, $channel_id: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
	($self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let in_flight_updates = $peer_state.in_flight_monitor_updates.entry($funding_txo)
 .or_insert_with(Vec::new);
 // During startup, we push monitor updates as background events through to here in
Expand DownExpand Up@@ -2753,7 +2750,7 @@ where

 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt.take() {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), *channel_id, monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
Expand DownExpand Up@@ -3414,7 +3411,7 @@ where
 }, onion_packet, None, &self.fee_estimator, &&logger);
 match break_chan_phase_entry!(self, send_res, chan_phase_entry) {
 Some(monitor_update) => {
 match handle_new_monitor_update!(self, funding_txo, channel_id, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 match handle_new_monitor_update!(self, funding_txo, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 false => {
 // Note that MonitorUpdateInProgress here indicates (per function
 // docs) that we will resend the commitment update once monitor
Expand DownExpand Up@@ -4770,7 +4767,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase) => {
 if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
 updated_chan = true;
 handle_new_monitor_update!(self, funding_txo, channel_id, update.clone(),
 handle_new_monitor_update!(self, funding_txo, update.clone(),
 peer_state_lock, peer_state, per_peer_state, chan);
 } else {
 debug_assert!(false, "We shouldn't have an update for a non-funded channel");
Expand DownExpand Up@@ -5574,7 +5571,7 @@ where
 peer_state.monitor_update_blocked_actions.entry(chan_id).or_insert(Vec::new()).push(action);
 }
 if !during_init {
 handle_new_monitor_update!(self, prev_hop.outpoint, prev_hop.channel_id, monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, prev_hop.outpoint, monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 } else {
 // If we're running during init we cannot update a monitor directly -
Expand DownExpand Up@@ -6570,7 +6567,7 @@ where
 }
 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 },
Expand DownExpand Up@@ -6852,7 +6849,7 @@ where
 let funding_txo = chan.context.get_funding_txo();
 let monitor_update_opt = try_chan_phase_entry!(self, chan.commitment_signed(&msg, &&logger), chan_phase_entry);
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 }
 Ok(())
Expand DownExpand Up@@ -7031,7 +7028,7 @@ where
 if let Some(monitor_update) = monitor_update_opt {
 let funding_txo = funding_txo_opt
 .expect("Funding outpoint must have been set for RAA handling to succeed");
 handle_new_monitor_update!(self, funding_txo, chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo, monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 htlcs_to_fail
Expand DownExpand Up@@ -7372,7 +7369,7 @@ where
 if let Some(monitor_update) = monitor_opt {
 has_monitor_update = true;

 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 continue 'peer_loop;
 }
Expand DownExpand Up@@ -8141,7 +8138,7 @@ where
 if let Some((monitor_update, further_update_exists)) = chan.unblock_next_blocked_monitor_update() {
 log_debug!(logger, "Unlocking monitor updating for channel {} and updating monitor",
 channel_id);
 handle_new_monitor_update!(self, channel_funding_outpoint, channel_id, monitor_update,
 handle_new_monitor_update!(self, channel_funding_outpoint, monitor_update,
 peer_state_lck, peer_state, per_peer_state, chan);
 if further_update_exists {
 // If there are more `ChannelMonitorUpdate`s to process, restart at the
Expand DownExpand Up@@ -9816,7 +9813,7 @@ impl_writeable_tlv_based!(PendingAddHTLCInfo, {
	(2, prev_short_channel_id, required),
	(4, prev_htlc_id, required),
	(6, prev_funding_outpoint, required),
	// Note that by the time we get past the required read for type 2 above, prev_funding_outpoint will be
	// Note that by the time we get past the required read for type 6 above, prev_funding_outpoint will be
	// filled in, so we can safely unwrap it here.
	(7, prev_channel_id, (default_value, ChannelId::v1_from_funding_outpoint(prev_funding_outpoint.0.unwrap()))),
});
Expand DownExpand Up@@ -11079,12 +11076,11 @@ where
 Some((blocked_node_id, _blocked_channel_outpoint, blocked_channel_id, blocking_action)), ..
 } = action {
 if let Some(blocked_peer_state) = per_peer_state.get(&blocked_node_id) {
 let channel_id = blocked_channel_id;
 log_trace!(logger,
 "Holding the next revoke_and_ack from {} until the preimage is durably persisted in the inbound edge's ChannelMonitor",
channel_id);
blocked_channel_id);
 blocked_peer_state.lock().unwrap().actions_blocking_raa_monitor_updates
 .entry(*channel_id)
 .entry(*blocked_channel_id)
 .or_insert_with(Vec::new).push(blocking_action.clone());
 } else {
 // If the channel we were blocking has closed, we don't need to
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use crate::ln::ChannelId;
use crate::ln::features::{InitFeatures, NodeFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, LightningError, SocketAddress, OnionMessageHandler, RoutingMessageHandler};
use crate::util::macro_logger::DebugFundingChannelId;
use crate::util::ser::{VecWriter, Writeable, Writer};
use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor, NextNoiseStep, MessageBuf, MSG_BUF_ALLOC_SIZE};
use crate::ln::wire;
Expand DownExpand Up@@ -2007,7 +2006,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.temporary_channel_id)), "Handling SendFundingCreated event in peer_handler for node {} for channel {} (which becomes {})",
 log_pubkey!(node_id),
 &msg.temporary_channel_id,
DebugFundingChannelId(&msg.funding_txid, msg.funding_output_index));
ChannelId::v1_from_funding_txid(msg.funding_txid.as_byte_array(), msg.funding_output_index));
 // TODO: If the peer is gone we should generate a DiscardFunding event
 // indicating to the wallet that they should just throw away this funding transaction
 self.enqueue_message(&mut *get_peer_for_forwarding!(node_id), msg);
Expand Down

9 changes: 0 additions & 9 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::chain::transaction::OutPoint;
use crate::ln::ChannelId;
use crate::sign::SpendableOutputDescriptor;

use bitcoin::hash_types::Txid;
use bitcoin::blockdata::transaction::Transaction;

use crate::routing::router::Route;
Expand DownExpand Up@@ -39,13 +37,6 @@ macro_rules! log_bytes {
	}
}

pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 ChannelId::v1_from_funding_outpoint(OutPoint { txid: self.0.clone(), index: self.1 }).fmt(f)
	}
}

pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
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('^' + ".*" + '
Fix followups to PR2797 by dunxen · Pull Request #2864 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix followups to PR2797#2864

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dunxen
merged 1 commit into

from

Feb 1, 2024
 Merged


Fix followups to PR2797
#2864
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


30 changes: 13 additions & 17 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,9 +1636,6 @@ pub struct ChannelDetails {
	pub counterparty: ChannelCounterparty,
	/// The Channel's funding transaction output, if we've negotiated the funding transaction with
	/// our counterparty already.
	///
	/// Note that, if this has been set, `channel_id` for V1-established channels will be equivalent to
	/// `ChannelId::v1_from_funding_outpoint(funding_txo.unwrap())`.
	pub funding_txo: Option<OutPoint>,
	/// The features which this channel operates with. See individual features for more info.
	///
Expand DownExpand Up@@ -2296,7 +2293,7 @@ macro_rules! handle_new_monitor_update {
 handle_new_monitor_update!($self, $update_res, $chan, _internal,
 handle_monitor_update_completion!($self, $peer_state_lock, $peer_state, $per_peer_state_lock, $chan))
	};
	($self: ident, $funding_txo: expr, $channel_id: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
	($self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let in_flight_updates = $peer_state.in_flight_monitor_updates.entry($funding_txo)
 .or_insert_with(Vec::new);
 // During startup, we push monitor updates as background events through to here in
Expand DownExpand Up@@ -2753,7 +2750,7 @@ where

 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt.take() {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), *channel_id, monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
Expand DownExpand Up@@ -3414,7 +3411,7 @@ where
 }, onion_packet, None, &self.fee_estimator, &&logger);
 match break_chan_phase_entry!(self, send_res, chan_phase_entry) {
 Some(monitor_update) => {
 match handle_new_monitor_update!(self, funding_txo, channel_id, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 match handle_new_monitor_update!(self, funding_txo, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 false => {
 // Note that MonitorUpdateInProgress here indicates (per function
 // docs) that we will resend the commitment update once monitor
Expand DownExpand Up@@ -4770,7 +4767,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase) => {
 if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
 updated_chan = true;
 handle_new_monitor_update!(self, funding_txo, channel_id, update.clone(),
 handle_new_monitor_update!(self, funding_txo, update.clone(),
 peer_state_lock, peer_state, per_peer_state, chan);
 } else {
 debug_assert!(false, "We shouldn't have an update for a non-funded channel");
Expand DownExpand Up@@ -5574,7 +5571,7 @@ where
 peer_state.monitor_update_blocked_actions.entry(chan_id).or_insert(Vec::new()).push(action);
 }
 if !during_init {
 handle_new_monitor_update!(self, prev_hop.outpoint, prev_hop.channel_id, monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, prev_hop.outpoint, monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 } else {
 // If we're running during init we cannot update a monitor directly -
Expand DownExpand Up@@ -6570,7 +6567,7 @@ where
 }
 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 },
Expand DownExpand Up@@ -6852,7 +6849,7 @@ where
 let funding_txo = chan.context.get_funding_txo();
 let monitor_update_opt = try_chan_phase_entry!(self, chan.commitment_signed(&msg, &&logger), chan_phase_entry);
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 }
 Ok(())
Expand DownExpand Up@@ -7031,7 +7028,7 @@ where
 if let Some(monitor_update) = monitor_update_opt {
 let funding_txo = funding_txo_opt
 .expect("Funding outpoint must have been set for RAA handling to succeed");
 handle_new_monitor_update!(self, funding_txo, chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo, monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 htlcs_to_fail
Expand DownExpand Up@@ -7372,7 +7369,7 @@ where
 if let Some(monitor_update) = monitor_opt {
 has_monitor_update = true;

 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 continue 'peer_loop;
 }
Expand DownExpand Up@@ -8141,7 +8138,7 @@ where
 if let Some((monitor_update, further_update_exists)) = chan.unblock_next_blocked_monitor_update() {
 log_debug!(logger, "Unlocking monitor updating for channel {} and updating monitor",
 channel_id);
 handle_new_monitor_update!(self, channel_funding_outpoint, channel_id, monitor_update,
 handle_new_monitor_update!(self, channel_funding_outpoint, monitor_update,
 peer_state_lck, peer_state, per_peer_state, chan);
 if further_update_exists {
 // If there are more `ChannelMonitorUpdate`s to process, restart at the
Expand DownExpand Up@@ -9816,7 +9813,7 @@ impl_writeable_tlv_based!(PendingAddHTLCInfo, {
	(2, prev_short_channel_id, required),
	(4, prev_htlc_id, required),
	(6, prev_funding_outpoint, required),
	// Note that by the time we get past the required read for type 2 above, prev_funding_outpoint will be
	// Note that by the time we get past the required read for type 6 above, prev_funding_outpoint will be
	// filled in, so we can safely unwrap it here.
	(7, prev_channel_id, (default_value, ChannelId::v1_from_funding_outpoint(prev_funding_outpoint.0.unwrap()))),
});
Expand DownExpand Up@@ -11079,12 +11076,11 @@ where
 Some((blocked_node_id, _blocked_channel_outpoint, blocked_channel_id, blocking_action)), ..
 } = action {
 if let Some(blocked_peer_state) = per_peer_state.get(&blocked_node_id) {
 let channel_id = blocked_channel_id;
 log_trace!(logger,
 "Holding the next revoke_and_ack from {} until the preimage is durably persisted in the inbound edge's ChannelMonitor",
channel_id);
blocked_channel_id);
 blocked_peer_state.lock().unwrap().actions_blocking_raa_monitor_updates
 .entry(*channel_id)
 .entry(*blocked_channel_id)
 .or_insert_with(Vec::new).push(blocking_action.clone());
 } else {
 // If the channel we were blocking has closed, we don't need to
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use crate::ln::ChannelId;
use crate::ln::features::{InitFeatures, NodeFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, LightningError, SocketAddress, OnionMessageHandler, RoutingMessageHandler};
use crate::util::macro_logger::DebugFundingChannelId;
use crate::util::ser::{VecWriter, Writeable, Writer};
use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor, NextNoiseStep, MessageBuf, MSG_BUF_ALLOC_SIZE};
use crate::ln::wire;
Expand DownExpand Up@@ -2007,7 +2006,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.temporary_channel_id)), "Handling SendFundingCreated event in peer_handler for node {} for channel {} (which becomes {})",
 log_pubkey!(node_id),
 &msg.temporary_channel_id,
DebugFundingChannelId(&msg.funding_txid, msg.funding_output_index));
ChannelId::v1_from_funding_txid(msg.funding_txid.as_byte_array(), msg.funding_output_index));
 // TODO: If the peer is gone we should generate a DiscardFunding event
 // indicating to the wallet that they should just throw away this funding transaction
 self.enqueue_message(&mut *get_peer_for_forwarding!(node_id), msg);
Expand Down

9 changes: 0 additions & 9 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::chain::transaction::OutPoint;
use crate::ln::ChannelId;
use crate::sign::SpendableOutputDescriptor;

use bitcoin::hash_types::Txid;
use bitcoin::blockdata::transaction::Transaction;

use crate::routing::router::Route;
Expand DownExpand Up@@ -39,13 +37,6 @@ macro_rules! log_bytes {
	}
}

pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 ChannelId::v1_from_funding_outpoint(OutPoint { txid: self.0.clone(), index: self.1 }).fmt(f)
	}
}

pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
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" + '
Fix followups to PR2797 by dunxen · Pull Request #2864 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix followups to PR2797#2864

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dunxen
merged 1 commit into

from

Feb 1, 2024
 Merged


Fix followups to PR2797
#2864
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


30 changes: 13 additions & 17 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,9 +1636,6 @@ pub struct ChannelDetails {
	pub counterparty: ChannelCounterparty,
	/// The Channel's funding transaction output, if we've negotiated the funding transaction with
	/// our counterparty already.
	///
	/// Note that, if this has been set, `channel_id` for V1-established channels will be equivalent to
	/// `ChannelId::v1_from_funding_outpoint(funding_txo.unwrap())`.
	pub funding_txo: Option<OutPoint>,
	/// The features which this channel operates with. See individual features for more info.
	///
Expand DownExpand Up@@ -2296,7 +2293,7 @@ macro_rules! handle_new_monitor_update {
 handle_new_monitor_update!($self, $update_res, $chan, _internal,
 handle_monitor_update_completion!($self, $peer_state_lock, $peer_state, $per_peer_state_lock, $chan))
	};
	($self: ident, $funding_txo: expr, $channel_id: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
	($self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let in_flight_updates = $peer_state.in_flight_monitor_updates.entry($funding_txo)
 .or_insert_with(Vec::new);
 // During startup, we push monitor updates as background events through to here in
Expand DownExpand Up@@ -2753,7 +2750,7 @@ where

 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt.take() {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), *channel_id, monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
Expand DownExpand Up@@ -3414,7 +3411,7 @@ where
 }, onion_packet, None, &self.fee_estimator, &&logger);
 match break_chan_phase_entry!(self, send_res, chan_phase_entry) {
 Some(monitor_update) => {
 match handle_new_monitor_update!(self, funding_txo, channel_id, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 match handle_new_monitor_update!(self, funding_txo, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 false => {
 // Note that MonitorUpdateInProgress here indicates (per function
 // docs) that we will resend the commitment update once monitor
Expand DownExpand Up@@ -4770,7 +4767,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase) => {
 if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
 updated_chan = true;
 handle_new_monitor_update!(self, funding_txo, channel_id, update.clone(),
 handle_new_monitor_update!(self, funding_txo, update.clone(),
 peer_state_lock, peer_state, per_peer_state, chan);
 } else {
 debug_assert!(false, "We shouldn't have an update for a non-funded channel");
Expand DownExpand Up@@ -5574,7 +5571,7 @@ where
 peer_state.monitor_update_blocked_actions.entry(chan_id).or_insert(Vec::new()).push(action);
 }
 if !during_init {
 handle_new_monitor_update!(self, prev_hop.outpoint, prev_hop.channel_id, monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, prev_hop.outpoint, monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 } else {
 // If we're running during init we cannot update a monitor directly -
Expand DownExpand Up@@ -6570,7 +6567,7 @@ where
 }
 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 },
Expand DownExpand Up@@ -6852,7 +6849,7 @@ where
 let funding_txo = chan.context.get_funding_txo();
 let monitor_update_opt = try_chan_phase_entry!(self, chan.commitment_signed(&msg, &&logger), chan_phase_entry);
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 }
 Ok(())
Expand DownExpand Up@@ -7031,7 +7028,7 @@ where
 if let Some(monitor_update) = monitor_update_opt {
 let funding_txo = funding_txo_opt
 .expect("Funding outpoint must have been set for RAA handling to succeed");
 handle_new_monitor_update!(self, funding_txo, chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo, monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 htlcs_to_fail
Expand DownExpand Up@@ -7372,7 +7369,7 @@ where
 if let Some(monitor_update) = monitor_opt {
 has_monitor_update = true;

 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 continue 'peer_loop;
 }
Expand DownExpand Up@@ -8141,7 +8138,7 @@ where
 if let Some((monitor_update, further_update_exists)) = chan.unblock_next_blocked_monitor_update() {
 log_debug!(logger, "Unlocking monitor updating for channel {} and updating monitor",
 channel_id);
 handle_new_monitor_update!(self, channel_funding_outpoint, channel_id, monitor_update,
 handle_new_monitor_update!(self, channel_funding_outpoint, monitor_update,
 peer_state_lck, peer_state, per_peer_state, chan);
 if further_update_exists {
 // If there are more `ChannelMonitorUpdate`s to process, restart at the
Expand DownExpand Up@@ -9816,7 +9813,7 @@ impl_writeable_tlv_based!(PendingAddHTLCInfo, {
	(2, prev_short_channel_id, required),
	(4, prev_htlc_id, required),
	(6, prev_funding_outpoint, required),
	// Note that by the time we get past the required read for type 2 above, prev_funding_outpoint will be
	// Note that by the time we get past the required read for type 6 above, prev_funding_outpoint will be
	// filled in, so we can safely unwrap it here.
	(7, prev_channel_id, (default_value, ChannelId::v1_from_funding_outpoint(prev_funding_outpoint.0.unwrap()))),
});
Expand DownExpand Up@@ -11079,12 +11076,11 @@ where
 Some((blocked_node_id, _blocked_channel_outpoint, blocked_channel_id, blocking_action)), ..
 } = action {
 if let Some(blocked_peer_state) = per_peer_state.get(&blocked_node_id) {
 let channel_id = blocked_channel_id;
 log_trace!(logger,
 "Holding the next revoke_and_ack from {} until the preimage is durably persisted in the inbound edge's ChannelMonitor",
channel_id);
blocked_channel_id);
 blocked_peer_state.lock().unwrap().actions_blocking_raa_monitor_updates
 .entry(*channel_id)
 .entry(*blocked_channel_id)
 .or_insert_with(Vec::new).push(blocking_action.clone());
 } else {
 // If the channel we were blocking has closed, we don't need to
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use crate::ln::ChannelId;
use crate::ln::features::{InitFeatures, NodeFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, LightningError, SocketAddress, OnionMessageHandler, RoutingMessageHandler};
use crate::util::macro_logger::DebugFundingChannelId;
use crate::util::ser::{VecWriter, Writeable, Writer};
use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor, NextNoiseStep, MessageBuf, MSG_BUF_ALLOC_SIZE};
use crate::ln::wire;
Expand DownExpand Up@@ -2007,7 +2006,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.temporary_channel_id)), "Handling SendFundingCreated event in peer_handler for node {} for channel {} (which becomes {})",
 log_pubkey!(node_id),
 &msg.temporary_channel_id,
DebugFundingChannelId(&msg.funding_txid, msg.funding_output_index));
ChannelId::v1_from_funding_txid(msg.funding_txid.as_byte_array(), msg.funding_output_index));
 // TODO: If the peer is gone we should generate a DiscardFunding event
 // indicating to the wallet that they should just throw away this funding transaction
 self.enqueue_message(&mut *get_peer_for_forwarding!(node_id), msg);
Expand Down

9 changes: 0 additions & 9 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::chain::transaction::OutPoint;
use crate::ln::ChannelId;
use crate::sign::SpendableOutputDescriptor;

use bitcoin::hash_types::Txid;
use bitcoin::blockdata::transaction::Transaction;

use crate::routing::router::Route;
Expand DownExpand Up@@ -39,13 +37,6 @@ macro_rules! log_bytes {
	}
}

pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 ChannelId::v1_from_funding_outpoint(OutPoint { txid: self.0.clone(), index: self.1 }).fmt(f)
	}
}

pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
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('^' + ".*" + '
Fix followups to PR2797 by dunxen · Pull Request #2864 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix followups to PR2797#2864

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dunxen
merged 1 commit into

from

Feb 1, 2024
 Merged


Fix followups to PR2797
#2864
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


30 changes: 13 additions & 17 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,9 +1636,6 @@ pub struct ChannelDetails {
	pub counterparty: ChannelCounterparty,
	/// The Channel's funding transaction output, if we've negotiated the funding transaction with
	/// our counterparty already.
	///
	/// Note that, if this has been set, `channel_id` for V1-established channels will be equivalent to
	/// `ChannelId::v1_from_funding_outpoint(funding_txo.unwrap())`.
	pub funding_txo: Option<OutPoint>,
	/// The features which this channel operates with. See individual features for more info.
	///
Expand DownExpand Up@@ -2296,7 +2293,7 @@ macro_rules! handle_new_monitor_update {
 handle_new_monitor_update!($self, $update_res, $chan, _internal,
 handle_monitor_update_completion!($self, $peer_state_lock, $peer_state, $per_peer_state_lock, $chan))
	};
	($self: ident, $funding_txo: expr, $channel_id: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
	($self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let in_flight_updates = $peer_state.in_flight_monitor_updates.entry($funding_txo)
 .or_insert_with(Vec::new);
 // During startup, we push monitor updates as background events through to here in
Expand DownExpand Up@@ -2753,7 +2750,7 @@ where

 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt.take() {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), *channel_id, monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
Expand DownExpand Up@@ -3414,7 +3411,7 @@ where
 }, onion_packet, None, &self.fee_estimator, &&logger);
 match break_chan_phase_entry!(self, send_res, chan_phase_entry) {
 Some(monitor_update) => {
 match handle_new_monitor_update!(self, funding_txo, channel_id, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 match handle_new_monitor_update!(self, funding_txo, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 false => {
 // Note that MonitorUpdateInProgress here indicates (per function
 // docs) that we will resend the commitment update once monitor
Expand DownExpand Up@@ -4770,7 +4767,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase) => {
 if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
 updated_chan = true;
 handle_new_monitor_update!(self, funding_txo, channel_id, update.clone(),
 handle_new_monitor_update!(self, funding_txo, update.clone(),
 peer_state_lock, peer_state, per_peer_state, chan);
 } else {
 debug_assert!(false, "We shouldn't have an update for a non-funded channel");
Expand DownExpand Up@@ -5574,7 +5571,7 @@ where
 peer_state.monitor_update_blocked_actions.entry(chan_id).or_insert(Vec::new()).push(action);
 }
 if !during_init {
 handle_new_monitor_update!(self, prev_hop.outpoint, prev_hop.channel_id, monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, prev_hop.outpoint, monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 } else {
 // If we're running during init we cannot update a monitor directly -
Expand DownExpand Up@@ -6570,7 +6567,7 @@ where
 }
 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 },
Expand DownExpand Up@@ -6852,7 +6849,7 @@ where
 let funding_txo = chan.context.get_funding_txo();
 let monitor_update_opt = try_chan_phase_entry!(self, chan.commitment_signed(&msg, &&logger), chan_phase_entry);
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 }
 Ok(())
Expand DownExpand Up@@ -7031,7 +7028,7 @@ where
 if let Some(monitor_update) = monitor_update_opt {
 let funding_txo = funding_txo_opt
 .expect("Funding outpoint must have been set for RAA handling to succeed");
 handle_new_monitor_update!(self, funding_txo, chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo, monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 htlcs_to_fail
Expand DownExpand Up@@ -7372,7 +7369,7 @@ where
 if let Some(monitor_update) = monitor_opt {
 has_monitor_update = true;

 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 continue 'peer_loop;
 }
Expand DownExpand Up@@ -8141,7 +8138,7 @@ where
 if let Some((monitor_update, further_update_exists)) = chan.unblock_next_blocked_monitor_update() {
 log_debug!(logger, "Unlocking monitor updating for channel {} and updating monitor",
 channel_id);
 handle_new_monitor_update!(self, channel_funding_outpoint, channel_id, monitor_update,
 handle_new_monitor_update!(self, channel_funding_outpoint, monitor_update,
 peer_state_lck, peer_state, per_peer_state, chan);
 if further_update_exists {
 // If there are more `ChannelMonitorUpdate`s to process, restart at the
Expand DownExpand Up@@ -9816,7 +9813,7 @@ impl_writeable_tlv_based!(PendingAddHTLCInfo, {
	(2, prev_short_channel_id, required),
	(4, prev_htlc_id, required),
	(6, prev_funding_outpoint, required),
	// Note that by the time we get past the required read for type 2 above, prev_funding_outpoint will be
	// Note that by the time we get past the required read for type 6 above, prev_funding_outpoint will be
	// filled in, so we can safely unwrap it here.
	(7, prev_channel_id, (default_value, ChannelId::v1_from_funding_outpoint(prev_funding_outpoint.0.unwrap()))),
});
Expand DownExpand Up@@ -11079,12 +11076,11 @@ where
 Some((blocked_node_id, _blocked_channel_outpoint, blocked_channel_id, blocking_action)), ..
 } = action {
 if let Some(blocked_peer_state) = per_peer_state.get(&blocked_node_id) {
 let channel_id = blocked_channel_id;
 log_trace!(logger,
 "Holding the next revoke_and_ack from {} until the preimage is durably persisted in the inbound edge's ChannelMonitor",
channel_id);
blocked_channel_id);
 blocked_peer_state.lock().unwrap().actions_blocking_raa_monitor_updates
 .entry(*channel_id)
 .entry(*blocked_channel_id)
 .or_insert_with(Vec::new).push(blocking_action.clone());
 } else {
 // If the channel we were blocking has closed, we don't need to
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use crate::ln::ChannelId;
use crate::ln::features::{InitFeatures, NodeFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, LightningError, SocketAddress, OnionMessageHandler, RoutingMessageHandler};
use crate::util::macro_logger::DebugFundingChannelId;
use crate::util::ser::{VecWriter, Writeable, Writer};
use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor, NextNoiseStep, MessageBuf, MSG_BUF_ALLOC_SIZE};
use crate::ln::wire;
Expand DownExpand Up@@ -2007,7 +2006,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.temporary_channel_id)), "Handling SendFundingCreated event in peer_handler for node {} for channel {} (which becomes {})",
 log_pubkey!(node_id),
 &msg.temporary_channel_id,
DebugFundingChannelId(&msg.funding_txid, msg.funding_output_index));
ChannelId::v1_from_funding_txid(msg.funding_txid.as_byte_array(), msg.funding_output_index));
 // TODO: If the peer is gone we should generate a DiscardFunding event
 // indicating to the wallet that they should just throw away this funding transaction
 self.enqueue_message(&mut *get_peer_for_forwarding!(node_id), msg);
Expand Down

9 changes: 0 additions & 9 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::chain::transaction::OutPoint;
use crate::ln::ChannelId;
use crate::sign::SpendableOutputDescriptor;

use bitcoin::hash_types::Txid;
use bitcoin::blockdata::transaction::Transaction;

use crate::routing::router::Route;
Expand DownExpand Up@@ -39,13 +37,6 @@ macro_rules! log_bytes {
	}
}

pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 ChannelId::v1_from_funding_outpoint(OutPoint { txid: self.0.clone(), index: self.1 }).fmt(f)
	}
}

pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
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('^' + ".*" + '
Fix followups to PR2797 by dunxen · Pull Request #2864 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix followups to PR2797#2864

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dunxen
merged 1 commit into

from

Feb 1, 2024
 Merged


Fix followups to PR2797
#2864
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


30 changes: 13 additions & 17 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,9 +1636,6 @@ pub struct ChannelDetails {
	pub counterparty: ChannelCounterparty,
	/// The Channel's funding transaction output, if we've negotiated the funding transaction with
	/// our counterparty already.
	///
	/// Note that, if this has been set, `channel_id` for V1-established channels will be equivalent to
	/// `ChannelId::v1_from_funding_outpoint(funding_txo.unwrap())`.
	pub funding_txo: Option<OutPoint>,
	/// The features which this channel operates with. See individual features for more info.
	///
Expand DownExpand Up@@ -2296,7 +2293,7 @@ macro_rules! handle_new_monitor_update {
 handle_new_monitor_update!($self, $update_res, $chan, _internal,
 handle_monitor_update_completion!($self, $peer_state_lock, $peer_state, $per_peer_state_lock, $chan))
	};
	($self: ident, $funding_txo: expr, $channel_id: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
	($self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let in_flight_updates = $peer_state.in_flight_monitor_updates.entry($funding_txo)
 .or_insert_with(Vec::new);
 // During startup, we push monitor updates as background events through to here in
Expand DownExpand Up@@ -2753,7 +2750,7 @@ where

 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt.take() {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), *channel_id, monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
Expand DownExpand Up@@ -3414,7 +3411,7 @@ where
 }, onion_packet, None, &self.fee_estimator, &&logger);
 match break_chan_phase_entry!(self, send_res, chan_phase_entry) {
 Some(monitor_update) => {
 match handle_new_monitor_update!(self, funding_txo, channel_id, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 match handle_new_monitor_update!(self, funding_txo, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 false => {
 // Note that MonitorUpdateInProgress here indicates (per function
 // docs) that we will resend the commitment update once monitor
Expand DownExpand Up@@ -4770,7 +4767,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase) => {
 if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
 updated_chan = true;
 handle_new_monitor_update!(self, funding_txo, channel_id, update.clone(),
 handle_new_monitor_update!(self, funding_txo, update.clone(),
 peer_state_lock, peer_state, per_peer_state, chan);
 } else {
 debug_assert!(false, "We shouldn't have an update for a non-funded channel");
Expand DownExpand Up@@ -5574,7 +5571,7 @@ where
 peer_state.monitor_update_blocked_actions.entry(chan_id).or_insert(Vec::new()).push(action);
 }
 if !during_init {
 handle_new_monitor_update!(self, prev_hop.outpoint, prev_hop.channel_id, monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, prev_hop.outpoint, monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 } else {
 // If we're running during init we cannot update a monitor directly -
Expand DownExpand Up@@ -6570,7 +6567,7 @@ where
 }
 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 },
Expand DownExpand Up@@ -6852,7 +6849,7 @@ where
 let funding_txo = chan.context.get_funding_txo();
 let monitor_update_opt = try_chan_phase_entry!(self, chan.commitment_signed(&msg, &&logger), chan_phase_entry);
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 }
 Ok(())
Expand DownExpand Up@@ -7031,7 +7028,7 @@ where
 if let Some(monitor_update) = monitor_update_opt {
 let funding_txo = funding_txo_opt
 .expect("Funding outpoint must have been set for RAA handling to succeed");
 handle_new_monitor_update!(self, funding_txo, chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo, monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 htlcs_to_fail
Expand DownExpand Up@@ -7372,7 +7369,7 @@ where
 if let Some(monitor_update) = monitor_opt {
 has_monitor_update = true;

 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 continue 'peer_loop;
 }
Expand DownExpand Up@@ -8141,7 +8138,7 @@ where
 if let Some((monitor_update, further_update_exists)) = chan.unblock_next_blocked_monitor_update() {
 log_debug!(logger, "Unlocking monitor updating for channel {} and updating monitor",
 channel_id);
 handle_new_monitor_update!(self, channel_funding_outpoint, channel_id, monitor_update,
 handle_new_monitor_update!(self, channel_funding_outpoint, monitor_update,
 peer_state_lck, peer_state, per_peer_state, chan);
 if further_update_exists {
 // If there are more `ChannelMonitorUpdate`s to process, restart at the
Expand DownExpand Up@@ -9816,7 +9813,7 @@ impl_writeable_tlv_based!(PendingAddHTLCInfo, {
	(2, prev_short_channel_id, required),
	(4, prev_htlc_id, required),
	(6, prev_funding_outpoint, required),
	// Note that by the time we get past the required read for type 2 above, prev_funding_outpoint will be
	// Note that by the time we get past the required read for type 6 above, prev_funding_outpoint will be
	// filled in, so we can safely unwrap it here.
	(7, prev_channel_id, (default_value, ChannelId::v1_from_funding_outpoint(prev_funding_outpoint.0.unwrap()))),
});
Expand DownExpand Up@@ -11079,12 +11076,11 @@ where
 Some((blocked_node_id, _blocked_channel_outpoint, blocked_channel_id, blocking_action)), ..
 } = action {
 if let Some(blocked_peer_state) = per_peer_state.get(&blocked_node_id) {
 let channel_id = blocked_channel_id;
 log_trace!(logger,
 "Holding the next revoke_and_ack from {} until the preimage is durably persisted in the inbound edge's ChannelMonitor",
channel_id);
blocked_channel_id);
 blocked_peer_state.lock().unwrap().actions_blocking_raa_monitor_updates
 .entry(*channel_id)
 .entry(*blocked_channel_id)
 .or_insert_with(Vec::new).push(blocking_action.clone());
 } else {
 // If the channel we were blocking has closed, we don't need to
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use crate::ln::ChannelId;
use crate::ln::features::{InitFeatures, NodeFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, LightningError, SocketAddress, OnionMessageHandler, RoutingMessageHandler};
use crate::util::macro_logger::DebugFundingChannelId;
use crate::util::ser::{VecWriter, Writeable, Writer};
use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor, NextNoiseStep, MessageBuf, MSG_BUF_ALLOC_SIZE};
use crate::ln::wire;
Expand DownExpand Up@@ -2007,7 +2006,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.temporary_channel_id)), "Handling SendFundingCreated event in peer_handler for node {} for channel {} (which becomes {})",
 log_pubkey!(node_id),
 &msg.temporary_channel_id,
DebugFundingChannelId(&msg.funding_txid, msg.funding_output_index));
ChannelId::v1_from_funding_txid(msg.funding_txid.as_byte_array(), msg.funding_output_index));
 // TODO: If the peer is gone we should generate a DiscardFunding event
 // indicating to the wallet that they should just throw away this funding transaction
 self.enqueue_message(&mut *get_peer_for_forwarding!(node_id), msg);
Expand Down

9 changes: 0 additions & 9 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::chain::transaction::OutPoint;
use crate::ln::ChannelId;
use crate::sign::SpendableOutputDescriptor;

use bitcoin::hash_types::Txid;
use bitcoin::blockdata::transaction::Transaction;

use crate::routing::router::Route;
Expand DownExpand Up@@ -39,13 +37,6 @@ macro_rules! log_bytes {
	}
}

pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 ChannelId::v1_from_funding_outpoint(OutPoint { txid: self.0.clone(), index: self.1 }).fmt(f)
	}
}

pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
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); }
})();
})();
Fix followups to PR2797 by dunxen · Pull Request #2864 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix followups to PR2797#2864

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dunxen
merged 1 commit into

from

Feb 1, 2024
 Merged


Fix followups to PR2797
#2864
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


30 changes: 13 additions & 17 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,9 +1636,6 @@ pub struct ChannelDetails {
	pub counterparty: ChannelCounterparty,
	/// The Channel's funding transaction output, if we've negotiated the funding transaction with
	/// our counterparty already.
	///
	/// Note that, if this has been set, `channel_id` for V1-established channels will be equivalent to
	/// `ChannelId::v1_from_funding_outpoint(funding_txo.unwrap())`.
	pub funding_txo: Option<OutPoint>,
	/// The features which this channel operates with. See individual features for more info.
	///
Expand DownExpand Up@@ -2296,7 +2293,7 @@ macro_rules! handle_new_monitor_update {
 handle_new_monitor_update!($self, $update_res, $chan, _internal,
 handle_monitor_update_completion!($self, $peer_state_lock, $peer_state, $per_peer_state_lock, $chan))
	};
	($self: ident, $funding_txo: expr, $channel_id: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
	($self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let in_flight_updates = $peer_state.in_flight_monitor_updates.entry($funding_txo)
 .or_insert_with(Vec::new);
 // During startup, we push monitor updates as background events through to here in
Expand DownExpand Up@@ -2753,7 +2750,7 @@ where

 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt.take() {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), *channel_id, monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
Expand DownExpand Up@@ -3414,7 +3411,7 @@ where
 }, onion_packet, None, &self.fee_estimator, &&logger);
 match break_chan_phase_entry!(self, send_res, chan_phase_entry) {
 Some(monitor_update) => {
 match handle_new_monitor_update!(self, funding_txo, channel_id, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 match handle_new_monitor_update!(self, funding_txo, monitor_update, peer_state_lock, peer_state, per_peer_state, chan) {
 false => {
 // Note that MonitorUpdateInProgress here indicates (per function
 // docs) that we will resend the commitment update once monitor
Expand DownExpand Up@@ -4770,7 +4767,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase) => {
 if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
 updated_chan = true;
 handle_new_monitor_update!(self, funding_txo, channel_id, update.clone(),
 handle_new_monitor_update!(self, funding_txo, update.clone(),
 peer_state_lock, peer_state, per_peer_state, chan);
 } else {
 debug_assert!(false, "We shouldn't have an update for a non-funded channel");
Expand DownExpand Up@@ -5574,7 +5571,7 @@ where
 peer_state.monitor_update_blocked_actions.entry(chan_id).or_insert(Vec::new()).push(action);
 }
 if !during_init {
 handle_new_monitor_update!(self, prev_hop.outpoint, prev_hop.channel_id, monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, prev_hop.outpoint, monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 } else {
 // If we're running during init we cannot update a monitor directly -
Expand DownExpand Up@@ -6570,7 +6567,7 @@ where
 }
 // Update the monitor with the shutdown script if necessary.
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 },
Expand DownExpand Up@@ -6852,7 +6849,7 @@ where
 let funding_txo = chan.context.get_funding_txo();
 let monitor_update_opt = try_chan_phase_entry!(self, chan.commitment_signed(&msg, &&logger), chan_phase_entry);
 if let Some(monitor_update) = monitor_update_opt {
 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update, peer_state_lock,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update, peer_state_lock,
 peer_state, per_peer_state, chan);
 }
 Ok(())
Expand DownExpand Up@@ -7031,7 +7028,7 @@ where
 if let Some(monitor_update) = monitor_update_opt {
 let funding_txo = funding_txo_opt
 .expect("Funding outpoint must have been set for RAA handling to succeed");
 handle_new_monitor_update!(self, funding_txo, chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo, monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 }
 htlcs_to_fail
Expand DownExpand Up@@ -7372,7 +7369,7 @@ where
 if let Some(monitor_update) = monitor_opt {
 has_monitor_update = true;

 handle_new_monitor_update!(self, funding_txo.unwrap(), chan.context.channel_id(), monitor_update,
 handle_new_monitor_update!(self, funding_txo.unwrap(), monitor_update,
 peer_state_lock, peer_state, per_peer_state, chan);
 continue 'peer_loop;
 }
Expand DownExpand Up@@ -8141,7 +8138,7 @@ where
 if let Some((monitor_update, further_update_exists)) = chan.unblock_next_blocked_monitor_update() {
 log_debug!(logger, "Unlocking monitor updating for channel {} and updating monitor",
 channel_id);
 handle_new_monitor_update!(self, channel_funding_outpoint, channel_id, monitor_update,
 handle_new_monitor_update!(self, channel_funding_outpoint, monitor_update,
 peer_state_lck, peer_state, per_peer_state, chan);
 if further_update_exists {
 // If there are more `ChannelMonitorUpdate`s to process, restart at the
Expand DownExpand Up@@ -9816,7 +9813,7 @@ impl_writeable_tlv_based!(PendingAddHTLCInfo, {
	(2, prev_short_channel_id, required),
	(4, prev_htlc_id, required),
	(6, prev_funding_outpoint, required),
	// Note that by the time we get past the required read for type 2 above, prev_funding_outpoint will be
	// Note that by the time we get past the required read for type 6 above, prev_funding_outpoint will be
	// filled in, so we can safely unwrap it here.
	(7, prev_channel_id, (default_value, ChannelId::v1_from_funding_outpoint(prev_funding_outpoint.0.unwrap()))),
});
Expand DownExpand Up@@ -11079,12 +11076,11 @@ where
 Some((blocked_node_id, _blocked_channel_outpoint, blocked_channel_id, blocking_action)), ..
 } = action {
 if let Some(blocked_peer_state) = per_peer_state.get(&blocked_node_id) {
 let channel_id = blocked_channel_id;
 log_trace!(logger,
 "Holding the next revoke_and_ack from {} until the preimage is durably persisted in the inbound edge's ChannelMonitor",
channel_id);
blocked_channel_id);
 blocked_peer_state.lock().unwrap().actions_blocking_raa_monitor_updates
 .entry(*channel_id)
 .entry(*blocked_channel_id)
 .or_insert_with(Vec::new).push(blocking_action.clone());
 } else {
 // If the channel we were blocking has closed, we don't need to
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use crate::ln::ChannelId;
use crate::ln::features::{InitFeatures, NodeFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, LightningError, SocketAddress, OnionMessageHandler, RoutingMessageHandler};
use crate::util::macro_logger::DebugFundingChannelId;
use crate::util::ser::{VecWriter, Writeable, Writer};
use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor, NextNoiseStep, MessageBuf, MSG_BUF_ALLOC_SIZE};
use crate::ln::wire;
Expand DownExpand Up@@ -2007,7 +2006,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.temporary_channel_id)), "Handling SendFundingCreated event in peer_handler for node {} for channel {} (which becomes {})",
 log_pubkey!(node_id),
 &msg.temporary_channel_id,
DebugFundingChannelId(&msg.funding_txid, msg.funding_output_index));
ChannelId::v1_from_funding_txid(msg.funding_txid.as_byte_array(), msg.funding_output_index));
 // TODO: If the peer is gone we should generate a DiscardFunding event
 // indicating to the wallet that they should just throw away this funding transaction
 self.enqueue_message(&mut *get_peer_for_forwarding!(node_id), msg);
Expand Down

9 changes: 0 additions & 9 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::chain::transaction::OutPoint;
use crate::ln::ChannelId;
use crate::sign::SpendableOutputDescriptor;

use bitcoin::hash_types::Txid;
use bitcoin::blockdata::transaction::Transaction;

use crate::routing::router::Route;
Expand DownExpand Up@@ -39,13 +37,6 @@ macro_rules! log_bytes {
	}
}

pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 ChannelId::v1_from_funding_outpoint(OutPoint { txid: self.0.clone(), index: self.1 }).fmt(f)
	}
}

pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
Expand Down