Skip to content

Add option to generate outbound scid alias using intercept namespace#3839

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
aylagreystone wants to merge 1 commit into from
Closed

Add option to generate outbound scid alias using intercept namespace #3839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3771,19 +3771,21 @@ where

#[cfg(test)]
pub fn create_and_insert_outbound_scid_alias_for_test(&self) -> u64 {
self.create_and_insert_outbound_scid_alias()
self.create_and_insert_outbound_scid_alias_with_namespace(
fake_scid::Namespace::OutboundAlias
)
}

#[rustfmt::skip]
fn create_and_insert_outbound_scid_alias(&self) -> u64 {
fn create_and_insert_outbound_scid_alias_with_namespace(&self, namespace: fake_scid::Namespace) -> u64 {
let height = self.best_block.read().unwrap().height;
let mut outbound_scid_alias = 0;
let mut i = 0;
loop {
if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
outbound_scid_alias += 1;
} else {
outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
outbound_scid_alias = namespace.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
}
if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
break;
Expand All@@ -3794,6 +3796,15 @@ where
outbound_scid_alias
}

/// Determines the appropriate outbound SCID namespace based on the intercept_htlcs_on_channel configuration.
fn get_outbound_scid_namespace(intercept_htlcs_on_channel: bool) -> fake_scid::Namespace {
if intercept_htlcs_on_channel {
fake_scid::Namespace::Intercept
} else {
fake_scid::Namespace::OutboundAlias
}
}

/// Creates a new outbound channel to the given remote node and with the given value.
///
/// `user_channel_id` will be provided back as in
Expand DownExpand Up@@ -3850,9 +3861,10 @@ where
}

let mut channel = {
let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
let their_features = &peer_state.latest_features;
let config = if override_config.is_some() { override_config.as_ref().unwrap() } else { &self.default_configuration };
let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
let their_features = &peer_state.latest_features;
match OutboundV1Channel::new(&self.fee_estimator, &self.entropy_source, &self.signer_provider, their_network_key,
their_features, channel_value_satoshis, push_msat, user_channel_id, config,
self.best_block.read().unwrap().height, outbound_scid_alias, temporary_channel_id, &*self.logger)
Expand DownExpand Up@@ -8191,7 +8203,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
}

// Now that we know we have a channel, assign an outbound SCID alias.
let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -8407,7 +8420,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
},
};

let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
let outbound_scid_namespace = Self::get_outbound_scid_namespace(self.default_configuration.channel_handshake_config.intercept_htlcs_on_channel);
let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -16303,6 +16317,7 @@ mod tests {
to_self_delay: Some(200),
max_accepted_htlcs: Some(5),
channel_reserve_proportional_millionths: Some(20000),
intercept_htlcs_on_channel: None,
}),
update_overrides: None,
};
Expand Down
1 change: 1 addition & 0 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7474,6 +7474,7 @@ pub fn test_manually_accept_inbound_channel_request() {
to_self_delay: None,
max_accepted_htlcs: Some(3),
channel_reserve_proportional_millionths: None,
intercept_htlcs_on_channel: None,
}),
update_overrides: Some(ChannelConfigUpdate {
forwarding_fee_proportional_millionths: None,
Expand Down
21 changes: 21 additions & 0 deletions lightning/src/util/config.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,18 @@ pub struct ChannelHandshakeConfig {
///
/// [`max_htlcs`]: crate::ln::chan_utils::max_htlcs
pub our_max_accepted_htlcs: u16,
/// If set, this channel's SCID alias will be generated in the intercept namespace, causing
/// all HTLCs sent to this channel to trigger [`Event::HTLCIntercepted`] events instead of
/// being automatically forwarded. This enables manual control over all payments to the channel.
///
/// Requires [`UserConfig::accept_intercept_htlcs`] to be `true`. Useful for scenarios like
/// fee-taking or conditional forwarding.
///
/// Default value: `false`
///
/// [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
/// [`UserConfig::accept_intercept_htlcs`]: crate::util::config::UserConfig::accept_intercept_htlcs
pub intercept_htlcs_on_channel: bool,
}

impl Default for ChannelHandshakeConfig {
Expand All@@ -250,6 +262,7 @@ impl Default for ChannelHandshakeConfig {
#[cfg(test)]
negotiate_anchor_zero_fee_commitments: false,
our_max_accepted_htlcs: 50,
intercept_htlcs_on_channel: false,
}
}
}
Expand All@@ -273,6 +286,7 @@ impl Readable for ChannelHandshakeConfig {
#[cfg(test)]
negotiate_anchor_zero_fee_commitments: Readable::read(reader)?,
our_max_accepted_htlcs: Readable::read(reader)?,
intercept_htlcs_on_channel: Readable::read(reader)?,
})
}
}
Expand DownExpand Up@@ -1009,6 +1023,9 @@ pub struct ChannelHandshakeConfigUpdate {
/// The Proportion of the channel value to configure as counterparty's channel reserve. See
/// [`ChannelHandshakeConfig::their_channel_reserve_proportional_millionths`].
pub channel_reserve_proportional_millionths: Option<u32>,
/// If set, allows this channel's SCID alias to be generated in the intercept namespace. See
/// [`ChannelHandshakeConfig::intercept_htlcs_on_channel`].
pub intercept_htlcs_on_channel: Option<bool>,
}

impl ChannelHandshakeConfig {
Expand DownExpand Up@@ -1039,5 +1056,9 @@ impl ChannelHandshakeConfig {
if let Some(channel_reserve) = config.channel_reserve_proportional_millionths {
self.their_channel_reserve_proportional_millionths = channel_reserve;
}

if let Some(intercept_htlcs) = config.intercept_htlcs_on_channel {
self.intercept_htlcs_on_channel = intercept_htlcs;
}
}
}
, '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" + '
Add option to generate outbound scid alias using intercept namespace by aylagreystone · Pull Request #3839 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add option to generate outbound scid alias using intercept namespace#3839

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

aylagreystone
wants to merge
1
commit into

from

 Closed


Add option to generate outbound scid alias using intercept namespace
#3839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 22 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3771,19 +3771,21 @@ where

	#[cfg(test)]
	pub fn create_and_insert_outbound_scid_alias_for_test(&self) -> u64 {
 self.create_and_insert_outbound_scid_alias()
 self.create_and_insert_outbound_scid_alias_with_namespace(
 fake_scid::Namespace::OutboundAlias
 )
	}

	#[rustfmt::skip]
	fn create_and_insert_outbound_scid_alias(&self) -> u64 {
	fn create_and_insert_outbound_scid_alias_with_namespace(&self, namespace: fake_scid::Namespace) -> u64 {
 let height = self.best_block.read().unwrap().height;
 let mut outbound_scid_alias = 0;
 let mut i = 0;
 loop {
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = namespace.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand All@@ -3794,6 +3796,15 @@ where
 outbound_scid_alias
	}

	/// Determines the appropriate outbound SCID namespace based on the intercept_htlcs_on_channel configuration.
	fn get_outbound_scid_namespace(intercept_htlcs_on_channel: bool) -> fake_scid::Namespace {
 if intercept_htlcs_on_channel {
 fake_scid::Namespace::Intercept
 } else {
 fake_scid::Namespace::OutboundAlias
 }
	}

	/// Creates a new outbound channel to the given remote node and with the given value.
	///
	/// `user_channel_id` will be provided back as in
Expand DownExpand Up@@ -3850,9 +3861,10 @@ where
 }

 let mut channel = {
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let their_features = &peer_state.latest_features;
 let config = if override_config.is_some() { override_config.as_ref().unwrap() } else { &self.default_configuration };
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 let their_features = &peer_state.latest_features;
 match OutboundV1Channel::new(&self.fee_estimator, &self.entropy_source, &self.signer_provider, their_network_key,
 their_features, channel_value_satoshis, push_msat, user_channel_id, config,
 self.best_block.read().unwrap().height, outbound_scid_alias, temporary_channel_id, &*self.logger)
Expand DownExpand Up@@ -8191,7 +8203,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 }

 // Now that we know we have a channel, assign an outbound SCID alias.
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -8407,7 +8420,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 },
 };

 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(self.default_configuration.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -16303,6 +16317,7 @@ mod tests {
 to_self_delay: Some(200),
 max_accepted_htlcs: Some(5),
 channel_reserve_proportional_millionths: Some(20000),
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: None,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7474,6 +7474,7 @@ pub fn test_manually_accept_inbound_channel_request() {
 to_self_delay: None,
 max_accepted_htlcs: Some(3),
 channel_reserve_proportional_millionths: None,
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: Some(ChannelConfigUpdate {
 forwarding_fee_proportional_millionths: None,
Expand Down

21 changes: 21 additions & 0 deletions
lightning/src/util/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,18 @@ pub struct ChannelHandshakeConfig {
	///
	/// [`max_htlcs`]: crate::ln::chan_utils::max_htlcs
	pub our_max_accepted_htlcs: u16,
	/// If set, this channel's SCID alias will be generated in the intercept namespace, causing
	/// all HTLCs sent to this channel to trigger [`Event::HTLCIntercepted`] events instead of
	/// being automatically forwarded. This enables manual control over all payments to the channel.
	///
	/// Requires [`UserConfig::accept_intercept_htlcs`] to be `true`. Useful for scenarios like
	/// fee-taking or conditional forwarding.
	///
	/// Default value: `false`
	///
	/// [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
	/// [`UserConfig::accept_intercept_htlcs`]: crate::util::config::UserConfig::accept_intercept_htlcs
	pub intercept_htlcs_on_channel: bool,
}

impl Default for ChannelHandshakeConfig {
Expand All@@ -250,6 +262,7 @@ impl Default for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: false,
 our_max_accepted_htlcs: 50,
 intercept_htlcs_on_channel: false,
 }
	}
}
Expand All@@ -273,6 +286,7 @@ impl Readable for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: Readable::read(reader)?,
 our_max_accepted_htlcs: Readable::read(reader)?,
 intercept_htlcs_on_channel: Readable::read(reader)?,
 })
	}
}
Expand DownExpand Up@@ -1009,6 +1023,9 @@ pub struct ChannelHandshakeConfigUpdate {
	/// The Proportion of the channel value to configure as counterparty's channel reserve. See
	/// [`ChannelHandshakeConfig::their_channel_reserve_proportional_millionths`].
	pub channel_reserve_proportional_millionths: Option<u32>,
	/// If set, allows this channel's SCID alias to be generated in the intercept namespace. See
	/// [`ChannelHandshakeConfig::intercept_htlcs_on_channel`].
	pub intercept_htlcs_on_channel: Option<bool>,
}

impl ChannelHandshakeConfig {
Expand DownExpand Up@@ -1039,5 +1056,9 @@ impl ChannelHandshakeConfig {
 if let Some(channel_reserve) = config.channel_reserve_proportional_millionths {
 self.their_channel_reserve_proportional_millionths = channel_reserve;
 }

 if let Some(intercept_htlcs) = config.intercept_htlcs_on_channel {
 self.intercept_htlcs_on_channel = intercept_htlcs;
 }
	}
}

, '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('^' + ".*" + '
Add option to generate outbound scid alias using intercept namespace by aylagreystone · Pull Request #3839 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add option to generate outbound scid alias using intercept namespace#3839

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

aylagreystone
wants to merge
1
commit into

from

 Closed


Add option to generate outbound scid alias using intercept namespace
#3839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 22 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3771,19 +3771,21 @@ where

	#[cfg(test)]
	pub fn create_and_insert_outbound_scid_alias_for_test(&self) -> u64 {
 self.create_and_insert_outbound_scid_alias()
 self.create_and_insert_outbound_scid_alias_with_namespace(
 fake_scid::Namespace::OutboundAlias
 )
	}

	#[rustfmt::skip]
	fn create_and_insert_outbound_scid_alias(&self) -> u64 {
	fn create_and_insert_outbound_scid_alias_with_namespace(&self, namespace: fake_scid::Namespace) -> u64 {
 let height = self.best_block.read().unwrap().height;
 let mut outbound_scid_alias = 0;
 let mut i = 0;
 loop {
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = namespace.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand All@@ -3794,6 +3796,15 @@ where
 outbound_scid_alias
	}

	/// Determines the appropriate outbound SCID namespace based on the intercept_htlcs_on_channel configuration.
	fn get_outbound_scid_namespace(intercept_htlcs_on_channel: bool) -> fake_scid::Namespace {
 if intercept_htlcs_on_channel {
 fake_scid::Namespace::Intercept
 } else {
 fake_scid::Namespace::OutboundAlias
 }
	}

	/// Creates a new outbound channel to the given remote node and with the given value.
	///
	/// `user_channel_id` will be provided back as in
Expand DownExpand Up@@ -3850,9 +3861,10 @@ where
 }

 let mut channel = {
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let their_features = &peer_state.latest_features;
 let config = if override_config.is_some() { override_config.as_ref().unwrap() } else { &self.default_configuration };
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 let their_features = &peer_state.latest_features;
 match OutboundV1Channel::new(&self.fee_estimator, &self.entropy_source, &self.signer_provider, their_network_key,
 their_features, channel_value_satoshis, push_msat, user_channel_id, config,
 self.best_block.read().unwrap().height, outbound_scid_alias, temporary_channel_id, &*self.logger)
Expand DownExpand Up@@ -8191,7 +8203,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 }

 // Now that we know we have a channel, assign an outbound SCID alias.
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -8407,7 +8420,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 },
 };

 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(self.default_configuration.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -16303,6 +16317,7 @@ mod tests {
 to_self_delay: Some(200),
 max_accepted_htlcs: Some(5),
 channel_reserve_proportional_millionths: Some(20000),
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: None,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7474,6 +7474,7 @@ pub fn test_manually_accept_inbound_channel_request() {
 to_self_delay: None,
 max_accepted_htlcs: Some(3),
 channel_reserve_proportional_millionths: None,
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: Some(ChannelConfigUpdate {
 forwarding_fee_proportional_millionths: None,
Expand Down

21 changes: 21 additions & 0 deletions
lightning/src/util/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,18 @@ pub struct ChannelHandshakeConfig {
	///
	/// [`max_htlcs`]: crate::ln::chan_utils::max_htlcs
	pub our_max_accepted_htlcs: u16,
	/// If set, this channel's SCID alias will be generated in the intercept namespace, causing
	/// all HTLCs sent to this channel to trigger [`Event::HTLCIntercepted`] events instead of
	/// being automatically forwarded. This enables manual control over all payments to the channel.
	///
	/// Requires [`UserConfig::accept_intercept_htlcs`] to be `true`. Useful for scenarios like
	/// fee-taking or conditional forwarding.
	///
	/// Default value: `false`
	///
	/// [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
	/// [`UserConfig::accept_intercept_htlcs`]: crate::util::config::UserConfig::accept_intercept_htlcs
	pub intercept_htlcs_on_channel: bool,
}

impl Default for ChannelHandshakeConfig {
Expand All@@ -250,6 +262,7 @@ impl Default for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: false,
 our_max_accepted_htlcs: 50,
 intercept_htlcs_on_channel: false,
 }
	}
}
Expand All@@ -273,6 +286,7 @@ impl Readable for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: Readable::read(reader)?,
 our_max_accepted_htlcs: Readable::read(reader)?,
 intercept_htlcs_on_channel: Readable::read(reader)?,
 })
	}
}
Expand DownExpand Up@@ -1009,6 +1023,9 @@ pub struct ChannelHandshakeConfigUpdate {
	/// The Proportion of the channel value to configure as counterparty's channel reserve. See
	/// [`ChannelHandshakeConfig::their_channel_reserve_proportional_millionths`].
	pub channel_reserve_proportional_millionths: Option<u32>,
	/// If set, allows this channel's SCID alias to be generated in the intercept namespace. See
	/// [`ChannelHandshakeConfig::intercept_htlcs_on_channel`].
	pub intercept_htlcs_on_channel: Option<bool>,
}

impl ChannelHandshakeConfig {
Expand DownExpand Up@@ -1039,5 +1056,9 @@ impl ChannelHandshakeConfig {
 if let Some(channel_reserve) = config.channel_reserve_proportional_millionths {
 self.their_channel_reserve_proportional_millionths = channel_reserve;
 }

 if let Some(intercept_htlcs) = config.intercept_htlcs_on_channel {
 self.intercept_htlcs_on_channel = intercept_htlcs;
 }
	}
}

, '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('^' + ".*" + '
Add option to generate outbound scid alias using intercept namespace by aylagreystone · Pull Request #3839 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add option to generate outbound scid alias using intercept namespace#3839

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

aylagreystone
wants to merge
1
commit into

from

 Closed


Add option to generate outbound scid alias using intercept namespace
#3839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 22 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3771,19 +3771,21 @@ where

	#[cfg(test)]
	pub fn create_and_insert_outbound_scid_alias_for_test(&self) -> u64 {
 self.create_and_insert_outbound_scid_alias()
 self.create_and_insert_outbound_scid_alias_with_namespace(
 fake_scid::Namespace::OutboundAlias
 )
	}

	#[rustfmt::skip]
	fn create_and_insert_outbound_scid_alias(&self) -> u64 {
	fn create_and_insert_outbound_scid_alias_with_namespace(&self, namespace: fake_scid::Namespace) -> u64 {
 let height = self.best_block.read().unwrap().height;
 let mut outbound_scid_alias = 0;
 let mut i = 0;
 loop {
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = namespace.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand All@@ -3794,6 +3796,15 @@ where
 outbound_scid_alias
	}

	/// Determines the appropriate outbound SCID namespace based on the intercept_htlcs_on_channel configuration.
	fn get_outbound_scid_namespace(intercept_htlcs_on_channel: bool) -> fake_scid::Namespace {
 if intercept_htlcs_on_channel {
 fake_scid::Namespace::Intercept
 } else {
 fake_scid::Namespace::OutboundAlias
 }
	}

	/// Creates a new outbound channel to the given remote node and with the given value.
	///
	/// `user_channel_id` will be provided back as in
Expand DownExpand Up@@ -3850,9 +3861,10 @@ where
 }

 let mut channel = {
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let their_features = &peer_state.latest_features;
 let config = if override_config.is_some() { override_config.as_ref().unwrap() } else { &self.default_configuration };
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 let their_features = &peer_state.latest_features;
 match OutboundV1Channel::new(&self.fee_estimator, &self.entropy_source, &self.signer_provider, their_network_key,
 their_features, channel_value_satoshis, push_msat, user_channel_id, config,
 self.best_block.read().unwrap().height, outbound_scid_alias, temporary_channel_id, &*self.logger)
Expand DownExpand Up@@ -8191,7 +8203,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 }

 // Now that we know we have a channel, assign an outbound SCID alias.
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -8407,7 +8420,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 },
 };

 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(self.default_configuration.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -16303,6 +16317,7 @@ mod tests {
 to_self_delay: Some(200),
 max_accepted_htlcs: Some(5),
 channel_reserve_proportional_millionths: Some(20000),
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: None,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7474,6 +7474,7 @@ pub fn test_manually_accept_inbound_channel_request() {
 to_self_delay: None,
 max_accepted_htlcs: Some(3),
 channel_reserve_proportional_millionths: None,
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: Some(ChannelConfigUpdate {
 forwarding_fee_proportional_millionths: None,
Expand Down

21 changes: 21 additions & 0 deletions
lightning/src/util/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,18 @@ pub struct ChannelHandshakeConfig {
	///
	/// [`max_htlcs`]: crate::ln::chan_utils::max_htlcs
	pub our_max_accepted_htlcs: u16,
	/// If set, this channel's SCID alias will be generated in the intercept namespace, causing
	/// all HTLCs sent to this channel to trigger [`Event::HTLCIntercepted`] events instead of
	/// being automatically forwarded. This enables manual control over all payments to the channel.
	///
	/// Requires [`UserConfig::accept_intercept_htlcs`] to be `true`. Useful for scenarios like
	/// fee-taking or conditional forwarding.
	///
	/// Default value: `false`
	///
	/// [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
	/// [`UserConfig::accept_intercept_htlcs`]: crate::util::config::UserConfig::accept_intercept_htlcs
	pub intercept_htlcs_on_channel: bool,
}

impl Default for ChannelHandshakeConfig {
Expand All@@ -250,6 +262,7 @@ impl Default for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: false,
 our_max_accepted_htlcs: 50,
 intercept_htlcs_on_channel: false,
 }
	}
}
Expand All@@ -273,6 +286,7 @@ impl Readable for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: Readable::read(reader)?,
 our_max_accepted_htlcs: Readable::read(reader)?,
 intercept_htlcs_on_channel: Readable::read(reader)?,
 })
	}
}
Expand DownExpand Up@@ -1009,6 +1023,9 @@ pub struct ChannelHandshakeConfigUpdate {
	/// The Proportion of the channel value to configure as counterparty's channel reserve. See
	/// [`ChannelHandshakeConfig::their_channel_reserve_proportional_millionths`].
	pub channel_reserve_proportional_millionths: Option<u32>,
	/// If set, allows this channel's SCID alias to be generated in the intercept namespace. See
	/// [`ChannelHandshakeConfig::intercept_htlcs_on_channel`].
	pub intercept_htlcs_on_channel: Option<bool>,
}

impl ChannelHandshakeConfig {
Expand DownExpand Up@@ -1039,5 +1056,9 @@ impl ChannelHandshakeConfig {
 if let Some(channel_reserve) = config.channel_reserve_proportional_millionths {
 self.their_channel_reserve_proportional_millionths = channel_reserve;
 }

 if let Some(intercept_htlcs) = config.intercept_htlcs_on_channel {
 self.intercept_htlcs_on_channel = intercept_htlcs;
 }
	}
}

, '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" + '
Add option to generate outbound scid alias using intercept namespace by aylagreystone · Pull Request #3839 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add option to generate outbound scid alias using intercept namespace#3839

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

aylagreystone
wants to merge
1
commit into

from

 Closed


Add option to generate outbound scid alias using intercept namespace
#3839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 22 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3771,19 +3771,21 @@ where

	#[cfg(test)]
	pub fn create_and_insert_outbound_scid_alias_for_test(&self) -> u64 {
 self.create_and_insert_outbound_scid_alias()
 self.create_and_insert_outbound_scid_alias_with_namespace(
 fake_scid::Namespace::OutboundAlias
 )
	}

	#[rustfmt::skip]
	fn create_and_insert_outbound_scid_alias(&self) -> u64 {
	fn create_and_insert_outbound_scid_alias_with_namespace(&self, namespace: fake_scid::Namespace) -> u64 {
 let height = self.best_block.read().unwrap().height;
 let mut outbound_scid_alias = 0;
 let mut i = 0;
 loop {
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = namespace.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand All@@ -3794,6 +3796,15 @@ where
 outbound_scid_alias
	}

	/// Determines the appropriate outbound SCID namespace based on the intercept_htlcs_on_channel configuration.
	fn get_outbound_scid_namespace(intercept_htlcs_on_channel: bool) -> fake_scid::Namespace {
 if intercept_htlcs_on_channel {
 fake_scid::Namespace::Intercept
 } else {
 fake_scid::Namespace::OutboundAlias
 }
	}

	/// Creates a new outbound channel to the given remote node and with the given value.
	///
	/// `user_channel_id` will be provided back as in
Expand DownExpand Up@@ -3850,9 +3861,10 @@ where
 }

 let mut channel = {
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let their_features = &peer_state.latest_features;
 let config = if override_config.is_some() { override_config.as_ref().unwrap() } else { &self.default_configuration };
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 let their_features = &peer_state.latest_features;
 match OutboundV1Channel::new(&self.fee_estimator, &self.entropy_source, &self.signer_provider, their_network_key,
 their_features, channel_value_satoshis, push_msat, user_channel_id, config,
 self.best_block.read().unwrap().height, outbound_scid_alias, temporary_channel_id, &*self.logger)
Expand DownExpand Up@@ -8191,7 +8203,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 }

 // Now that we know we have a channel, assign an outbound SCID alias.
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -8407,7 +8420,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 },
 };

 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(self.default_configuration.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -16303,6 +16317,7 @@ mod tests {
 to_self_delay: Some(200),
 max_accepted_htlcs: Some(5),
 channel_reserve_proportional_millionths: Some(20000),
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: None,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7474,6 +7474,7 @@ pub fn test_manually_accept_inbound_channel_request() {
 to_self_delay: None,
 max_accepted_htlcs: Some(3),
 channel_reserve_proportional_millionths: None,
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: Some(ChannelConfigUpdate {
 forwarding_fee_proportional_millionths: None,
Expand Down

21 changes: 21 additions & 0 deletions
lightning/src/util/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,18 @@ pub struct ChannelHandshakeConfig {
	///
	/// [`max_htlcs`]: crate::ln::chan_utils::max_htlcs
	pub our_max_accepted_htlcs: u16,
	/// If set, this channel's SCID alias will be generated in the intercept namespace, causing
	/// all HTLCs sent to this channel to trigger [`Event::HTLCIntercepted`] events instead of
	/// being automatically forwarded. This enables manual control over all payments to the channel.
	///
	/// Requires [`UserConfig::accept_intercept_htlcs`] to be `true`. Useful for scenarios like
	/// fee-taking or conditional forwarding.
	///
	/// Default value: `false`
	///
	/// [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
	/// [`UserConfig::accept_intercept_htlcs`]: crate::util::config::UserConfig::accept_intercept_htlcs
	pub intercept_htlcs_on_channel: bool,
}

impl Default for ChannelHandshakeConfig {
Expand All@@ -250,6 +262,7 @@ impl Default for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: false,
 our_max_accepted_htlcs: 50,
 intercept_htlcs_on_channel: false,
 }
	}
}
Expand All@@ -273,6 +286,7 @@ impl Readable for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: Readable::read(reader)?,
 our_max_accepted_htlcs: Readable::read(reader)?,
 intercept_htlcs_on_channel: Readable::read(reader)?,
 })
	}
}
Expand DownExpand Up@@ -1009,6 +1023,9 @@ pub struct ChannelHandshakeConfigUpdate {
	/// The Proportion of the channel value to configure as counterparty's channel reserve. See
	/// [`ChannelHandshakeConfig::their_channel_reserve_proportional_millionths`].
	pub channel_reserve_proportional_millionths: Option<u32>,
	/// If set, allows this channel's SCID alias to be generated in the intercept namespace. See
	/// [`ChannelHandshakeConfig::intercept_htlcs_on_channel`].
	pub intercept_htlcs_on_channel: Option<bool>,
}

impl ChannelHandshakeConfig {
Expand DownExpand Up@@ -1039,5 +1056,9 @@ impl ChannelHandshakeConfig {
 if let Some(channel_reserve) = config.channel_reserve_proportional_millionths {
 self.their_channel_reserve_proportional_millionths = channel_reserve;
 }

 if let Some(intercept_htlcs) = config.intercept_htlcs_on_channel {
 self.intercept_htlcs_on_channel = intercept_htlcs;
 }
	}
}

, '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('^' + ".*" + '
Add option to generate outbound scid alias using intercept namespace by aylagreystone · Pull Request #3839 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add option to generate outbound scid alias using intercept namespace#3839

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

aylagreystone
wants to merge
1
commit into

from

 Closed


Add option to generate outbound scid alias using intercept namespace
#3839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 22 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3771,19 +3771,21 @@ where

	#[cfg(test)]
	pub fn create_and_insert_outbound_scid_alias_for_test(&self) -> u64 {
 self.create_and_insert_outbound_scid_alias()
 self.create_and_insert_outbound_scid_alias_with_namespace(
 fake_scid::Namespace::OutboundAlias
 )
	}

	#[rustfmt::skip]
	fn create_and_insert_outbound_scid_alias(&self) -> u64 {
	fn create_and_insert_outbound_scid_alias_with_namespace(&self, namespace: fake_scid::Namespace) -> u64 {
 let height = self.best_block.read().unwrap().height;
 let mut outbound_scid_alias = 0;
 let mut i = 0;
 loop {
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = namespace.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand All@@ -3794,6 +3796,15 @@ where
 outbound_scid_alias
	}

	/// Determines the appropriate outbound SCID namespace based on the intercept_htlcs_on_channel configuration.
	fn get_outbound_scid_namespace(intercept_htlcs_on_channel: bool) -> fake_scid::Namespace {
 if intercept_htlcs_on_channel {
 fake_scid::Namespace::Intercept
 } else {
 fake_scid::Namespace::OutboundAlias
 }
	}

	/// Creates a new outbound channel to the given remote node and with the given value.
	///
	/// `user_channel_id` will be provided back as in
Expand DownExpand Up@@ -3850,9 +3861,10 @@ where
 }

 let mut channel = {
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let their_features = &peer_state.latest_features;
 let config = if override_config.is_some() { override_config.as_ref().unwrap() } else { &self.default_configuration };
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 let their_features = &peer_state.latest_features;
 match OutboundV1Channel::new(&self.fee_estimator, &self.entropy_source, &self.signer_provider, their_network_key,
 their_features, channel_value_satoshis, push_msat, user_channel_id, config,
 self.best_block.read().unwrap().height, outbound_scid_alias, temporary_channel_id, &*self.logger)
Expand DownExpand Up@@ -8191,7 +8203,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 }

 // Now that we know we have a channel, assign an outbound SCID alias.
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -8407,7 +8420,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 },
 };

 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(self.default_configuration.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -16303,6 +16317,7 @@ mod tests {
 to_self_delay: Some(200),
 max_accepted_htlcs: Some(5),
 channel_reserve_proportional_millionths: Some(20000),
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: None,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7474,6 +7474,7 @@ pub fn test_manually_accept_inbound_channel_request() {
 to_self_delay: None,
 max_accepted_htlcs: Some(3),
 channel_reserve_proportional_millionths: None,
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: Some(ChannelConfigUpdate {
 forwarding_fee_proportional_millionths: None,
Expand Down

21 changes: 21 additions & 0 deletions
lightning/src/util/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,18 @@ pub struct ChannelHandshakeConfig {
	///
	/// [`max_htlcs`]: crate::ln::chan_utils::max_htlcs
	pub our_max_accepted_htlcs: u16,
	/// If set, this channel's SCID alias will be generated in the intercept namespace, causing
	/// all HTLCs sent to this channel to trigger [`Event::HTLCIntercepted`] events instead of
	/// being automatically forwarded. This enables manual control over all payments to the channel.
	///
	/// Requires [`UserConfig::accept_intercept_htlcs`] to be `true`. Useful for scenarios like
	/// fee-taking or conditional forwarding.
	///
	/// Default value: `false`
	///
	/// [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
	/// [`UserConfig::accept_intercept_htlcs`]: crate::util::config::UserConfig::accept_intercept_htlcs
	pub intercept_htlcs_on_channel: bool,
}

impl Default for ChannelHandshakeConfig {
Expand All@@ -250,6 +262,7 @@ impl Default for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: false,
 our_max_accepted_htlcs: 50,
 intercept_htlcs_on_channel: false,
 }
	}
}
Expand All@@ -273,6 +286,7 @@ impl Readable for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: Readable::read(reader)?,
 our_max_accepted_htlcs: Readable::read(reader)?,
 intercept_htlcs_on_channel: Readable::read(reader)?,
 })
	}
}
Expand DownExpand Up@@ -1009,6 +1023,9 @@ pub struct ChannelHandshakeConfigUpdate {
	/// The Proportion of the channel value to configure as counterparty's channel reserve. See
	/// [`ChannelHandshakeConfig::their_channel_reserve_proportional_millionths`].
	pub channel_reserve_proportional_millionths: Option<u32>,
	/// If set, allows this channel's SCID alias to be generated in the intercept namespace. See
	/// [`ChannelHandshakeConfig::intercept_htlcs_on_channel`].
	pub intercept_htlcs_on_channel: Option<bool>,
}

impl ChannelHandshakeConfig {
Expand DownExpand Up@@ -1039,5 +1056,9 @@ impl ChannelHandshakeConfig {
 if let Some(channel_reserve) = config.channel_reserve_proportional_millionths {
 self.their_channel_reserve_proportional_millionths = channel_reserve;
 }

 if let Some(intercept_htlcs) = config.intercept_htlcs_on_channel {
 self.intercept_htlcs_on_channel = intercept_htlcs;
 }
	}
}

, '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('^' + ".*" + '
Add option to generate outbound scid alias using intercept namespace by aylagreystone · Pull Request #3839 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add option to generate outbound scid alias using intercept namespace#3839

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

aylagreystone
wants to merge
1
commit into

from

 Closed


Add option to generate outbound scid alias using intercept namespace
#3839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 22 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3771,19 +3771,21 @@ where

	#[cfg(test)]
	pub fn create_and_insert_outbound_scid_alias_for_test(&self) -> u64 {
 self.create_and_insert_outbound_scid_alias()
 self.create_and_insert_outbound_scid_alias_with_namespace(
 fake_scid::Namespace::OutboundAlias
 )
	}

	#[rustfmt::skip]
	fn create_and_insert_outbound_scid_alias(&self) -> u64 {
	fn create_and_insert_outbound_scid_alias_with_namespace(&self, namespace: fake_scid::Namespace) -> u64 {
 let height = self.best_block.read().unwrap().height;
 let mut outbound_scid_alias = 0;
 let mut i = 0;
 loop {
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = namespace.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand All@@ -3794,6 +3796,15 @@ where
 outbound_scid_alias
	}

	/// Determines the appropriate outbound SCID namespace based on the intercept_htlcs_on_channel configuration.
	fn get_outbound_scid_namespace(intercept_htlcs_on_channel: bool) -> fake_scid::Namespace {
 if intercept_htlcs_on_channel {
 fake_scid::Namespace::Intercept
 } else {
 fake_scid::Namespace::OutboundAlias
 }
	}

	/// Creates a new outbound channel to the given remote node and with the given value.
	///
	/// `user_channel_id` will be provided back as in
Expand DownExpand Up@@ -3850,9 +3861,10 @@ where
 }

 let mut channel = {
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let their_features = &peer_state.latest_features;
 let config = if override_config.is_some() { override_config.as_ref().unwrap() } else { &self.default_configuration };
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 let their_features = &peer_state.latest_features;
 match OutboundV1Channel::new(&self.fee_estimator, &self.entropy_source, &self.signer_provider, their_network_key,
 their_features, channel_value_satoshis, push_msat, user_channel_id, config,
 self.best_block.read().unwrap().height, outbound_scid_alias, temporary_channel_id, &*self.logger)
Expand DownExpand Up@@ -8191,7 +8203,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 }

 // Now that we know we have a channel, assign an outbound SCID alias.
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -8407,7 +8420,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 },
 };

 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(self.default_configuration.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -16303,6 +16317,7 @@ mod tests {
 to_self_delay: Some(200),
 max_accepted_htlcs: Some(5),
 channel_reserve_proportional_millionths: Some(20000),
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: None,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7474,6 +7474,7 @@ pub fn test_manually_accept_inbound_channel_request() {
 to_self_delay: None,
 max_accepted_htlcs: Some(3),
 channel_reserve_proportional_millionths: None,
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: Some(ChannelConfigUpdate {
 forwarding_fee_proportional_millionths: None,
Expand Down

21 changes: 21 additions & 0 deletions
lightning/src/util/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,18 @@ pub struct ChannelHandshakeConfig {
	///
	/// [`max_htlcs`]: crate::ln::chan_utils::max_htlcs
	pub our_max_accepted_htlcs: u16,
	/// If set, this channel's SCID alias will be generated in the intercept namespace, causing
	/// all HTLCs sent to this channel to trigger [`Event::HTLCIntercepted`] events instead of
	/// being automatically forwarded. This enables manual control over all payments to the channel.
	///
	/// Requires [`UserConfig::accept_intercept_htlcs`] to be `true`. Useful for scenarios like
	/// fee-taking or conditional forwarding.
	///
	/// Default value: `false`
	///
	/// [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
	/// [`UserConfig::accept_intercept_htlcs`]: crate::util::config::UserConfig::accept_intercept_htlcs
	pub intercept_htlcs_on_channel: bool,
}

impl Default for ChannelHandshakeConfig {
Expand All@@ -250,6 +262,7 @@ impl Default for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: false,
 our_max_accepted_htlcs: 50,
 intercept_htlcs_on_channel: false,
 }
	}
}
Expand All@@ -273,6 +286,7 @@ impl Readable for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: Readable::read(reader)?,
 our_max_accepted_htlcs: Readable::read(reader)?,
 intercept_htlcs_on_channel: Readable::read(reader)?,
 })
	}
}
Expand DownExpand Up@@ -1009,6 +1023,9 @@ pub struct ChannelHandshakeConfigUpdate {
	/// The Proportion of the channel value to configure as counterparty's channel reserve. See
	/// [`ChannelHandshakeConfig::their_channel_reserve_proportional_millionths`].
	pub channel_reserve_proportional_millionths: Option<u32>,
	/// If set, allows this channel's SCID alias to be generated in the intercept namespace. See
	/// [`ChannelHandshakeConfig::intercept_htlcs_on_channel`].
	pub intercept_htlcs_on_channel: Option<bool>,
}

impl ChannelHandshakeConfig {
Expand DownExpand Up@@ -1039,5 +1056,9 @@ impl ChannelHandshakeConfig {
 if let Some(channel_reserve) = config.channel_reserve_proportional_millionths {
 self.their_channel_reserve_proportional_millionths = channel_reserve;
 }

 if let Some(intercept_htlcs) = config.intercept_htlcs_on_channel {
 self.intercept_htlcs_on_channel = intercept_htlcs;
 }
	}
}

, '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); }
})();
})();
Add option to generate outbound scid alias using intercept namespace by aylagreystone · Pull Request #3839 · lightningdevkit/rust-lightning · GitHub
Skip to content
Add option to generate outbound scid alias using intercept namespace#3839

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

aylagreystone
wants to merge
1
commit into

from

 Closed


Add option to generate outbound scid alias using intercept namespace
#3839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 22 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3771,19 +3771,21 @@ where

	#[cfg(test)]
	pub fn create_and_insert_outbound_scid_alias_for_test(&self) -> u64 {
 self.create_and_insert_outbound_scid_alias()
 self.create_and_insert_outbound_scid_alias_with_namespace(
 fake_scid::Namespace::OutboundAlias
 )
	}

	#[rustfmt::skip]
	fn create_and_insert_outbound_scid_alias(&self) -> u64 {
	fn create_and_insert_outbound_scid_alias_with_namespace(&self, namespace: fake_scid::Namespace) -> u64 {
 let height = self.best_block.read().unwrap().height;
 let mut outbound_scid_alias = 0;
 let mut i = 0;
 loop {
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = namespace.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand All@@ -3794,6 +3796,15 @@ where
 outbound_scid_alias
	}

	/// Determines the appropriate outbound SCID namespace based on the intercept_htlcs_on_channel configuration.
	fn get_outbound_scid_namespace(intercept_htlcs_on_channel: bool) -> fake_scid::Namespace {
 if intercept_htlcs_on_channel {
 fake_scid::Namespace::Intercept
 } else {
 fake_scid::Namespace::OutboundAlias
 }
	}

	/// Creates a new outbound channel to the given remote node and with the given value.
	///
	/// `user_channel_id` will be provided back as in
Expand DownExpand Up@@ -3850,9 +3861,10 @@ where
 }

 let mut channel = {
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let their_features = &peer_state.latest_features;
 let config = if override_config.is_some() { override_config.as_ref().unwrap() } else { &self.default_configuration };
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 let their_features = &peer_state.latest_features;
 match OutboundV1Channel::new(&self.fee_estimator, &self.entropy_source, &self.signer_provider, their_network_key,
 their_features, channel_value_satoshis, push_msat, user_channel_id, config,
 self.best_block.read().unwrap().height, outbound_scid_alias, temporary_channel_id, &*self.logger)
Expand DownExpand Up@@ -8191,7 +8203,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 }

 // Now that we know we have a channel, assign an outbound SCID alias.
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(config.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -8407,7 +8420,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 },
 };

 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 let outbound_scid_namespace = Self::get_outbound_scid_namespace(self.default_configuration.channel_handshake_config.intercept_htlcs_on_channel);
 let outbound_scid_alias = self.create_and_insert_outbound_scid_alias_with_namespace(outbound_scid_namespace);
 channel.context_mut().set_outbound_scid_alias(outbound_scid_alias);

 if let Some(message_send_event) = message_send_event {
Expand DownExpand Up@@ -16303,6 +16317,7 @@ mod tests {
 to_self_delay: Some(200),
 max_accepted_htlcs: Some(5),
 channel_reserve_proportional_millionths: Some(20000),
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: None,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7474,6 +7474,7 @@ pub fn test_manually_accept_inbound_channel_request() {
 to_self_delay: None,
 max_accepted_htlcs: Some(3),
 channel_reserve_proportional_millionths: None,
 intercept_htlcs_on_channel: None,
 }),
 update_overrides: Some(ChannelConfigUpdate {
 forwarding_fee_proportional_millionths: None,
Expand Down

21 changes: 21 additions & 0 deletions
lightning/src/util/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,18 @@ pub struct ChannelHandshakeConfig {
	///
	/// [`max_htlcs`]: crate::ln::chan_utils::max_htlcs
	pub our_max_accepted_htlcs: u16,
	/// If set, this channel's SCID alias will be generated in the intercept namespace, causing
	/// all HTLCs sent to this channel to trigger [`Event::HTLCIntercepted`] events instead of
	/// being automatically forwarded. This enables manual control over all payments to the channel.
	///
	/// Requires [`UserConfig::accept_intercept_htlcs`] to be `true`. Useful for scenarios like
	/// fee-taking or conditional forwarding.
	///
	/// Default value: `false`
	///
	/// [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
	/// [`UserConfig::accept_intercept_htlcs`]: crate::util::config::UserConfig::accept_intercept_htlcs
	pub intercept_htlcs_on_channel: bool,
}

impl Default for ChannelHandshakeConfig {
Expand All@@ -250,6 +262,7 @@ impl Default for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: false,
 our_max_accepted_htlcs: 50,
 intercept_htlcs_on_channel: false,
 }
	}
}
Expand All@@ -273,6 +286,7 @@ impl Readable for ChannelHandshakeConfig {
 #[cfg(test)]
 negotiate_anchor_zero_fee_commitments: Readable::read(reader)?,
 our_max_accepted_htlcs: Readable::read(reader)?,
 intercept_htlcs_on_channel: Readable::read(reader)?,
 })
	}
}
Expand DownExpand Up@@ -1009,6 +1023,9 @@ pub struct ChannelHandshakeConfigUpdate {
	/// The Proportion of the channel value to configure as counterparty's channel reserve. See
	/// [`ChannelHandshakeConfig::their_channel_reserve_proportional_millionths`].
	pub channel_reserve_proportional_millionths: Option<u32>,
	/// If set, allows this channel's SCID alias to be generated in the intercept namespace. See
	/// [`ChannelHandshakeConfig::intercept_htlcs_on_channel`].
	pub intercept_htlcs_on_channel: Option<bool>,
}

impl ChannelHandshakeConfig {
Expand DownExpand Up@@ -1039,5 +1056,9 @@ impl ChannelHandshakeConfig {
 if let Some(channel_reserve) = config.channel_reserve_proportional_millionths {
 self.their_channel_reserve_proportional_millionths = channel_reserve;
 }

 if let Some(intercept_htlcs) = config.intercept_htlcs_on_channel {
 self.intercept_htlcs_on_channel = intercept_htlcs;
 }
	}
}