Skip to content

Only disable channels ~10 min after disconnect, rather than one#2198

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 2 commits into from
Apr 18, 2023
Merged

Only disable channels ~10 min after disconnect, rather than one #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e7000c
Set `channel_update` disable bit based on staged even for onions
TheBlueMatt Apr 17, 2023
89e063b
Only disable channels ~10 min after disconnect, rather than one
TheBlueMatt Apr 17, 2023
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
8 changes: 4 additions & 4 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -312,9 +312,9 @@ pub(super) enum ChannelUpdateStatus {
/// We've announced the channel as enabled and are connected to our peer.
Enabled,
/// Our channel is no longer live, but we haven't announced the channel as disabled yet.
DisabledStaged,
DisabledStaged(u8),
/// Our channel is live again, but we haven't announced the channel as enabled yet.
EnabledStaged,
EnabledStaged(u8),
/// We've announced the channel as disabled.
Disabled,
}
Expand DownExpand Up@@ -6193,8 +6193,8 @@ impl Writeable for ChannelUpdateStatus {
// channel as enabled, so we write 0. For EnabledStaged, we similarly write a 1.
match self {
ChannelUpdateStatus::Enabled => 0u8.write(writer)?,
ChannelUpdateStatus::DisabledStaged => 0u8.write(writer)?,
ChannelUpdateStatus::EnabledStaged => 1u8.write(writer)?,
ChannelUpdateStatus::DisabledStaged(_) => 0u8.write(writer)?,
ChannelUpdateStatus::EnabledStaged(_) => 1u8.write(writer)?,
ChannelUpdateStatus::Disabled => 1u8.write(writer)?,
}
Ok(())
Expand Down
74 changes: 54 additions & 20 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1070,6 +1070,14 @@ pub(crate) const MPP_TIMEOUT_TICKS: u8 = 3;
/// [`OutboundPayments::remove_stale_resolved_payments`].
pub(crate) const IDEMPOTENCY_TIMEOUT_TICKS: u8 = 7;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is disconnected
/// until we mark the channel disabled and gossip the update.
pub(crate) const DISABLE_GOSSIP_TICKS: u8 = 10;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is connected until
/// we mark the channel enabled and gossip the update.
pub(crate) const ENABLE_GOSSIP_TICKS: u8 = 5;

/// The maximum number of unfunded channels we can have per-peer before we start rejecting new
/// (inbound) ones. The number of peers with unfunded channels is limited separately in
/// [`MAX_UNFUNDED_CHANNEL_PEERS`].
Expand DownExpand Up@@ -2457,7 +2465,14 @@ where
// hopefully an attacker trying to path-trace payments cannot make this occur
// on a small/per-node/per-channel scale.
if !chan.is_live() { // channel_disabled
break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
// If the channel_update we're going to return is disabled (i.e. the
// peer has been disabled for some time), return `channel_disabled`,
// otherwise return `temporary_channel_failure`.
if chan_update_opt.as_ref().map(|u| u.contents.flags & 2 == 2).unwrap_or(false) {

@dunxendunxenApr 18, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The flag literals are never clear to me lol. But I know creating consts for all of them will be a bit noisy in the repo. I'd like to do it at some later stage though. Also with all the error codes.

@TheBlueMattTheBlueMattApr 18, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, we should, but doesn't have to happen now, its not much worse than it is upstream.

break Some(("Forwarding channel has been disconnected for some time.", 0x1000 | 20, chan_update_opt));
} else {
break Some(("Forwarding channel is not in a ready state.", 0x1000 | 7, chan_update_opt));
}
}
if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
Expand DownExpand Up@@ -2582,11 +2597,18 @@ where
log_trace!(self.logger, "Generating channel update for channel {}", log_bytes!(chan.channel_id()));
let were_node_one = self.our_network_pubkey.serialize()[..] < chan.get_counterparty_node_id().serialize()[..];

let enabled = chan.is_usable() && match chan.channel_update_status() {
ChannelUpdateStatus::Enabled => true,
ChannelUpdateStatus::DisabledStaged(_) => true,
ChannelUpdateStatus::Disabled => false,
ChannelUpdateStatus::EnabledStaged(_) => false,
};

let unsigned = msgs::UnsignedChannelUpdate {
chain_hash: self.genesis_hash,
short_channel_id,
timestamp: chan.get_update_time_counter(),
flags: (!were_node_one) as u8 | ((!chan.is_live() as u8) << 1),
flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
cltv_expiry_delta: chan.get_cltv_expiry_delta(),
htlc_minimum_msat: chan.get_counterparty_htlc_minimum_msat(),
htlc_maximum_msat: chan.get_announced_htlc_max_msat(),
Expand DownExpand Up@@ -3736,27 +3758,39 @@ where
}

match chan.channel_update_status() {
ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged),
ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged),
ChannelUpdateStatus::DisabledStaged if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
ChannelUpdateStatus::EnabledStaged if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
ChannelUpdateStatus::DisabledStaged if !chan.is_live() => {
if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
msg: update
});
ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(0)),
ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(0)),
ChannelUpdateStatus::DisabledStaged(_) if chan.is_live()
=> chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
ChannelUpdateStatus::EnabledStaged(_) if !chan.is_live()
=> chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
ChannelUpdateStatus::DisabledStaged(mut n) if !chan.is_live() => {
n += 1;
if n >= DISABLE_GOSSIP_TICKS {
chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
msg: update
});
}
should_persist = NotifyOption::DoPersist;
} else {
chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(n));
}
should_persist = NotifyOption::DoPersist;
chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
},
ChannelUpdateStatus::EnabledStaged if chan.is_live() => {
if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
msg: update
});
ChannelUpdateStatus::EnabledStaged(mut n) if chan.is_live() => {
n += 1;
if n >= ENABLE_GOSSIP_TICKS {
chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
msg: update
});
}
should_persist = NotifyOption::DoPersist;
} else {
chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(n));
}
should_persist = NotifyOption::DoPersist;
chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
},
_ => {},
}
Expand Down
6 changes: 2 additions & 4 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2724,10 +2724,9 @@ macro_rules! handle_chan_reestablish_msgs {
}

let mut had_channel_update = false; // ChannelUpdate may be now or later, but not both
if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
assert_eq!(*node_id, $dst_node.node.get_our_node_id());
idx += 1;
assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
had_channel_update = true;
}

Expand DownExpand Up@@ -2771,10 +2770,9 @@ macro_rules! handle_chan_reestablish_msgs {
}
}

if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
assert_eq!(*node_id, $dst_node.node.get_our_node_id());
idx += 1;
assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
assert!(!had_channel_update);
}

Expand Down
11 changes: 7 additions & 4 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ use crate::chain::keysinterface::{ChannelSigner, EcdsaChannelSigner, EntropySour
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, ClosureReason, HTLCDestination, PaymentFailureReason};
use crate::ln::{PaymentPreimage, PaymentSecret, PaymentHash};
use crate::ln::channel::{commitment_tx_base_weight, COMMITMENT_TX_WEIGHT_PER_HTLC, CONCURRENT_INBOUND_HTLC_FEE_BUFFER, FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE, MIN_AFFORDABLE_HTLC_COUNT};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, ENABLE_GOSSIP_TICKS, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channel::{Channel, ChannelError};
use crate::ln::{chan_utils, onion_utils};
use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
Expand DownExpand Up@@ -7100,8 +7100,9 @@ fn test_announce_disable_channels() {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

nodes[0].node.timer_tick_occurred(); // Enabled -> DisabledStaged
nodes[0].node.timer_tick_occurred(); // DisabledStaged -> Disabled
for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
nodes[0].node.timer_tick_occurred();
}
let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
assert_eq!(msg_events.len(), 3);
let mut chans_disabled = HashMap::new();
Expand DownExpand Up@@ -7141,7 +7142,9 @@ fn test_announce_disable_channels() {
nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[2]);
handle_chan_reestablish_msgs!(nodes[1], nodes[0]);

nodes[0].node.timer_tick_occurred();
for _ in 0..ENABLE_GOSSIP_TICKS {
nodes[0].node.timer_tick_occurred();
}
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
nodes[0].node.timer_tick_occurred();
let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
Expand Down
11 changes: 10 additions & 1 deletion lightning/src/ln/onion_route_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use crate::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentFailureReason};
use crate::ln::{PaymentHash, PaymentSecret};
use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::onion_utils;
use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
Expand DownExpand Up@@ -587,6 +587,15 @@ fn test_onion_failure() {
// disconnect event to the channel between nodes[1] ~ nodes[2]
nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());
}, true, Some(UPDATE|7), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
run_onion_failure_test("channel_disabled", 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {
// disconnect event to the channel between nodes[1] ~ nodes[2]
for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
nodes[1].node.timer_tick_occurred();
nodes[2].node.timer_tick_occurred();
}
nodes[1].node.get_and_clear_pending_msg_events();
nodes[2].node.get_and_clear_pending_msg_events();
}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

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" + '
Only disable channels ~10 min after disconnect, rather than one by TheBlueMatt · Pull Request #2198 · lightningdevkit/rust-lightning · GitHub
Skip to content
Only disable channels ~10 min after disconnect, rather than one#2198

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Apr 18, 2023
 Merged


Only disable channels ~10 min after disconnect, rather than one
#2198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6e7000c

Set `channel_update` disable bit based on staged even for onions


TheBlueMatt Apr 17, 2023
89e063b

Only disable channels ~10 min after disconnect, rather than one


TheBlueMatt Apr 17, 2023

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


8 changes: 4 additions & 4 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -312,9 +312,9 @@ pub(super) enum ChannelUpdateStatus {
	/// We've announced the channel as enabled and are connected to our peer.
	Enabled,
	/// Our channel is no longer live, but we haven't announced the channel as disabled yet.
	DisabledStaged,
	DisabledStaged(u8),
	/// Our channel is live again, but we haven't announced the channel as enabled yet.
	EnabledStaged,
	EnabledStaged(u8),
	/// We've announced the channel as disabled.
	Disabled,
}
Expand DownExpand Up@@ -6193,8 +6193,8 @@ impl Writeable for ChannelUpdateStatus {
 // channel as enabled, so we write 0. For EnabledStaged, we similarly write a 1.
 match self {
 ChannelUpdateStatus::Enabled => 0u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged => 1u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged(_) => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged(_) => 1u8.write(writer)?,
 ChannelUpdateStatus::Disabled => 1u8.write(writer)?,
 }
 Ok(())
Expand Down

74 changes: 54 additions & 20 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1070,6 +1070,14 @@ pub(crate) const MPP_TIMEOUT_TICKS: u8 = 3;
/// [`OutboundPayments::remove_stale_resolved_payments`].
pub(crate) const IDEMPOTENCY_TIMEOUT_TICKS: u8 = 7;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is disconnected
/// until we mark the channel disabled and gossip the update.
pub(crate) const DISABLE_GOSSIP_TICKS: u8 = 10;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is connected until
/// we mark the channel enabled and gossip the update.
pub(crate) const ENABLE_GOSSIP_TICKS: u8 = 5;

/// The maximum number of unfunded channels we can have per-peer before we start rejecting new
/// (inbound) ones. The number of peers with unfunded channels is limited separately in
/// [`MAX_UNFUNDED_CHANNEL_PEERS`].
Expand DownExpand Up@@ -2457,7 +2465,14 @@ where
 // hopefully an attacker trying to path-trace payments cannot make this occur
 // on a small/per-node/per-channel scale.
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 // If the channel_update we're going to return is disabled (i.e. the
 // peer has been disabled for some time), return `channel_disabled`,
 // otherwise return `temporary_channel_failure`.
 if chan_update_opt.as_ref().map(|u| u.contents.flags & 2 == 2).unwrap_or(false) {
@dunxendunxenApr 18, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The flag literals are never clear to me lol. But I know creating consts for all of them will be a bit noisy in the repo. I'd like to do it at some later stage though. Also with all the error codes.
@TheBlueMattTheBlueMattApr 18, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, we should, but doesn't have to happen now, its not much worse than it is upstream.
 break Some(("Forwarding channel has been disconnected for some time.", 0x1000 | 20, chan_update_opt));
 } else {
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 7, chan_update_opt));
 }
 }
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
Expand DownExpand Up@@ -2582,11 +2597,18 @@ where
 log_trace!(self.logger, "Generating channel update for channel {}", log_bytes!(chan.channel_id()));
 let were_node_one = self.our_network_pubkey.serialize()[..] < chan.get_counterparty_node_id().serialize()[..];

 let enabled = chan.is_usable() && match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled => true,
 ChannelUpdateStatus::DisabledStaged(_) => true,
 ChannelUpdateStatus::Disabled => false,
 ChannelUpdateStatus::EnabledStaged(_) => false,
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 short_channel_id,
 timestamp: chan.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!chan.is_live() as u8) << 1),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
 cltv_expiry_delta: chan.get_cltv_expiry_delta(),
 htlc_minimum_msat: chan.get_counterparty_htlc_minimum_msat(),
 htlc_maximum_msat: chan.get_announced_htlc_max_msat(),
Expand DownExpand Up@@ -3736,27 +3758,39 @@ where
 }

 match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged),
 ChannelUpdateStatus::DisabledStaged if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged if !chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(0)),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(0)),
 ChannelUpdateStatus::DisabledStaged(_) if chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged(_) if !chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged(mut n) if !chan.is_live() => {
 n += 1;
 if n >= DISABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 },
 ChannelUpdateStatus::EnabledStaged if chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::EnabledStaged(mut n) if chan.is_live() => {
 n += 1;
 if n >= ENABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 },
 _ => {},
 }
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2724,10 +2724,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }

 let mut had_channel_update = false; // ChannelUpdate may be now or later, but not both
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 had_channel_update = true;
 }

Expand DownExpand Up@@ -2771,10 +2770,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }
 }

 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 assert!(!had_channel_update);
 }

Expand Down

11 changes: 7 additions & 4 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ use crate::chain::keysinterface::{ChannelSigner, EcdsaChannelSigner, EntropySour
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, ClosureReason, HTLCDestination, PaymentFailureReason};
use crate::ln::{PaymentPreimage, PaymentSecret, PaymentHash};
use crate::ln::channel::{commitment_tx_base_weight, COMMITMENT_TX_WEIGHT_PER_HTLC, CONCURRENT_INBOUND_HTLC_FEE_BUFFER, FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE, MIN_AFFORDABLE_HTLC_COUNT};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, ENABLE_GOSSIP_TICKS, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channel::{Channel, ChannelError};
use crate::ln::{chan_utils, onion_utils};
use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
Expand DownExpand Up@@ -7100,8 +7100,9 @@ fn test_announce_disable_channels() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.timer_tick_occurred(); // Enabled -> DisabledStaged
	nodes[0].node.timer_tick_occurred(); // DisabledStaged -> Disabled
	for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[0].node.timer_tick_occurred();
	}
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let mut chans_disabled = HashMap::new();
Expand DownExpand Up@@ -7141,7 +7142,9 @@ fn test_announce_disable_channels() {
	nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[2]);
	handle_chan_reestablish_msgs!(nodes[1], nodes[0]);

	nodes[0].node.timer_tick_occurred();
	for _ in 0..ENABLE_GOSSIP_TICKS {
 nodes[0].node.timer_tick_occurred();
	}
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	nodes[0].node.timer_tick_occurred();
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
Expand Down

11 changes: 10 additions & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use crate::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentFailureReason};
use crate::ln::{PaymentHash, PaymentSecret};
use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::onion_utils;
use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
Expand DownExpand Up@@ -587,6 +587,15 @@ fn test_onion_failure() {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	}, true, Some(UPDATE|7), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	run_onion_failure_test("channel_disabled", 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[1].node.timer_tick_occurred();
 nodes[2].node.timer_tick_occurred();
 }
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

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('^' + ".*" + '
Only disable channels ~10 min after disconnect, rather than one by TheBlueMatt · Pull Request #2198 · lightningdevkit/rust-lightning · GitHub
Skip to content
Only disable channels ~10 min after disconnect, rather than one#2198

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Apr 18, 2023
 Merged


Only disable channels ~10 min after disconnect, rather than one
#2198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6e7000c

Set `channel_update` disable bit based on staged even for onions


TheBlueMatt Apr 17, 2023
89e063b

Only disable channels ~10 min after disconnect, rather than one


TheBlueMatt Apr 17, 2023

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


8 changes: 4 additions & 4 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -312,9 +312,9 @@ pub(super) enum ChannelUpdateStatus {
	/// We've announced the channel as enabled and are connected to our peer.
	Enabled,
	/// Our channel is no longer live, but we haven't announced the channel as disabled yet.
	DisabledStaged,
	DisabledStaged(u8),
	/// Our channel is live again, but we haven't announced the channel as enabled yet.
	EnabledStaged,
	EnabledStaged(u8),
	/// We've announced the channel as disabled.
	Disabled,
}
Expand DownExpand Up@@ -6193,8 +6193,8 @@ impl Writeable for ChannelUpdateStatus {
 // channel as enabled, so we write 0. For EnabledStaged, we similarly write a 1.
 match self {
 ChannelUpdateStatus::Enabled => 0u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged => 1u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged(_) => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged(_) => 1u8.write(writer)?,
 ChannelUpdateStatus::Disabled => 1u8.write(writer)?,
 }
 Ok(())
Expand Down

74 changes: 54 additions & 20 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1070,6 +1070,14 @@ pub(crate) const MPP_TIMEOUT_TICKS: u8 = 3;
/// [`OutboundPayments::remove_stale_resolved_payments`].
pub(crate) const IDEMPOTENCY_TIMEOUT_TICKS: u8 = 7;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is disconnected
/// until we mark the channel disabled and gossip the update.
pub(crate) const DISABLE_GOSSIP_TICKS: u8 = 10;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is connected until
/// we mark the channel enabled and gossip the update.
pub(crate) const ENABLE_GOSSIP_TICKS: u8 = 5;

/// The maximum number of unfunded channels we can have per-peer before we start rejecting new
/// (inbound) ones. The number of peers with unfunded channels is limited separately in
/// [`MAX_UNFUNDED_CHANNEL_PEERS`].
Expand DownExpand Up@@ -2457,7 +2465,14 @@ where
 // hopefully an attacker trying to path-trace payments cannot make this occur
 // on a small/per-node/per-channel scale.
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 // If the channel_update we're going to return is disabled (i.e. the
 // peer has been disabled for some time), return `channel_disabled`,
 // otherwise return `temporary_channel_failure`.
 if chan_update_opt.as_ref().map(|u| u.contents.flags & 2 == 2).unwrap_or(false) {
@dunxendunxenApr 18, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The flag literals are never clear to me lol. But I know creating consts for all of them will be a bit noisy in the repo. I'd like to do it at some later stage though. Also with all the error codes.
@TheBlueMattTheBlueMattApr 18, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, we should, but doesn't have to happen now, its not much worse than it is upstream.
 break Some(("Forwarding channel has been disconnected for some time.", 0x1000 | 20, chan_update_opt));
 } else {
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 7, chan_update_opt));
 }
 }
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
Expand DownExpand Up@@ -2582,11 +2597,18 @@ where
 log_trace!(self.logger, "Generating channel update for channel {}", log_bytes!(chan.channel_id()));
 let were_node_one = self.our_network_pubkey.serialize()[..] < chan.get_counterparty_node_id().serialize()[..];

 let enabled = chan.is_usable() && match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled => true,
 ChannelUpdateStatus::DisabledStaged(_) => true,
 ChannelUpdateStatus::Disabled => false,
 ChannelUpdateStatus::EnabledStaged(_) => false,
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 short_channel_id,
 timestamp: chan.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!chan.is_live() as u8) << 1),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
 cltv_expiry_delta: chan.get_cltv_expiry_delta(),
 htlc_minimum_msat: chan.get_counterparty_htlc_minimum_msat(),
 htlc_maximum_msat: chan.get_announced_htlc_max_msat(),
Expand DownExpand Up@@ -3736,27 +3758,39 @@ where
 }

 match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged),
 ChannelUpdateStatus::DisabledStaged if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged if !chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(0)),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(0)),
 ChannelUpdateStatus::DisabledStaged(_) if chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged(_) if !chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged(mut n) if !chan.is_live() => {
 n += 1;
 if n >= DISABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 },
 ChannelUpdateStatus::EnabledStaged if chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::EnabledStaged(mut n) if chan.is_live() => {
 n += 1;
 if n >= ENABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 },
 _ => {},
 }
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2724,10 +2724,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }

 let mut had_channel_update = false; // ChannelUpdate may be now or later, but not both
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 had_channel_update = true;
 }

Expand DownExpand Up@@ -2771,10 +2770,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }
 }

 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 assert!(!had_channel_update);
 }

Expand Down

11 changes: 7 additions & 4 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ use crate::chain::keysinterface::{ChannelSigner, EcdsaChannelSigner, EntropySour
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, ClosureReason, HTLCDestination, PaymentFailureReason};
use crate::ln::{PaymentPreimage, PaymentSecret, PaymentHash};
use crate::ln::channel::{commitment_tx_base_weight, COMMITMENT_TX_WEIGHT_PER_HTLC, CONCURRENT_INBOUND_HTLC_FEE_BUFFER, FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE, MIN_AFFORDABLE_HTLC_COUNT};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, ENABLE_GOSSIP_TICKS, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channel::{Channel, ChannelError};
use crate::ln::{chan_utils, onion_utils};
use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
Expand DownExpand Up@@ -7100,8 +7100,9 @@ fn test_announce_disable_channels() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.timer_tick_occurred(); // Enabled -> DisabledStaged
	nodes[0].node.timer_tick_occurred(); // DisabledStaged -> Disabled
	for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[0].node.timer_tick_occurred();
	}
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let mut chans_disabled = HashMap::new();
Expand DownExpand Up@@ -7141,7 +7142,9 @@ fn test_announce_disable_channels() {
	nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[2]);
	handle_chan_reestablish_msgs!(nodes[1], nodes[0]);

	nodes[0].node.timer_tick_occurred();
	for _ in 0..ENABLE_GOSSIP_TICKS {
 nodes[0].node.timer_tick_occurred();
	}
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	nodes[0].node.timer_tick_occurred();
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
Expand Down

11 changes: 10 additions & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use crate::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentFailureReason};
use crate::ln::{PaymentHash, PaymentSecret};
use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::onion_utils;
use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
Expand DownExpand Up@@ -587,6 +587,15 @@ fn test_onion_failure() {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	}, true, Some(UPDATE|7), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	run_onion_failure_test("channel_disabled", 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[1].node.timer_tick_occurred();
 nodes[2].node.timer_tick_occurred();
 }
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

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('^' + ".*" + '
Only disable channels ~10 min after disconnect, rather than one by TheBlueMatt · Pull Request #2198 · lightningdevkit/rust-lightning · GitHub
Skip to content
Only disable channels ~10 min after disconnect, rather than one#2198

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Apr 18, 2023
 Merged


Only disable channels ~10 min after disconnect, rather than one
#2198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6e7000c

Set `channel_update` disable bit based on staged even for onions


TheBlueMatt Apr 17, 2023
89e063b

Only disable channels ~10 min after disconnect, rather than one


TheBlueMatt Apr 17, 2023

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


8 changes: 4 additions & 4 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -312,9 +312,9 @@ pub(super) enum ChannelUpdateStatus {
	/// We've announced the channel as enabled and are connected to our peer.
	Enabled,
	/// Our channel is no longer live, but we haven't announced the channel as disabled yet.
	DisabledStaged,
	DisabledStaged(u8),
	/// Our channel is live again, but we haven't announced the channel as enabled yet.
	EnabledStaged,
	EnabledStaged(u8),
	/// We've announced the channel as disabled.
	Disabled,
}
Expand DownExpand Up@@ -6193,8 +6193,8 @@ impl Writeable for ChannelUpdateStatus {
 // channel as enabled, so we write 0. For EnabledStaged, we similarly write a 1.
 match self {
 ChannelUpdateStatus::Enabled => 0u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged => 1u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged(_) => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged(_) => 1u8.write(writer)?,
 ChannelUpdateStatus::Disabled => 1u8.write(writer)?,
 }
 Ok(())
Expand Down

74 changes: 54 additions & 20 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1070,6 +1070,14 @@ pub(crate) const MPP_TIMEOUT_TICKS: u8 = 3;
/// [`OutboundPayments::remove_stale_resolved_payments`].
pub(crate) const IDEMPOTENCY_TIMEOUT_TICKS: u8 = 7;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is disconnected
/// until we mark the channel disabled and gossip the update.
pub(crate) const DISABLE_GOSSIP_TICKS: u8 = 10;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is connected until
/// we mark the channel enabled and gossip the update.
pub(crate) const ENABLE_GOSSIP_TICKS: u8 = 5;

/// The maximum number of unfunded channels we can have per-peer before we start rejecting new
/// (inbound) ones. The number of peers with unfunded channels is limited separately in
/// [`MAX_UNFUNDED_CHANNEL_PEERS`].
Expand DownExpand Up@@ -2457,7 +2465,14 @@ where
 // hopefully an attacker trying to path-trace payments cannot make this occur
 // on a small/per-node/per-channel scale.
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 // If the channel_update we're going to return is disabled (i.e. the
 // peer has been disabled for some time), return `channel_disabled`,
 // otherwise return `temporary_channel_failure`.
 if chan_update_opt.as_ref().map(|u| u.contents.flags & 2 == 2).unwrap_or(false) {
@dunxendunxenApr 18, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The flag literals are never clear to me lol. But I know creating consts for all of them will be a bit noisy in the repo. I'd like to do it at some later stage though. Also with all the error codes.
@TheBlueMattTheBlueMattApr 18, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, we should, but doesn't have to happen now, its not much worse than it is upstream.
 break Some(("Forwarding channel has been disconnected for some time.", 0x1000 | 20, chan_update_opt));
 } else {
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 7, chan_update_opt));
 }
 }
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
Expand DownExpand Up@@ -2582,11 +2597,18 @@ where
 log_trace!(self.logger, "Generating channel update for channel {}", log_bytes!(chan.channel_id()));
 let were_node_one = self.our_network_pubkey.serialize()[..] < chan.get_counterparty_node_id().serialize()[..];

 let enabled = chan.is_usable() && match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled => true,
 ChannelUpdateStatus::DisabledStaged(_) => true,
 ChannelUpdateStatus::Disabled => false,
 ChannelUpdateStatus::EnabledStaged(_) => false,
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 short_channel_id,
 timestamp: chan.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!chan.is_live() as u8) << 1),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
 cltv_expiry_delta: chan.get_cltv_expiry_delta(),
 htlc_minimum_msat: chan.get_counterparty_htlc_minimum_msat(),
 htlc_maximum_msat: chan.get_announced_htlc_max_msat(),
Expand DownExpand Up@@ -3736,27 +3758,39 @@ where
 }

 match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged),
 ChannelUpdateStatus::DisabledStaged if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged if !chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(0)),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(0)),
 ChannelUpdateStatus::DisabledStaged(_) if chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged(_) if !chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged(mut n) if !chan.is_live() => {
 n += 1;
 if n >= DISABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 },
 ChannelUpdateStatus::EnabledStaged if chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::EnabledStaged(mut n) if chan.is_live() => {
 n += 1;
 if n >= ENABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 },
 _ => {},
 }
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2724,10 +2724,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }

 let mut had_channel_update = false; // ChannelUpdate may be now or later, but not both
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 had_channel_update = true;
 }

Expand DownExpand Up@@ -2771,10 +2770,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }
 }

 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 assert!(!had_channel_update);
 }

Expand Down

11 changes: 7 additions & 4 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ use crate::chain::keysinterface::{ChannelSigner, EcdsaChannelSigner, EntropySour
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, ClosureReason, HTLCDestination, PaymentFailureReason};
use crate::ln::{PaymentPreimage, PaymentSecret, PaymentHash};
use crate::ln::channel::{commitment_tx_base_weight, COMMITMENT_TX_WEIGHT_PER_HTLC, CONCURRENT_INBOUND_HTLC_FEE_BUFFER, FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE, MIN_AFFORDABLE_HTLC_COUNT};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, ENABLE_GOSSIP_TICKS, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channel::{Channel, ChannelError};
use crate::ln::{chan_utils, onion_utils};
use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
Expand DownExpand Up@@ -7100,8 +7100,9 @@ fn test_announce_disable_channels() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.timer_tick_occurred(); // Enabled -> DisabledStaged
	nodes[0].node.timer_tick_occurred(); // DisabledStaged -> Disabled
	for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[0].node.timer_tick_occurred();
	}
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let mut chans_disabled = HashMap::new();
Expand DownExpand Up@@ -7141,7 +7142,9 @@ fn test_announce_disable_channels() {
	nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[2]);
	handle_chan_reestablish_msgs!(nodes[1], nodes[0]);

	nodes[0].node.timer_tick_occurred();
	for _ in 0..ENABLE_GOSSIP_TICKS {
 nodes[0].node.timer_tick_occurred();
	}
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	nodes[0].node.timer_tick_occurred();
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
Expand Down

11 changes: 10 additions & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use crate::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentFailureReason};
use crate::ln::{PaymentHash, PaymentSecret};
use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::onion_utils;
use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
Expand DownExpand Up@@ -587,6 +587,15 @@ fn test_onion_failure() {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	}, true, Some(UPDATE|7), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	run_onion_failure_test("channel_disabled", 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[1].node.timer_tick_occurred();
 nodes[2].node.timer_tick_occurred();
 }
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

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" + '
Only disable channels ~10 min after disconnect, rather than one by TheBlueMatt · Pull Request #2198 · lightningdevkit/rust-lightning · GitHub
Skip to content
Only disable channels ~10 min after disconnect, rather than one#2198

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Apr 18, 2023
 Merged


Only disable channels ~10 min after disconnect, rather than one
#2198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6e7000c

Set `channel_update` disable bit based on staged even for onions


TheBlueMatt Apr 17, 2023
89e063b

Only disable channels ~10 min after disconnect, rather than one


TheBlueMatt Apr 17, 2023

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


8 changes: 4 additions & 4 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -312,9 +312,9 @@ pub(super) enum ChannelUpdateStatus {
	/// We've announced the channel as enabled and are connected to our peer.
	Enabled,
	/// Our channel is no longer live, but we haven't announced the channel as disabled yet.
	DisabledStaged,
	DisabledStaged(u8),
	/// Our channel is live again, but we haven't announced the channel as enabled yet.
	EnabledStaged,
	EnabledStaged(u8),
	/// We've announced the channel as disabled.
	Disabled,
}
Expand DownExpand Up@@ -6193,8 +6193,8 @@ impl Writeable for ChannelUpdateStatus {
 // channel as enabled, so we write 0. For EnabledStaged, we similarly write a 1.
 match self {
 ChannelUpdateStatus::Enabled => 0u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged => 1u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged(_) => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged(_) => 1u8.write(writer)?,
 ChannelUpdateStatus::Disabled => 1u8.write(writer)?,
 }
 Ok(())
Expand Down

74 changes: 54 additions & 20 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1070,6 +1070,14 @@ pub(crate) const MPP_TIMEOUT_TICKS: u8 = 3;
/// [`OutboundPayments::remove_stale_resolved_payments`].
pub(crate) const IDEMPOTENCY_TIMEOUT_TICKS: u8 = 7;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is disconnected
/// until we mark the channel disabled and gossip the update.
pub(crate) const DISABLE_GOSSIP_TICKS: u8 = 10;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is connected until
/// we mark the channel enabled and gossip the update.
pub(crate) const ENABLE_GOSSIP_TICKS: u8 = 5;

/// The maximum number of unfunded channels we can have per-peer before we start rejecting new
/// (inbound) ones. The number of peers with unfunded channels is limited separately in
/// [`MAX_UNFUNDED_CHANNEL_PEERS`].
Expand DownExpand Up@@ -2457,7 +2465,14 @@ where
 // hopefully an attacker trying to path-trace payments cannot make this occur
 // on a small/per-node/per-channel scale.
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 // If the channel_update we're going to return is disabled (i.e. the
 // peer has been disabled for some time), return `channel_disabled`,
 // otherwise return `temporary_channel_failure`.
 if chan_update_opt.as_ref().map(|u| u.contents.flags & 2 == 2).unwrap_or(false) {
@dunxendunxenApr 18, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The flag literals are never clear to me lol. But I know creating consts for all of them will be a bit noisy in the repo. I'd like to do it at some later stage though. Also with all the error codes.
@TheBlueMattTheBlueMattApr 18, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, we should, but doesn't have to happen now, its not much worse than it is upstream.
 break Some(("Forwarding channel has been disconnected for some time.", 0x1000 | 20, chan_update_opt));
 } else {
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 7, chan_update_opt));
 }
 }
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
Expand DownExpand Up@@ -2582,11 +2597,18 @@ where
 log_trace!(self.logger, "Generating channel update for channel {}", log_bytes!(chan.channel_id()));
 let were_node_one = self.our_network_pubkey.serialize()[..] < chan.get_counterparty_node_id().serialize()[..];

 let enabled = chan.is_usable() && match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled => true,
 ChannelUpdateStatus::DisabledStaged(_) => true,
 ChannelUpdateStatus::Disabled => false,
 ChannelUpdateStatus::EnabledStaged(_) => false,
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 short_channel_id,
 timestamp: chan.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!chan.is_live() as u8) << 1),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
 cltv_expiry_delta: chan.get_cltv_expiry_delta(),
 htlc_minimum_msat: chan.get_counterparty_htlc_minimum_msat(),
 htlc_maximum_msat: chan.get_announced_htlc_max_msat(),
Expand DownExpand Up@@ -3736,27 +3758,39 @@ where
 }

 match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged),
 ChannelUpdateStatus::DisabledStaged if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged if !chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(0)),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(0)),
 ChannelUpdateStatus::DisabledStaged(_) if chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged(_) if !chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged(mut n) if !chan.is_live() => {
 n += 1;
 if n >= DISABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 },
 ChannelUpdateStatus::EnabledStaged if chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::EnabledStaged(mut n) if chan.is_live() => {
 n += 1;
 if n >= ENABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 },
 _ => {},
 }
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2724,10 +2724,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }

 let mut had_channel_update = false; // ChannelUpdate may be now or later, but not both
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 had_channel_update = true;
 }

Expand DownExpand Up@@ -2771,10 +2770,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }
 }

 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 assert!(!had_channel_update);
 }

Expand Down

11 changes: 7 additions & 4 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ use crate::chain::keysinterface::{ChannelSigner, EcdsaChannelSigner, EntropySour
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, ClosureReason, HTLCDestination, PaymentFailureReason};
use crate::ln::{PaymentPreimage, PaymentSecret, PaymentHash};
use crate::ln::channel::{commitment_tx_base_weight, COMMITMENT_TX_WEIGHT_PER_HTLC, CONCURRENT_INBOUND_HTLC_FEE_BUFFER, FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE, MIN_AFFORDABLE_HTLC_COUNT};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, ENABLE_GOSSIP_TICKS, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channel::{Channel, ChannelError};
use crate::ln::{chan_utils, onion_utils};
use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
Expand DownExpand Up@@ -7100,8 +7100,9 @@ fn test_announce_disable_channels() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.timer_tick_occurred(); // Enabled -> DisabledStaged
	nodes[0].node.timer_tick_occurred(); // DisabledStaged -> Disabled
	for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[0].node.timer_tick_occurred();
	}
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let mut chans_disabled = HashMap::new();
Expand DownExpand Up@@ -7141,7 +7142,9 @@ fn test_announce_disable_channels() {
	nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[2]);
	handle_chan_reestablish_msgs!(nodes[1], nodes[0]);

	nodes[0].node.timer_tick_occurred();
	for _ in 0..ENABLE_GOSSIP_TICKS {
 nodes[0].node.timer_tick_occurred();
	}
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	nodes[0].node.timer_tick_occurred();
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
Expand Down

11 changes: 10 additions & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use crate::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentFailureReason};
use crate::ln::{PaymentHash, PaymentSecret};
use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::onion_utils;
use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
Expand DownExpand Up@@ -587,6 +587,15 @@ fn test_onion_failure() {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	}, true, Some(UPDATE|7), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	run_onion_failure_test("channel_disabled", 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[1].node.timer_tick_occurred();
 nodes[2].node.timer_tick_occurred();
 }
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

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('^' + ".*" + '
Only disable channels ~10 min after disconnect, rather than one by TheBlueMatt · Pull Request #2198 · lightningdevkit/rust-lightning · GitHub
Skip to content
Only disable channels ~10 min after disconnect, rather than one#2198

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Apr 18, 2023
 Merged


Only disable channels ~10 min after disconnect, rather than one
#2198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6e7000c

Set `channel_update` disable bit based on staged even for onions


TheBlueMatt Apr 17, 2023
89e063b

Only disable channels ~10 min after disconnect, rather than one


TheBlueMatt Apr 17, 2023

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


8 changes: 4 additions & 4 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -312,9 +312,9 @@ pub(super) enum ChannelUpdateStatus {
	/// We've announced the channel as enabled and are connected to our peer.
	Enabled,
	/// Our channel is no longer live, but we haven't announced the channel as disabled yet.
	DisabledStaged,
	DisabledStaged(u8),
	/// Our channel is live again, but we haven't announced the channel as enabled yet.
	EnabledStaged,
	EnabledStaged(u8),
	/// We've announced the channel as disabled.
	Disabled,
}
Expand DownExpand Up@@ -6193,8 +6193,8 @@ impl Writeable for ChannelUpdateStatus {
 // channel as enabled, so we write 0. For EnabledStaged, we similarly write a 1.
 match self {
 ChannelUpdateStatus::Enabled => 0u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged => 1u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged(_) => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged(_) => 1u8.write(writer)?,
 ChannelUpdateStatus::Disabled => 1u8.write(writer)?,
 }
 Ok(())
Expand Down

74 changes: 54 additions & 20 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1070,6 +1070,14 @@ pub(crate) const MPP_TIMEOUT_TICKS: u8 = 3;
/// [`OutboundPayments::remove_stale_resolved_payments`].
pub(crate) const IDEMPOTENCY_TIMEOUT_TICKS: u8 = 7;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is disconnected
/// until we mark the channel disabled and gossip the update.
pub(crate) const DISABLE_GOSSIP_TICKS: u8 = 10;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is connected until
/// we mark the channel enabled and gossip the update.
pub(crate) const ENABLE_GOSSIP_TICKS: u8 = 5;

/// The maximum number of unfunded channels we can have per-peer before we start rejecting new
/// (inbound) ones. The number of peers with unfunded channels is limited separately in
/// [`MAX_UNFUNDED_CHANNEL_PEERS`].
Expand DownExpand Up@@ -2457,7 +2465,14 @@ where
 // hopefully an attacker trying to path-trace payments cannot make this occur
 // on a small/per-node/per-channel scale.
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 // If the channel_update we're going to return is disabled (i.e. the
 // peer has been disabled for some time), return `channel_disabled`,
 // otherwise return `temporary_channel_failure`.
 if chan_update_opt.as_ref().map(|u| u.contents.flags & 2 == 2).unwrap_or(false) {
@dunxendunxenApr 18, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The flag literals are never clear to me lol. But I know creating consts for all of them will be a bit noisy in the repo. I'd like to do it at some later stage though. Also with all the error codes.
@TheBlueMattTheBlueMattApr 18, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, we should, but doesn't have to happen now, its not much worse than it is upstream.
 break Some(("Forwarding channel has been disconnected for some time.", 0x1000 | 20, chan_update_opt));
 } else {
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 7, chan_update_opt));
 }
 }
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
Expand DownExpand Up@@ -2582,11 +2597,18 @@ where
 log_trace!(self.logger, "Generating channel update for channel {}", log_bytes!(chan.channel_id()));
 let were_node_one = self.our_network_pubkey.serialize()[..] < chan.get_counterparty_node_id().serialize()[..];

 let enabled = chan.is_usable() && match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled => true,
 ChannelUpdateStatus::DisabledStaged(_) => true,
 ChannelUpdateStatus::Disabled => false,
 ChannelUpdateStatus::EnabledStaged(_) => false,
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 short_channel_id,
 timestamp: chan.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!chan.is_live() as u8) << 1),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
 cltv_expiry_delta: chan.get_cltv_expiry_delta(),
 htlc_minimum_msat: chan.get_counterparty_htlc_minimum_msat(),
 htlc_maximum_msat: chan.get_announced_htlc_max_msat(),
Expand DownExpand Up@@ -3736,27 +3758,39 @@ where
 }

 match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged),
 ChannelUpdateStatus::DisabledStaged if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged if !chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(0)),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(0)),
 ChannelUpdateStatus::DisabledStaged(_) if chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged(_) if !chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged(mut n) if !chan.is_live() => {
 n += 1;
 if n >= DISABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 },
 ChannelUpdateStatus::EnabledStaged if chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::EnabledStaged(mut n) if chan.is_live() => {
 n += 1;
 if n >= ENABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 },
 _ => {},
 }
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2724,10 +2724,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }

 let mut had_channel_update = false; // ChannelUpdate may be now or later, but not both
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 had_channel_update = true;
 }

Expand DownExpand Up@@ -2771,10 +2770,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }
 }

 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 assert!(!had_channel_update);
 }

Expand Down

11 changes: 7 additions & 4 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ use crate::chain::keysinterface::{ChannelSigner, EcdsaChannelSigner, EntropySour
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, ClosureReason, HTLCDestination, PaymentFailureReason};
use crate::ln::{PaymentPreimage, PaymentSecret, PaymentHash};
use crate::ln::channel::{commitment_tx_base_weight, COMMITMENT_TX_WEIGHT_PER_HTLC, CONCURRENT_INBOUND_HTLC_FEE_BUFFER, FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE, MIN_AFFORDABLE_HTLC_COUNT};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, ENABLE_GOSSIP_TICKS, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channel::{Channel, ChannelError};
use crate::ln::{chan_utils, onion_utils};
use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
Expand DownExpand Up@@ -7100,8 +7100,9 @@ fn test_announce_disable_channels() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.timer_tick_occurred(); // Enabled -> DisabledStaged
	nodes[0].node.timer_tick_occurred(); // DisabledStaged -> Disabled
	for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[0].node.timer_tick_occurred();
	}
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let mut chans_disabled = HashMap::new();
Expand DownExpand Up@@ -7141,7 +7142,9 @@ fn test_announce_disable_channels() {
	nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[2]);
	handle_chan_reestablish_msgs!(nodes[1], nodes[0]);

	nodes[0].node.timer_tick_occurred();
	for _ in 0..ENABLE_GOSSIP_TICKS {
 nodes[0].node.timer_tick_occurred();
	}
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	nodes[0].node.timer_tick_occurred();
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
Expand Down

11 changes: 10 additions & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use crate::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentFailureReason};
use crate::ln::{PaymentHash, PaymentSecret};
use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::onion_utils;
use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
Expand DownExpand Up@@ -587,6 +587,15 @@ fn test_onion_failure() {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	}, true, Some(UPDATE|7), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	run_onion_failure_test("channel_disabled", 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[1].node.timer_tick_occurred();
 nodes[2].node.timer_tick_occurred();
 }
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

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('^' + ".*" + '
Only disable channels ~10 min after disconnect, rather than one by TheBlueMatt · Pull Request #2198 · lightningdevkit/rust-lightning · GitHub
Skip to content
Only disable channels ~10 min after disconnect, rather than one#2198

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Apr 18, 2023
 Merged


Only disable channels ~10 min after disconnect, rather than one
#2198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6e7000c

Set `channel_update` disable bit based on staged even for onions


TheBlueMatt Apr 17, 2023
89e063b

Only disable channels ~10 min after disconnect, rather than one


TheBlueMatt Apr 17, 2023

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


8 changes: 4 additions & 4 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -312,9 +312,9 @@ pub(super) enum ChannelUpdateStatus {
	/// We've announced the channel as enabled and are connected to our peer.
	Enabled,
	/// Our channel is no longer live, but we haven't announced the channel as disabled yet.
	DisabledStaged,
	DisabledStaged(u8),
	/// Our channel is live again, but we haven't announced the channel as enabled yet.
	EnabledStaged,
	EnabledStaged(u8),
	/// We've announced the channel as disabled.
	Disabled,
}
Expand DownExpand Up@@ -6193,8 +6193,8 @@ impl Writeable for ChannelUpdateStatus {
 // channel as enabled, so we write 0. For EnabledStaged, we similarly write a 1.
 match self {
 ChannelUpdateStatus::Enabled => 0u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged => 1u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged(_) => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged(_) => 1u8.write(writer)?,
 ChannelUpdateStatus::Disabled => 1u8.write(writer)?,
 }
 Ok(())
Expand Down

74 changes: 54 additions & 20 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1070,6 +1070,14 @@ pub(crate) const MPP_TIMEOUT_TICKS: u8 = 3;
/// [`OutboundPayments::remove_stale_resolved_payments`].
pub(crate) const IDEMPOTENCY_TIMEOUT_TICKS: u8 = 7;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is disconnected
/// until we mark the channel disabled and gossip the update.
pub(crate) const DISABLE_GOSSIP_TICKS: u8 = 10;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is connected until
/// we mark the channel enabled and gossip the update.
pub(crate) const ENABLE_GOSSIP_TICKS: u8 = 5;

/// The maximum number of unfunded channels we can have per-peer before we start rejecting new
/// (inbound) ones. The number of peers with unfunded channels is limited separately in
/// [`MAX_UNFUNDED_CHANNEL_PEERS`].
Expand DownExpand Up@@ -2457,7 +2465,14 @@ where
 // hopefully an attacker trying to path-trace payments cannot make this occur
 // on a small/per-node/per-channel scale.
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 // If the channel_update we're going to return is disabled (i.e. the
 // peer has been disabled for some time), return `channel_disabled`,
 // otherwise return `temporary_channel_failure`.
 if chan_update_opt.as_ref().map(|u| u.contents.flags & 2 == 2).unwrap_or(false) {
@dunxendunxenApr 18, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The flag literals are never clear to me lol. But I know creating consts for all of them will be a bit noisy in the repo. I'd like to do it at some later stage though. Also with all the error codes.
@TheBlueMattTheBlueMattApr 18, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, we should, but doesn't have to happen now, its not much worse than it is upstream.
 break Some(("Forwarding channel has been disconnected for some time.", 0x1000 | 20, chan_update_opt));
 } else {
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 7, chan_update_opt));
 }
 }
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
Expand DownExpand Up@@ -2582,11 +2597,18 @@ where
 log_trace!(self.logger, "Generating channel update for channel {}", log_bytes!(chan.channel_id()));
 let were_node_one = self.our_network_pubkey.serialize()[..] < chan.get_counterparty_node_id().serialize()[..];

 let enabled = chan.is_usable() && match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled => true,
 ChannelUpdateStatus::DisabledStaged(_) => true,
 ChannelUpdateStatus::Disabled => false,
 ChannelUpdateStatus::EnabledStaged(_) => false,
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 short_channel_id,
 timestamp: chan.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!chan.is_live() as u8) << 1),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
 cltv_expiry_delta: chan.get_cltv_expiry_delta(),
 htlc_minimum_msat: chan.get_counterparty_htlc_minimum_msat(),
 htlc_maximum_msat: chan.get_announced_htlc_max_msat(),
Expand DownExpand Up@@ -3736,27 +3758,39 @@ where
 }

 match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged),
 ChannelUpdateStatus::DisabledStaged if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged if !chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(0)),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(0)),
 ChannelUpdateStatus::DisabledStaged(_) if chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged(_) if !chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged(mut n) if !chan.is_live() => {
 n += 1;
 if n >= DISABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 },
 ChannelUpdateStatus::EnabledStaged if chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::EnabledStaged(mut n) if chan.is_live() => {
 n += 1;
 if n >= ENABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 },
 _ => {},
 }
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2724,10 +2724,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }

 let mut had_channel_update = false; // ChannelUpdate may be now or later, but not both
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 had_channel_update = true;
 }

Expand DownExpand Up@@ -2771,10 +2770,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }
 }

 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 assert!(!had_channel_update);
 }

Expand Down

11 changes: 7 additions & 4 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ use crate::chain::keysinterface::{ChannelSigner, EcdsaChannelSigner, EntropySour
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, ClosureReason, HTLCDestination, PaymentFailureReason};
use crate::ln::{PaymentPreimage, PaymentSecret, PaymentHash};
use crate::ln::channel::{commitment_tx_base_weight, COMMITMENT_TX_WEIGHT_PER_HTLC, CONCURRENT_INBOUND_HTLC_FEE_BUFFER, FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE, MIN_AFFORDABLE_HTLC_COUNT};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, ENABLE_GOSSIP_TICKS, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channel::{Channel, ChannelError};
use crate::ln::{chan_utils, onion_utils};
use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
Expand DownExpand Up@@ -7100,8 +7100,9 @@ fn test_announce_disable_channels() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.timer_tick_occurred(); // Enabled -> DisabledStaged
	nodes[0].node.timer_tick_occurred(); // DisabledStaged -> Disabled
	for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[0].node.timer_tick_occurred();
	}
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let mut chans_disabled = HashMap::new();
Expand DownExpand Up@@ -7141,7 +7142,9 @@ fn test_announce_disable_channels() {
	nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[2]);
	handle_chan_reestablish_msgs!(nodes[1], nodes[0]);

	nodes[0].node.timer_tick_occurred();
	for _ in 0..ENABLE_GOSSIP_TICKS {
 nodes[0].node.timer_tick_occurred();
	}
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	nodes[0].node.timer_tick_occurred();
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
Expand Down

11 changes: 10 additions & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use crate::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentFailureReason};
use crate::ln::{PaymentHash, PaymentSecret};
use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::onion_utils;
use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
Expand DownExpand Up@@ -587,6 +587,15 @@ fn test_onion_failure() {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	}, true, Some(UPDATE|7), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	run_onion_failure_test("channel_disabled", 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[1].node.timer_tick_occurred();
 nodes[2].node.timer_tick_occurred();
 }
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

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); }
})();
})();
Only disable channels ~10 min after disconnect, rather than one by TheBlueMatt · Pull Request #2198 · lightningdevkit/rust-lightning · GitHub
Skip to content
Only disable channels ~10 min after disconnect, rather than one#2198

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Apr 18, 2023
 Merged


Only disable channels ~10 min after disconnect, rather than one
#2198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6e7000c

Set `channel_update` disable bit based on staged even for onions


TheBlueMatt Apr 17, 2023
89e063b

Only disable channels ~10 min after disconnect, rather than one


TheBlueMatt Apr 17, 2023

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


8 changes: 4 additions & 4 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -312,9 +312,9 @@ pub(super) enum ChannelUpdateStatus {
	/// We've announced the channel as enabled and are connected to our peer.
	Enabled,
	/// Our channel is no longer live, but we haven't announced the channel as disabled yet.
	DisabledStaged,
	DisabledStaged(u8),
	/// Our channel is live again, but we haven't announced the channel as enabled yet.
	EnabledStaged,
	EnabledStaged(u8),
	/// We've announced the channel as disabled.
	Disabled,
}
Expand DownExpand Up@@ -6193,8 +6193,8 @@ impl Writeable for ChannelUpdateStatus {
 // channel as enabled, so we write 0. For EnabledStaged, we similarly write a 1.
 match self {
 ChannelUpdateStatus::Enabled => 0u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged => 1u8.write(writer)?,
 ChannelUpdateStatus::DisabledStaged(_) => 0u8.write(writer)?,
 ChannelUpdateStatus::EnabledStaged(_) => 1u8.write(writer)?,
 ChannelUpdateStatus::Disabled => 1u8.write(writer)?,
 }
 Ok(())
Expand Down

74 changes: 54 additions & 20 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1070,6 +1070,14 @@ pub(crate) const MPP_TIMEOUT_TICKS: u8 = 3;
/// [`OutboundPayments::remove_stale_resolved_payments`].
pub(crate) const IDEMPOTENCY_TIMEOUT_TICKS: u8 = 7;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is disconnected
/// until we mark the channel disabled and gossip the update.
pub(crate) const DISABLE_GOSSIP_TICKS: u8 = 10;

/// The number of ticks of [`ChannelManager::timer_tick_occurred`] where a peer is connected until
/// we mark the channel enabled and gossip the update.
pub(crate) const ENABLE_GOSSIP_TICKS: u8 = 5;

/// The maximum number of unfunded channels we can have per-peer before we start rejecting new
/// (inbound) ones. The number of peers with unfunded channels is limited separately in
/// [`MAX_UNFUNDED_CHANNEL_PEERS`].
Expand DownExpand Up@@ -2457,7 +2465,14 @@ where
 // hopefully an attacker trying to path-trace payments cannot make this occur
 // on a small/per-node/per-channel scale.
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 // If the channel_update we're going to return is disabled (i.e. the
 // peer has been disabled for some time), return `channel_disabled`,
 // otherwise return `temporary_channel_failure`.
 if chan_update_opt.as_ref().map(|u| u.contents.flags & 2 == 2).unwrap_or(false) {
@dunxendunxenApr 18, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The flag literals are never clear to me lol. But I know creating consts for all of them will be a bit noisy in the repo. I'd like to do it at some later stage though. Also with all the error codes.
@TheBlueMattTheBlueMattApr 18, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, we should, but doesn't have to happen now, its not much worse than it is upstream.
 break Some(("Forwarding channel has been disconnected for some time.", 0x1000 | 20, chan_update_opt));
 } else {
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 7, chan_update_opt));
 }
 }
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
Expand DownExpand Up@@ -2582,11 +2597,18 @@ where
 log_trace!(self.logger, "Generating channel update for channel {}", log_bytes!(chan.channel_id()));
 let were_node_one = self.our_network_pubkey.serialize()[..] < chan.get_counterparty_node_id().serialize()[..];

 let enabled = chan.is_usable() && match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled => true,
 ChannelUpdateStatus::DisabledStaged(_) => true,
 ChannelUpdateStatus::Disabled => false,
 ChannelUpdateStatus::EnabledStaged(_) => false,
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 short_channel_id,
 timestamp: chan.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!chan.is_live() as u8) << 1),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
 cltv_expiry_delta: chan.get_cltv_expiry_delta(),
 htlc_minimum_msat: chan.get_counterparty_htlc_minimum_msat(),
 htlc_maximum_msat: chan.get_announced_htlc_max_msat(),
Expand DownExpand Up@@ -3736,27 +3758,39 @@ where
 }

 match chan.channel_update_status() {
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged),
 ChannelUpdateStatus::DisabledStaged if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged if !chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::Enabled if !chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(0)),
 ChannelUpdateStatus::Disabled if chan.is_live() => chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(0)),
 ChannelUpdateStatus::DisabledStaged(_) if chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Enabled),
 ChannelUpdateStatus::EnabledStaged(_) if !chan.is_live()
 => chan.set_channel_update_status(ChannelUpdateStatus::Disabled),
 ChannelUpdateStatus::DisabledStaged(mut n) if !chan.is_live() => {
 n += 1;
 if n >= DISABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::DisabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Disabled);
 },
 ChannelUpdateStatus::EnabledStaged if chan.is_live() => {
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 ChannelUpdateStatus::EnabledStaged(mut n) if chan.is_live() => {
 n += 1;
 if n >= ENABLE_GOSSIP_TICKS {
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
 msg: update
 });
 }
 should_persist = NotifyOption::DoPersist;
 } else {
 chan.set_channel_update_status(ChannelUpdateStatus::EnabledStaged(n));
 }
 should_persist = NotifyOption::DoPersist;
 chan.set_channel_update_status(ChannelUpdateStatus::Enabled);
 },
 _ => {},
 }
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2724,10 +2724,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }

 let mut had_channel_update = false; // ChannelUpdate may be now or later, but not both
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 had_channel_update = true;
 }

Expand DownExpand Up@@ -2771,10 +2770,9 @@ macro_rules! handle_chan_reestablish_msgs {
 }
 }

 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, .. }) = msg_events.get(idx) {
 assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 idx += 1;
 assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 assert!(!had_channel_update);
 }

Expand Down

11 changes: 7 additions & 4 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ use crate::chain::keysinterface::{ChannelSigner, EcdsaChannelSigner, EntropySour
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, ClosureReason, HTLCDestination, PaymentFailureReason};
use crate::ln::{PaymentPreimage, PaymentSecret, PaymentHash};
use crate::ln::channel::{commitment_tx_base_weight, COMMITMENT_TX_WEIGHT_PER_HTLC, CONCURRENT_INBOUND_HTLC_FEE_BUFFER, FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE, MIN_AFFORDABLE_HTLC_COUNT};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channelmanager::{self, PaymentId, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, BREAKDOWN_TIMEOUT, ENABLE_GOSSIP_TICKS, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA};
use crate::ln::channel::{Channel, ChannelError};
use crate::ln::{chan_utils, onion_utils};
use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
Expand DownExpand Up@@ -7100,8 +7100,9 @@ fn test_announce_disable_channels() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.timer_tick_occurred(); // Enabled -> DisabledStaged
	nodes[0].node.timer_tick_occurred(); // DisabledStaged -> Disabled
	for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[0].node.timer_tick_occurred();
	}
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let mut chans_disabled = HashMap::new();
Expand DownExpand Up@@ -7141,7 +7142,9 @@ fn test_announce_disable_channels() {
	nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[2]);
	handle_chan_reestablish_msgs!(nodes[1], nodes[0]);

	nodes[0].node.timer_tick_occurred();
	for _ in 0..ENABLE_GOSSIP_TICKS {
 nodes[0].node.timer_tick_occurred();
	}
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	nodes[0].node.timer_tick_occurred();
	let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
Expand Down

11 changes: 10 additions & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use crate::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentFailureReason};
use crate::ln::{PaymentHash, PaymentSecret};
use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields};
use crate::ln::onion_utils;
use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
Expand DownExpand Up@@ -587,6 +587,15 @@ fn test_onion_failure() {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	}, true, Some(UPDATE|7), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	run_onion_failure_test("channel_disabled", 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {
 // disconnect event to the channel between nodes[1] ~ nodes[2]
 for _ in 0..DISABLE_GOSSIP_TICKS + 1 {
 nodes[1].node.timer_tick_occurred();
 nodes[2].node.timer_tick_occurred();
 }
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

Expand Down