Onion messages: flip feature bit 🎉#1688

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 8 commits into from
Sep 9, 2022
Merged

Onion messages: flip feature bit 🎉 #1688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fe8b4c7
Enable all feature sets to OR with another set of the same type
valentinewallace Sep 9, 2022
c106d4f
OR NodeFeatures from both Channel and Routing message handlers
valentinewallace Sep 9, 2022
7eee797
Add a new NodeFeatures constructor to capture the types of flags
valentinewallace Sep 9, 2022
f5e1255
Add missing wumbo feature bit docs
valentinewallace Aug 6, 2022
1ac3fcc
Support forwarding onion messages in advertised features
valentinewallace Aug 26, 2022
90f5906
OR InitFeatures and NodeFeatures from onion message handler
valentinewallace Sep 9, 2022
9c3b6d2
Don't advertise onion messages in known channel features
valentinewallace Sep 9, 2022
5d9dddd
Update ChannelMessageHandler::provided_node_features docs
valentinewallace Sep 9, 2022
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
1 change: 1 addition & 0 deletions lightning-net-tokio/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -582,6 +582,7 @@ mod tests {
fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::known() }
fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::known() }
}
impl ChannelMessageHandler for MsgHandler {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6122,7 +6122,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
}

fn provided_node_features(&self) -> NodeFeatures {
NodeFeatures::known()
NodeFeatures::known_channel_features()
}

fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
Expand Down
61 changes: 44 additions & 17 deletions lightning/src/ln/features.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,13 @@
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
//! - `BasicMPP` - requires/supports that a node can receive basic multi-part payments
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md#basic-multi-part-payments) for more information).
//! - `Wumbo` - requires/supports that a node create large channels. Called `option_support_large_channel` in the spec.

@ariardariardSep 9, 2022

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Could say "large channels (superior to MAX_FUNDING_SATOSHIS_NO_WUMBO)"

@valentinewallacevalentinewallaceSep 9, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, that const isn't public

//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
//! - `ShutdownAnySegwit` - requires/supports that future segwit versions are allowed in `shutdown`
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `OnionMessages` - requires/supports forwarding onion messages
//! (see [BOLT-7](https://github.com/lightning/bolts/pull/759/files) for more information).
//! TODO: update link
//! - `ChannelType` - node supports the channel_type field in open/accept
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `SCIDPrivacy` - supply channel aliases for routing
Expand DownExpand Up@@ -164,7 +169,8 @@ mod sealed {
],
optional_features: [
// Note that if new "non-channel-related" flags are added here they should be
// explicitly cleared in InitFeatures::known_channel_features.
// explicitly cleared in InitFeatures::known_channel_features and
// NodeFeatures::known_channel_features.
// Byte 0
DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
// Byte 1
Expand All@@ -174,7 +180,7 @@ mod sealed {
// Byte 3
ShutdownAnySegwit,
// Byte 4
,
OnionMessages,
// Byte 5
ChannelType | SCIDPrivacy,
// Byte 6
Expand DownExpand Up@@ -208,7 +214,7 @@ mod sealed {
// Byte 3
ShutdownAnySegwit,
// Byte 4
,
OnionMessages,
// Byte 5
ChannelType | SCIDPrivacy,
// Byte 6
Expand DownExpand Up@@ -435,8 +441,6 @@ mod sealed {
define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
"Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
// We do not yet advertise the onion messages feature bit, but we need to detect when peers
// support it.
define_feature!(39, OnionMessages, [InitContext, NodeContext],
"Feature flags for `option_onion_messages`.", set_onion_messages_optional,
set_onion_messages_required, supports_onion_messages, requires_onion_messages);
Expand DownExpand Up@@ -470,6 +474,17 @@ pub struct Features<T: sealed::Context> {
mark: PhantomData<T>,
}

impl <T: sealed::Context> Features<T> {
pub(crate) fn or(mut self, o: Self) -> Self {
let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
self.flags.resize(total_feature_len, 0u8);
for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
*byte |= *o_byte;
}
self
}
}

impl<T: sealed::Context> Clone for Features<T> {
fn clone(&self) -> Self {
Self {
Expand DownExpand Up@@ -532,16 +547,6 @@ impl InitFeatures {
Ok(())
}

/// or's another InitFeatures into this one.
pub(crate) fn or(mut self, o: InitFeatures) -> InitFeatures {
let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
self.flags.resize(total_feature_len, 0u8);
for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
*byte |= *o_byte;
}
self
}

/// Converts `InitFeatures` to `Features<C>`. Only known `InitFeatures` relevant to context `C`
/// are included in the result.
pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
Expand All@@ -554,6 +559,16 @@ impl InitFeatures {
Self::known()
.clear_initial_routing_sync()
.clear_gossip_queries()
.clear_onion_messages()
}
}

impl NodeFeatures {
/// Returns the set of known node features that are related to channels.
pub fn known_channel_features() -> NodeFeatures {
Self::known()
.clear_gossip_queries()
.clear_onion_messages()
}
}

Expand DownExpand Up@@ -787,6 +802,13 @@ impl<T: sealed::InitialRoutingSync> Features<T> {
}
}

impl<T: sealed::OnionMessages> Features<T> {
pub(crate) fn clear_onion_messages(mut self) -> Self {
<T as sealed::OnionMessages>::clear_bits(&mut self.flags);
self
}
}

impl<T: sealed::ShutdownAnySegwit> Features<T> {
#[cfg(test)]
pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
Expand DownExpand Up@@ -913,6 +935,11 @@ mod tests {
assert!(!InitFeatures::known().requires_wumbo());
assert!(!NodeFeatures::known().requires_wumbo());

assert!(InitFeatures::known().supports_onion_messages());
assert!(NodeFeatures::known().supports_onion_messages());
assert!(!InitFeatures::known().requires_onion_messages());
assert!(!NodeFeatures::known().requires_onion_messages());

assert!(InitFeatures::known().supports_zero_conf());
assert!(!InitFeatures::known().requires_zero_conf());
assert!(NodeFeatures::known().supports_zero_conf());
Expand DownExpand Up@@ -957,15 +984,15 @@ mod tests {
// - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
// - basic_mpp | wumbo
// - opt_shutdown_anysegwit
// -
// - onion_messages
// - option_channel_type | option_scid_alias
// - option_zeroconf
assert_eq!(node_features.flags.len(), 7);
assert_eq!(node_features.flags[0], 0b00000010);
assert_eq!(node_features.flags[1], 0b01010001);
assert_eq!(node_features.flags[2], 0b00001010);
assert_eq!(node_features.flags[3], 0b00001000);
assert_eq!(node_features.flags[4], 0b00000000);
assert_eq!(node_features.flags[4], 0b10000000);

@dunxendunxenSep 2, 2022

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.

I think I gotta spend some time figuring out how we handle feature bits internally lol

assert_eq!(node_features.flags[5], 0b10100000);
assert_eq!(node_features.flags[6], 0b00001000);
}
Expand Down
19 changes: 18 additions & 1 deletion lightning/src/ln/msgs.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -900,7 +900,7 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
// Handler information:
/// Gets the node feature flags which this handler itself supports. All available handlers are
/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
/// which are broadcasted in our node_announcement message.
/// which are broadcasted in our [`NodeAnnouncement`] message.
fn provided_node_features(&self) -> NodeFeatures;

/// Gets the init feature flags which should be sent to the given peer. All available handlers
Expand DownExpand Up@@ -958,6 +958,10 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;

// Handler information:
/// Gets the node feature flags which this handler itself supports. All available handlers are
/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
/// which are broadcasted in our [`NodeAnnouncement`] message.
fn provided_node_features(&self) -> NodeFeatures;
/// Gets the init feature flags which should be sent to the given peer. All available handlers
/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
/// which are sent in our [`Init`] message.
Expand All@@ -976,6 +980,19 @@ pub trait OnionMessageHandler : OnionMessageProvider {
/// Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to
/// drop and refuse to forward onion messages to this peer.
fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);

// Handler information:
/// Gets the node feature flags which this handler itself supports. All available handlers are
/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
/// which are broadcasted in our [`NodeAnnouncement`] message.
fn provided_node_features(&self) -> NodeFeatures;

/// Gets the init feature flags which should be sent to the given peer. All available handlers
/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
/// which are sent in our [`Init`] message.
///
/// Note that this method is called before [`Self::peer_connected`].
fn provided_init_features(&self, their_node_id: &PublicKey) -> InitFeatures;
}

mod fuzzy_internal_msgs {
Expand Down
16 changes: 13 additions & 3 deletions lightning/src/ln/peer_handler.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ impl RoutingMessageHandler for IgnoringMessageHandler {
fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: msgs::ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: msgs::QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
InitFeatures::empty()
}
Expand All@@ -88,6 +89,10 @@ impl OnionMessageHandler for IgnoringMessageHandler {
fn handle_onion_message(&self, _their_node_id: &PublicKey, _msg: &msgs::OnionMessage) {}
fn peer_connected(&self, _their_node_id: &PublicKey, _init: &msgs::Init) {}
fn peer_disconnected(&self, _their_node_id: &PublicKey, _no_connection_possible: bool) {}
fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
InitFeatures::empty()
}
}
impl Deref for IgnoringMessageHandler {
type Target = IgnoringMessageHandler;
Expand DownExpand Up@@ -1061,7 +1066,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
peer.their_node_id = Some(their_node_id);
insert_node_id!();
let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
.or(self.message_handler.route_handler.provided_init_features(&their_node_id));
.or(self.message_handler.route_handler.provided_init_features(&their_node_id))
.or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
self.enqueue_message(peer, &resp);
peer.awaiting_pong_timer_tick_intervals = 0;
Expand All@@ -1074,7 +1080,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
peer.their_node_id = Some(their_node_id);
insert_node_id!();
let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
.or(self.message_handler.route_handler.provided_init_features(&their_node_id));
.or(self.message_handler.route_handler.provided_init_features(&their_node_id))
.or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
self.enqueue_message(peer, &resp);
peer.awaiting_pong_timer_tick_intervals = 0;
Expand DownExpand Up@@ -1969,8 +1976,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
// addresses be sorted for future compatibility.
addresses.sort_by_key(|addr| addr.get_id());

let features = self.message_handler.chan_handler.provided_node_features()
.or(self.message_handler.route_handler.provided_node_features())
.or(self.message_handler.onion_message_handler.provided_node_features());
let announcement = msgs::UnsignedNodeAnnouncement {
features: self.message_handler.chan_handler.provided_node_features(),
features,
timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel) as u32,
node_id: PublicKey::from_secret_key(&self.secp_ctx, &self.our_node_secret),
rgb, alias, addresses,
Expand Down
13 changes: 13 additions & 0 deletions lightning/src/onion_message/messenger.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient, Sign};
use ln::features::{InitFeatures, NodeFeatures};
use ln::msgs::{self, OnionMessageHandler};
use ln::onion_utils;
use super::blinded_route::{BlindedRoute, ForwardTlvs, ReceiveTlvs};
Expand DownExpand Up@@ -345,6 +346,18 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessageHandler for OnionMessenger<Si
let mut pending_msgs = self.pending_messages.lock().unwrap();
pending_msgs.remove(their_node_id);
}

fn provided_node_features(&self) -> NodeFeatures {
let mut features = NodeFeatures::empty();
features.set_onion_messages_optional();
features
}

fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
let mut features = InitFeatures::empty();
features.set_onion_messages_optional();
features
}
}

impl<Signer: Sign, K: Deref, L: Deref> OnionMessageProvider for OnionMessenger<Signer, K, L>
Expand Down
6 changes: 6 additions & 0 deletions lightning/src/routing/gossip.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -571,6 +571,12 @@ where C::Target: chain::Access, L::Target: Logger
})
}

fn provided_node_features(&self) -> NodeFeatures {
let mut features = NodeFeatures::empty();
features.set_gossip_queries_optional();
features
}

fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
let mut features = InitFeatures::empty();
features.set_gossip_queries_optional();
Expand Down
8 changes: 7 additions & 1 deletion lightning/src/util/test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ impl msgs::ChannelMessageHandler for TestChannelMessageHandler {
self.received_msg(wire::Message::Error(msg.clone()));
}
fn provided_node_features(&self) -> NodeFeatures {
NodeFeatures::empty()
NodeFeatures::known_channel_features()
}
fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
InitFeatures::known_channel_features()
Expand DownExpand Up@@ -511,6 +511,12 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
Ok(())
}

fn provided_node_features(&self) -> NodeFeatures {
let mut features = NodeFeatures::empty();
features.set_gossip_queries_optional();
features
}

fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
let mut features = InitFeatures::empty();
features.set_gossip_queries_optional();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Onion messages: flip feature bit 🎉#1688

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

from

Sep 9, 2022
 Merged


Onion messages: flip feature bit 🎉
#1688
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fe8b4c7

Enable all feature sets to OR with another set of the same type


valentinewallace Sep 9, 2022
c106d4f

OR NodeFeatures from both Channel and Routing message handlers


valentinewallace Sep 9, 2022
7eee797

Add a new NodeFeatures constructor to capture the types of flags


valentinewallace Sep 9, 2022
f5e1255

Add missing wumbo feature bit docs


valentinewallace Aug 6, 2022
1ac3fcc

Support forwarding onion messages in advertised features


valentinewallace Aug 26, 2022
90f5906

OR InitFeatures and NodeFeatures from onion message handler


valentinewallace Sep 9, 2022
9c3b6d2

Don't advertise onion messages in known channel features


valentinewallace Sep 9, 2022
5d9dddd

Update ChannelMessageHandler::provided_node_features docs


valentinewallace Sep 9, 2022

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


1 change: 1 addition & 0 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -582,6 +582,7 @@ mod tests {
 fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::known() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::known() }
	}
	impl ChannelMessageHandler for MsgHandler {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6122,7 +6122,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
	}

	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::known()
 NodeFeatures::known_channel_features()
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
Expand Down

61 changes: 44 additions & 17 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,13 @@
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
//! - `BasicMPP` - requires/supports that a node can receive basic multi-part payments
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md#basic-multi-part-payments) for more information).
//! - `Wumbo` - requires/supports that a node create large channels. Called `option_support_large_channel` in the spec.
@ariardariardSep 9, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Could say "large channels (superior to MAX_FUNDING_SATOSHIS_NO_WUMBO)"
@valentinewallacevalentinewallaceSep 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Ah, that const isn't public
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
//! - `ShutdownAnySegwit` - requires/supports that future segwit versions are allowed in `shutdown`
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `OnionMessages` - requires/supports forwarding onion messages
//! (see [BOLT-7](https://github.com/lightning/bolts/pull/759/files) for more information).
//! TODO: update link
//! - `ChannelType` - node supports the channel_type field in open/accept
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `SCIDPrivacy` - supply channel aliases for routing
Expand DownExpand Up@@ -164,7 +169,8 @@ mod sealed {
 ],
 optional_features: [
 // Note that if new "non-channel-related" flags are added here they should be
 // explicitly cleared in InitFeatures::known_channel_features.
 // explicitly cleared in InitFeatures::known_channel_features and
 // NodeFeatures::known_channel_features.
 // Byte 0
 DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
 // Byte 1
Expand All@@ -174,7 +180,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -208,7 +214,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -435,8 +441,6 @@ mod sealed {
	define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
 "Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
 set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
	// We do not yet advertise the onion messages feature bit, but we need to detect when peers
	// support it.
	define_feature!(39, OnionMessages, [InitContext, NodeContext],
 "Feature flags for `option_onion_messages`.", set_onion_messages_optional,
 set_onion_messages_required, supports_onion_messages, requires_onion_messages);
Expand DownExpand Up@@ -470,6 +474,17 @@ pub struct Features<T: sealed::Context> {
	mark: PhantomData<T>,
}

impl <T: sealed::Context> Features<T> {
	pub(crate) fn or(mut self, o: Self) -> Self {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}
}

impl<T: sealed::Context> Clone for Features<T> {
	fn clone(&self) -> Self {
 Self {
Expand DownExpand Up@@ -532,16 +547,6 @@ impl InitFeatures {
 Ok(())
	}

	/// or's another InitFeatures into this one.
	pub(crate) fn or(mut self, o: InitFeatures) -> InitFeatures {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}

	/// Converts `InitFeatures` to `Features<C>`. Only known `InitFeatures` relevant to context `C`
	/// are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
Expand All@@ -554,6 +559,16 @@ impl InitFeatures {
 Self::known()
 .clear_initial_routing_sync()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

impl NodeFeatures {
	/// Returns the set of known node features that are related to channels.
	pub fn known_channel_features() -> NodeFeatures {
 Self::known()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

Expand DownExpand Up@@ -787,6 +802,13 @@ impl<T: sealed::InitialRoutingSync> Features<T> {
	}
}

impl<T: sealed::OnionMessages> Features<T> {
	pub(crate) fn clear_onion_messages(mut self) -> Self {
 <T as sealed::OnionMessages>::clear_bits(&mut self.flags);
 self
	}
}

impl<T: sealed::ShutdownAnySegwit> Features<T> {
	#[cfg(test)]
	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
Expand DownExpand Up@@ -913,6 +935,11 @@ mod tests {
 assert!(!InitFeatures::known().requires_wumbo());
 assert!(!NodeFeatures::known().requires_wumbo());

 assert!(InitFeatures::known().supports_onion_messages());
 assert!(NodeFeatures::known().supports_onion_messages());
 assert!(!InitFeatures::known().requires_onion_messages());
 assert!(!NodeFeatures::known().requires_onion_messages());

 assert!(InitFeatures::known().supports_zero_conf());
 assert!(!InitFeatures::known().requires_zero_conf());
 assert!(NodeFeatures::known().supports_zero_conf());
Expand DownExpand Up@@ -957,15 +984,15 @@ mod tests {
 // - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
 // - basic_mpp | wumbo
 // - opt_shutdown_anysegwit
 // -
 // - onion_messages
 // - option_channel_type | option_scid_alias
 // - option_zeroconf
 assert_eq!(node_features.flags.len(), 7);
 assert_eq!(node_features.flags[0], 0b00000010);
 assert_eq!(node_features.flags[1], 0b01010001);
 assert_eq!(node_features.flags[2], 0b00001010);
 assert_eq!(node_features.flags[3], 0b00001000);
 assert_eq!(node_features.flags[4], 0b00000000);
 assert_eq!(node_features.flags[4], 0b10000000);
@dunxendunxenSep 2, 2022

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.

I think I gotta spend some time figuring out how we handle feature bits internally lol
 assert_eq!(node_features.flags[5], 0b10100000);
 assert_eq!(node_features.flags[6], 0b00001000);
 }
Expand Down

19 changes: 18 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -900,7 +900,7 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our node_announcement message.
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
Expand DownExpand Up@@ -958,6 +958,10 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;
	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
Expand All@@ -976,6 +980,19 @@ pub trait OnionMessageHandler : OnionMessageProvider {
	/// Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to
	/// drop and refuse to forward onion messages to this peer.
	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
	///
	/// Note that this method is called before [`Self::peer_connected`].
	fn provided_init_features(&self, their_node_id: &PublicKey) -> InitFeatures;
}

mod fuzzy_internal_msgs {
Expand Down

16 changes: 13 additions & 3 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ impl RoutingMessageHandler for IgnoringMessageHandler {
	fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: msgs::ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: msgs::QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
Expand All@@ -88,6 +89,10 @@ impl OnionMessageHandler for IgnoringMessageHandler {
	fn handle_onion_message(&self, _their_node_id: &PublicKey, _msg: &msgs::OnionMessage) {}
	fn peer_connected(&self, _their_node_id: &PublicKey, _init: &msgs::Init) {}
	fn peer_disconnected(&self, _their_node_id: &PublicKey, _no_connection_possible: bool) {}
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
}
impl Deref for IgnoringMessageHandler {
	type Target = IgnoringMessageHandler;
Expand DownExpand Up@@ -1061,7 +1066,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand All@@ -1074,7 +1080,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand DownExpand Up@@ -1969,8 +1976,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 // addresses be sorted for future compatibility.
 addresses.sort_by_key(|addr| addr.get_id());

 let features = self.message_handler.chan_handler.provided_node_features()
 .or(self.message_handler.route_handler.provided_node_features())
 .or(self.message_handler.onion_message_handler.provided_node_features());
 let announcement = msgs::UnsignedNodeAnnouncement {
 features: self.message_handler.chan_handler.provided_node_features(),
 features,
 timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel) as u32,
 node_id: PublicKey::from_secret_key(&self.secp_ctx, &self.our_node_secret),
 rgb, alias, addresses,
Expand Down

13 changes: 13 additions & 0 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient, Sign};
use ln::features::{InitFeatures, NodeFeatures};
use ln::msgs::{self, OnionMessageHandler};
use ln::onion_utils;
use super::blinded_route::{BlindedRoute, ForwardTlvs, ReceiveTlvs};
Expand DownExpand Up@@ -345,6 +346,18 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessageHandler for OnionMessenger<Si
 let mut pending_msgs = self.pending_messages.lock().unwrap();
 pending_msgs.remove(their_node_id);
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_onion_messages_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_onion_messages_optional();
 features
	}
}

impl<Signer: Sign, K: Deref, L: Deref> OnionMessageProvider for OnionMessenger<Signer, K, L>
Expand Down

6 changes: 6 additions & 0 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,6 +571,12 @@ where C::Target: chain::Access, L::Target: Logger
 })
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

8 changes: 7 additions & 1 deletion
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ impl msgs::ChannelMessageHandler for TestChannelMessageHandler {
 self.received_msg(wire::Message::Error(msg.clone()));
	}
	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::empty()
 NodeFeatures::known_channel_features()
	}
	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 InitFeatures::known_channel_features()
Expand DownExpand Up@@ -511,6 +511,12 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 Ok(())
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Onion messages: flip feature bit 🎉#1688

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

from

Sep 9, 2022
 Merged


Onion messages: flip feature bit 🎉
#1688
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fe8b4c7

Enable all feature sets to OR with another set of the same type


valentinewallace Sep 9, 2022
c106d4f

OR NodeFeatures from both Channel and Routing message handlers


valentinewallace Sep 9, 2022
7eee797

Add a new NodeFeatures constructor to capture the types of flags


valentinewallace Sep 9, 2022
f5e1255

Add missing wumbo feature bit docs


valentinewallace Aug 6, 2022
1ac3fcc

Support forwarding onion messages in advertised features


valentinewallace Aug 26, 2022
90f5906

OR InitFeatures and NodeFeatures from onion message handler


valentinewallace Sep 9, 2022
9c3b6d2

Don't advertise onion messages in known channel features


valentinewallace Sep 9, 2022
5d9dddd

Update ChannelMessageHandler::provided_node_features docs


valentinewallace Sep 9, 2022

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


1 change: 1 addition & 0 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -582,6 +582,7 @@ mod tests {
 fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::known() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::known() }
	}
	impl ChannelMessageHandler for MsgHandler {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6122,7 +6122,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
	}

	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::known()
 NodeFeatures::known_channel_features()
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
Expand Down

61 changes: 44 additions & 17 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,13 @@
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
//! - `BasicMPP` - requires/supports that a node can receive basic multi-part payments
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md#basic-multi-part-payments) for more information).
//! - `Wumbo` - requires/supports that a node create large channels. Called `option_support_large_channel` in the spec.
@ariardariardSep 9, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Could say "large channels (superior to MAX_FUNDING_SATOSHIS_NO_WUMBO)"
@valentinewallacevalentinewallaceSep 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Ah, that const isn't public
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
//! - `ShutdownAnySegwit` - requires/supports that future segwit versions are allowed in `shutdown`
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `OnionMessages` - requires/supports forwarding onion messages
//! (see [BOLT-7](https://github.com/lightning/bolts/pull/759/files) for more information).
//! TODO: update link
//! - `ChannelType` - node supports the channel_type field in open/accept
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `SCIDPrivacy` - supply channel aliases for routing
Expand DownExpand Up@@ -164,7 +169,8 @@ mod sealed {
 ],
 optional_features: [
 // Note that if new "non-channel-related" flags are added here they should be
 // explicitly cleared in InitFeatures::known_channel_features.
 // explicitly cleared in InitFeatures::known_channel_features and
 // NodeFeatures::known_channel_features.
 // Byte 0
 DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
 // Byte 1
Expand All@@ -174,7 +180,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -208,7 +214,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -435,8 +441,6 @@ mod sealed {
	define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
 "Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
 set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
	// We do not yet advertise the onion messages feature bit, but we need to detect when peers
	// support it.
	define_feature!(39, OnionMessages, [InitContext, NodeContext],
 "Feature flags for `option_onion_messages`.", set_onion_messages_optional,
 set_onion_messages_required, supports_onion_messages, requires_onion_messages);
Expand DownExpand Up@@ -470,6 +474,17 @@ pub struct Features<T: sealed::Context> {
	mark: PhantomData<T>,
}

impl <T: sealed::Context> Features<T> {
	pub(crate) fn or(mut self, o: Self) -> Self {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}
}

impl<T: sealed::Context> Clone for Features<T> {
	fn clone(&self) -> Self {
 Self {
Expand DownExpand Up@@ -532,16 +547,6 @@ impl InitFeatures {
 Ok(())
	}

	/// or's another InitFeatures into this one.
	pub(crate) fn or(mut self, o: InitFeatures) -> InitFeatures {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}

	/// Converts `InitFeatures` to `Features<C>`. Only known `InitFeatures` relevant to context `C`
	/// are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
Expand All@@ -554,6 +559,16 @@ impl InitFeatures {
 Self::known()
 .clear_initial_routing_sync()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

impl NodeFeatures {
	/// Returns the set of known node features that are related to channels.
	pub fn known_channel_features() -> NodeFeatures {
 Self::known()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

Expand DownExpand Up@@ -787,6 +802,13 @@ impl<T: sealed::InitialRoutingSync> Features<T> {
	}
}

impl<T: sealed::OnionMessages> Features<T> {
	pub(crate) fn clear_onion_messages(mut self) -> Self {
 <T as sealed::OnionMessages>::clear_bits(&mut self.flags);
 self
	}
}

impl<T: sealed::ShutdownAnySegwit> Features<T> {
	#[cfg(test)]
	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
Expand DownExpand Up@@ -913,6 +935,11 @@ mod tests {
 assert!(!InitFeatures::known().requires_wumbo());
 assert!(!NodeFeatures::known().requires_wumbo());

 assert!(InitFeatures::known().supports_onion_messages());
 assert!(NodeFeatures::known().supports_onion_messages());
 assert!(!InitFeatures::known().requires_onion_messages());
 assert!(!NodeFeatures::known().requires_onion_messages());

 assert!(InitFeatures::known().supports_zero_conf());
 assert!(!InitFeatures::known().requires_zero_conf());
 assert!(NodeFeatures::known().supports_zero_conf());
Expand DownExpand Up@@ -957,15 +984,15 @@ mod tests {
 // - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
 // - basic_mpp | wumbo
 // - opt_shutdown_anysegwit
 // -
 // - onion_messages
 // - option_channel_type | option_scid_alias
 // - option_zeroconf
 assert_eq!(node_features.flags.len(), 7);
 assert_eq!(node_features.flags[0], 0b00000010);
 assert_eq!(node_features.flags[1], 0b01010001);
 assert_eq!(node_features.flags[2], 0b00001010);
 assert_eq!(node_features.flags[3], 0b00001000);
 assert_eq!(node_features.flags[4], 0b00000000);
 assert_eq!(node_features.flags[4], 0b10000000);
@dunxendunxenSep 2, 2022

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.

I think I gotta spend some time figuring out how we handle feature bits internally lol
 assert_eq!(node_features.flags[5], 0b10100000);
 assert_eq!(node_features.flags[6], 0b00001000);
 }
Expand Down

19 changes: 18 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -900,7 +900,7 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our node_announcement message.
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
Expand DownExpand Up@@ -958,6 +958,10 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;
	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
Expand All@@ -976,6 +980,19 @@ pub trait OnionMessageHandler : OnionMessageProvider {
	/// Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to
	/// drop and refuse to forward onion messages to this peer.
	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
	///
	/// Note that this method is called before [`Self::peer_connected`].
	fn provided_init_features(&self, their_node_id: &PublicKey) -> InitFeatures;
}

mod fuzzy_internal_msgs {
Expand Down

16 changes: 13 additions & 3 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ impl RoutingMessageHandler for IgnoringMessageHandler {
	fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: msgs::ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: msgs::QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
Expand All@@ -88,6 +89,10 @@ impl OnionMessageHandler for IgnoringMessageHandler {
	fn handle_onion_message(&self, _their_node_id: &PublicKey, _msg: &msgs::OnionMessage) {}
	fn peer_connected(&self, _their_node_id: &PublicKey, _init: &msgs::Init) {}
	fn peer_disconnected(&self, _their_node_id: &PublicKey, _no_connection_possible: bool) {}
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
}
impl Deref for IgnoringMessageHandler {
	type Target = IgnoringMessageHandler;
Expand DownExpand Up@@ -1061,7 +1066,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand All@@ -1074,7 +1080,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand DownExpand Up@@ -1969,8 +1976,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 // addresses be sorted for future compatibility.
 addresses.sort_by_key(|addr| addr.get_id());

 let features = self.message_handler.chan_handler.provided_node_features()
 .or(self.message_handler.route_handler.provided_node_features())
 .or(self.message_handler.onion_message_handler.provided_node_features());
 let announcement = msgs::UnsignedNodeAnnouncement {
 features: self.message_handler.chan_handler.provided_node_features(),
 features,
 timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel) as u32,
 node_id: PublicKey::from_secret_key(&self.secp_ctx, &self.our_node_secret),
 rgb, alias, addresses,
Expand Down

13 changes: 13 additions & 0 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient, Sign};
use ln::features::{InitFeatures, NodeFeatures};
use ln::msgs::{self, OnionMessageHandler};
use ln::onion_utils;
use super::blinded_route::{BlindedRoute, ForwardTlvs, ReceiveTlvs};
Expand DownExpand Up@@ -345,6 +346,18 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessageHandler for OnionMessenger<Si
 let mut pending_msgs = self.pending_messages.lock().unwrap();
 pending_msgs.remove(their_node_id);
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_onion_messages_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_onion_messages_optional();
 features
	}
}

impl<Signer: Sign, K: Deref, L: Deref> OnionMessageProvider for OnionMessenger<Signer, K, L>
Expand Down

6 changes: 6 additions & 0 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,6 +571,12 @@ where C::Target: chain::Access, L::Target: Logger
 })
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

8 changes: 7 additions & 1 deletion
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ impl msgs::ChannelMessageHandler for TestChannelMessageHandler {
 self.received_msg(wire::Message::Error(msg.clone()));
	}
	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::empty()
 NodeFeatures::known_channel_features()
	}
	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 InitFeatures::known_channel_features()
Expand DownExpand Up@@ -511,6 +511,12 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 Ok(())
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

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

Skip to content
Onion messages: flip feature bit 🎉#1688

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

from

Sep 9, 2022
 Merged


Onion messages: flip feature bit 🎉
#1688
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fe8b4c7

Enable all feature sets to OR with another set of the same type


valentinewallace Sep 9, 2022
c106d4f

OR NodeFeatures from both Channel and Routing message handlers


valentinewallace Sep 9, 2022
7eee797

Add a new NodeFeatures constructor to capture the types of flags


valentinewallace Sep 9, 2022
f5e1255

Add missing wumbo feature bit docs


valentinewallace Aug 6, 2022
1ac3fcc

Support forwarding onion messages in advertised features


valentinewallace Aug 26, 2022
90f5906

OR InitFeatures and NodeFeatures from onion message handler


valentinewallace Sep 9, 2022
9c3b6d2

Don't advertise onion messages in known channel features


valentinewallace Sep 9, 2022
5d9dddd

Update ChannelMessageHandler::provided_node_features docs


valentinewallace Sep 9, 2022

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


1 change: 1 addition & 0 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -582,6 +582,7 @@ mod tests {
 fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::known() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::known() }
	}
	impl ChannelMessageHandler for MsgHandler {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6122,7 +6122,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
	}

	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::known()
 NodeFeatures::known_channel_features()
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
Expand Down

61 changes: 44 additions & 17 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,13 @@
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
//! - `BasicMPP` - requires/supports that a node can receive basic multi-part payments
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md#basic-multi-part-payments) for more information).
//! - `Wumbo` - requires/supports that a node create large channels. Called `option_support_large_channel` in the spec.
@ariardariardSep 9, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Could say "large channels (superior to MAX_FUNDING_SATOSHIS_NO_WUMBO)"
@valentinewallacevalentinewallaceSep 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Ah, that const isn't public
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
//! - `ShutdownAnySegwit` - requires/supports that future segwit versions are allowed in `shutdown`
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `OnionMessages` - requires/supports forwarding onion messages
//! (see [BOLT-7](https://github.com/lightning/bolts/pull/759/files) for more information).
//! TODO: update link
//! - `ChannelType` - node supports the channel_type field in open/accept
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `SCIDPrivacy` - supply channel aliases for routing
Expand DownExpand Up@@ -164,7 +169,8 @@ mod sealed {
 ],
 optional_features: [
 // Note that if new "non-channel-related" flags are added here they should be
 // explicitly cleared in InitFeatures::known_channel_features.
 // explicitly cleared in InitFeatures::known_channel_features and
 // NodeFeatures::known_channel_features.
 // Byte 0
 DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
 // Byte 1
Expand All@@ -174,7 +180,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -208,7 +214,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -435,8 +441,6 @@ mod sealed {
	define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
 "Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
 set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
	// We do not yet advertise the onion messages feature bit, but we need to detect when peers
	// support it.
	define_feature!(39, OnionMessages, [InitContext, NodeContext],
 "Feature flags for `option_onion_messages`.", set_onion_messages_optional,
 set_onion_messages_required, supports_onion_messages, requires_onion_messages);
Expand DownExpand Up@@ -470,6 +474,17 @@ pub struct Features<T: sealed::Context> {
	mark: PhantomData<T>,
}

impl <T: sealed::Context> Features<T> {
	pub(crate) fn or(mut self, o: Self) -> Self {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}
}

impl<T: sealed::Context> Clone for Features<T> {
	fn clone(&self) -> Self {
 Self {
Expand DownExpand Up@@ -532,16 +547,6 @@ impl InitFeatures {
 Ok(())
	}

	/// or's another InitFeatures into this one.
	pub(crate) fn or(mut self, o: InitFeatures) -> InitFeatures {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}

	/// Converts `InitFeatures` to `Features<C>`. Only known `InitFeatures` relevant to context `C`
	/// are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
Expand All@@ -554,6 +559,16 @@ impl InitFeatures {
 Self::known()
 .clear_initial_routing_sync()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

impl NodeFeatures {
	/// Returns the set of known node features that are related to channels.
	pub fn known_channel_features() -> NodeFeatures {
 Self::known()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

Expand DownExpand Up@@ -787,6 +802,13 @@ impl<T: sealed::InitialRoutingSync> Features<T> {
	}
}

impl<T: sealed::OnionMessages> Features<T> {
	pub(crate) fn clear_onion_messages(mut self) -> Self {
 <T as sealed::OnionMessages>::clear_bits(&mut self.flags);
 self
	}
}

impl<T: sealed::ShutdownAnySegwit> Features<T> {
	#[cfg(test)]
	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
Expand DownExpand Up@@ -913,6 +935,11 @@ mod tests {
 assert!(!InitFeatures::known().requires_wumbo());
 assert!(!NodeFeatures::known().requires_wumbo());

 assert!(InitFeatures::known().supports_onion_messages());
 assert!(NodeFeatures::known().supports_onion_messages());
 assert!(!InitFeatures::known().requires_onion_messages());
 assert!(!NodeFeatures::known().requires_onion_messages());

 assert!(InitFeatures::known().supports_zero_conf());
 assert!(!InitFeatures::known().requires_zero_conf());
 assert!(NodeFeatures::known().supports_zero_conf());
Expand DownExpand Up@@ -957,15 +984,15 @@ mod tests {
 // - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
 // - basic_mpp | wumbo
 // - opt_shutdown_anysegwit
 // -
 // - onion_messages
 // - option_channel_type | option_scid_alias
 // - option_zeroconf
 assert_eq!(node_features.flags.len(), 7);
 assert_eq!(node_features.flags[0], 0b00000010);
 assert_eq!(node_features.flags[1], 0b01010001);
 assert_eq!(node_features.flags[2], 0b00001010);
 assert_eq!(node_features.flags[3], 0b00001000);
 assert_eq!(node_features.flags[4], 0b00000000);
 assert_eq!(node_features.flags[4], 0b10000000);
@dunxendunxenSep 2, 2022

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.

I think I gotta spend some time figuring out how we handle feature bits internally lol
 assert_eq!(node_features.flags[5], 0b10100000);
 assert_eq!(node_features.flags[6], 0b00001000);
 }
Expand Down

19 changes: 18 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -900,7 +900,7 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our node_announcement message.
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
Expand DownExpand Up@@ -958,6 +958,10 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;
	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
Expand All@@ -976,6 +980,19 @@ pub trait OnionMessageHandler : OnionMessageProvider {
	/// Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to
	/// drop and refuse to forward onion messages to this peer.
	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
	///
	/// Note that this method is called before [`Self::peer_connected`].
	fn provided_init_features(&self, their_node_id: &PublicKey) -> InitFeatures;
}

mod fuzzy_internal_msgs {
Expand Down

16 changes: 13 additions & 3 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ impl RoutingMessageHandler for IgnoringMessageHandler {
	fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: msgs::ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: msgs::QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
Expand All@@ -88,6 +89,10 @@ impl OnionMessageHandler for IgnoringMessageHandler {
	fn handle_onion_message(&self, _their_node_id: &PublicKey, _msg: &msgs::OnionMessage) {}
	fn peer_connected(&self, _their_node_id: &PublicKey, _init: &msgs::Init) {}
	fn peer_disconnected(&self, _their_node_id: &PublicKey, _no_connection_possible: bool) {}
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
}
impl Deref for IgnoringMessageHandler {
	type Target = IgnoringMessageHandler;
Expand DownExpand Up@@ -1061,7 +1066,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand All@@ -1074,7 +1080,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand DownExpand Up@@ -1969,8 +1976,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 // addresses be sorted for future compatibility.
 addresses.sort_by_key(|addr| addr.get_id());

 let features = self.message_handler.chan_handler.provided_node_features()
 .or(self.message_handler.route_handler.provided_node_features())
 .or(self.message_handler.onion_message_handler.provided_node_features());
 let announcement = msgs::UnsignedNodeAnnouncement {
 features: self.message_handler.chan_handler.provided_node_features(),
 features,
 timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel) as u32,
 node_id: PublicKey::from_secret_key(&self.secp_ctx, &self.our_node_secret),
 rgb, alias, addresses,
Expand Down

13 changes: 13 additions & 0 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient, Sign};
use ln::features::{InitFeatures, NodeFeatures};
use ln::msgs::{self, OnionMessageHandler};
use ln::onion_utils;
use super::blinded_route::{BlindedRoute, ForwardTlvs, ReceiveTlvs};
Expand DownExpand Up@@ -345,6 +346,18 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessageHandler for OnionMessenger<Si
 let mut pending_msgs = self.pending_messages.lock().unwrap();
 pending_msgs.remove(their_node_id);
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_onion_messages_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_onion_messages_optional();
 features
	}
}

impl<Signer: Sign, K: Deref, L: Deref> OnionMessageProvider for OnionMessenger<Signer, K, L>
Expand Down

6 changes: 6 additions & 0 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,6 +571,12 @@ where C::Target: chain::Access, L::Target: Logger
 })
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

8 changes: 7 additions & 1 deletion
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ impl msgs::ChannelMessageHandler for TestChannelMessageHandler {
 self.received_msg(wire::Message::Error(msg.clone()));
	}
	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::empty()
 NodeFeatures::known_channel_features()
	}
	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 InitFeatures::known_channel_features()
Expand DownExpand Up@@ -511,6 +511,12 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 Ok(())
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Onion messages: flip feature bit 🎉#1688

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

from

Sep 9, 2022
 Merged


Onion messages: flip feature bit 🎉
#1688
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fe8b4c7

Enable all feature sets to OR with another set of the same type


valentinewallace Sep 9, 2022
c106d4f

OR NodeFeatures from both Channel and Routing message handlers


valentinewallace Sep 9, 2022
7eee797

Add a new NodeFeatures constructor to capture the types of flags


valentinewallace Sep 9, 2022
f5e1255

Add missing wumbo feature bit docs


valentinewallace Aug 6, 2022
1ac3fcc

Support forwarding onion messages in advertised features


valentinewallace Aug 26, 2022
90f5906

OR InitFeatures and NodeFeatures from onion message handler


valentinewallace Sep 9, 2022
9c3b6d2

Don't advertise onion messages in known channel features


valentinewallace Sep 9, 2022
5d9dddd

Update ChannelMessageHandler::provided_node_features docs


valentinewallace Sep 9, 2022

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


1 change: 1 addition & 0 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -582,6 +582,7 @@ mod tests {
 fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::known() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::known() }
	}
	impl ChannelMessageHandler for MsgHandler {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6122,7 +6122,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
	}

	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::known()
 NodeFeatures::known_channel_features()
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
Expand Down

61 changes: 44 additions & 17 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,13 @@
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
//! - `BasicMPP` - requires/supports that a node can receive basic multi-part payments
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md#basic-multi-part-payments) for more information).
//! - `Wumbo` - requires/supports that a node create large channels. Called `option_support_large_channel` in the spec.
@ariardariardSep 9, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Could say "large channels (superior to MAX_FUNDING_SATOSHIS_NO_WUMBO)"
@valentinewallacevalentinewallaceSep 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Ah, that const isn't public
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
//! - `ShutdownAnySegwit` - requires/supports that future segwit versions are allowed in `shutdown`
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `OnionMessages` - requires/supports forwarding onion messages
//! (see [BOLT-7](https://github.com/lightning/bolts/pull/759/files) for more information).
//! TODO: update link
//! - `ChannelType` - node supports the channel_type field in open/accept
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `SCIDPrivacy` - supply channel aliases for routing
Expand DownExpand Up@@ -164,7 +169,8 @@ mod sealed {
 ],
 optional_features: [
 // Note that if new "non-channel-related" flags are added here they should be
 // explicitly cleared in InitFeatures::known_channel_features.
 // explicitly cleared in InitFeatures::known_channel_features and
 // NodeFeatures::known_channel_features.
 // Byte 0
 DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
 // Byte 1
Expand All@@ -174,7 +180,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -208,7 +214,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -435,8 +441,6 @@ mod sealed {
	define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
 "Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
 set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
	// We do not yet advertise the onion messages feature bit, but we need to detect when peers
	// support it.
	define_feature!(39, OnionMessages, [InitContext, NodeContext],
 "Feature flags for `option_onion_messages`.", set_onion_messages_optional,
 set_onion_messages_required, supports_onion_messages, requires_onion_messages);
Expand DownExpand Up@@ -470,6 +474,17 @@ pub struct Features<T: sealed::Context> {
	mark: PhantomData<T>,
}

impl <T: sealed::Context> Features<T> {
	pub(crate) fn or(mut self, o: Self) -> Self {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}
}

impl<T: sealed::Context> Clone for Features<T> {
	fn clone(&self) -> Self {
 Self {
Expand DownExpand Up@@ -532,16 +547,6 @@ impl InitFeatures {
 Ok(())
	}

	/// or's another InitFeatures into this one.
	pub(crate) fn or(mut self, o: InitFeatures) -> InitFeatures {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}

	/// Converts `InitFeatures` to `Features<C>`. Only known `InitFeatures` relevant to context `C`
	/// are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
Expand All@@ -554,6 +559,16 @@ impl InitFeatures {
 Self::known()
 .clear_initial_routing_sync()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

impl NodeFeatures {
	/// Returns the set of known node features that are related to channels.
	pub fn known_channel_features() -> NodeFeatures {
 Self::known()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

Expand DownExpand Up@@ -787,6 +802,13 @@ impl<T: sealed::InitialRoutingSync> Features<T> {
	}
}

impl<T: sealed::OnionMessages> Features<T> {
	pub(crate) fn clear_onion_messages(mut self) -> Self {
 <T as sealed::OnionMessages>::clear_bits(&mut self.flags);
 self
	}
}

impl<T: sealed::ShutdownAnySegwit> Features<T> {
	#[cfg(test)]
	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
Expand DownExpand Up@@ -913,6 +935,11 @@ mod tests {
 assert!(!InitFeatures::known().requires_wumbo());
 assert!(!NodeFeatures::known().requires_wumbo());

 assert!(InitFeatures::known().supports_onion_messages());
 assert!(NodeFeatures::known().supports_onion_messages());
 assert!(!InitFeatures::known().requires_onion_messages());
 assert!(!NodeFeatures::known().requires_onion_messages());

 assert!(InitFeatures::known().supports_zero_conf());
 assert!(!InitFeatures::known().requires_zero_conf());
 assert!(NodeFeatures::known().supports_zero_conf());
Expand DownExpand Up@@ -957,15 +984,15 @@ mod tests {
 // - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
 // - basic_mpp | wumbo
 // - opt_shutdown_anysegwit
 // -
 // - onion_messages
 // - option_channel_type | option_scid_alias
 // - option_zeroconf
 assert_eq!(node_features.flags.len(), 7);
 assert_eq!(node_features.flags[0], 0b00000010);
 assert_eq!(node_features.flags[1], 0b01010001);
 assert_eq!(node_features.flags[2], 0b00001010);
 assert_eq!(node_features.flags[3], 0b00001000);
 assert_eq!(node_features.flags[4], 0b00000000);
 assert_eq!(node_features.flags[4], 0b10000000);
@dunxendunxenSep 2, 2022

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.

I think I gotta spend some time figuring out how we handle feature bits internally lol
 assert_eq!(node_features.flags[5], 0b10100000);
 assert_eq!(node_features.flags[6], 0b00001000);
 }
Expand Down

19 changes: 18 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -900,7 +900,7 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our node_announcement message.
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
Expand DownExpand Up@@ -958,6 +958,10 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;
	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
Expand All@@ -976,6 +980,19 @@ pub trait OnionMessageHandler : OnionMessageProvider {
	/// Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to
	/// drop and refuse to forward onion messages to this peer.
	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
	///
	/// Note that this method is called before [`Self::peer_connected`].
	fn provided_init_features(&self, their_node_id: &PublicKey) -> InitFeatures;
}

mod fuzzy_internal_msgs {
Expand Down

16 changes: 13 additions & 3 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ impl RoutingMessageHandler for IgnoringMessageHandler {
	fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: msgs::ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: msgs::QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
Expand All@@ -88,6 +89,10 @@ impl OnionMessageHandler for IgnoringMessageHandler {
	fn handle_onion_message(&self, _their_node_id: &PublicKey, _msg: &msgs::OnionMessage) {}
	fn peer_connected(&self, _their_node_id: &PublicKey, _init: &msgs::Init) {}
	fn peer_disconnected(&self, _their_node_id: &PublicKey, _no_connection_possible: bool) {}
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
}
impl Deref for IgnoringMessageHandler {
	type Target = IgnoringMessageHandler;
Expand DownExpand Up@@ -1061,7 +1066,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand All@@ -1074,7 +1080,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand DownExpand Up@@ -1969,8 +1976,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 // addresses be sorted for future compatibility.
 addresses.sort_by_key(|addr| addr.get_id());

 let features = self.message_handler.chan_handler.provided_node_features()
 .or(self.message_handler.route_handler.provided_node_features())
 .or(self.message_handler.onion_message_handler.provided_node_features());
 let announcement = msgs::UnsignedNodeAnnouncement {
 features: self.message_handler.chan_handler.provided_node_features(),
 features,
 timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel) as u32,
 node_id: PublicKey::from_secret_key(&self.secp_ctx, &self.our_node_secret),
 rgb, alias, addresses,
Expand Down

13 changes: 13 additions & 0 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient, Sign};
use ln::features::{InitFeatures, NodeFeatures};
use ln::msgs::{self, OnionMessageHandler};
use ln::onion_utils;
use super::blinded_route::{BlindedRoute, ForwardTlvs, ReceiveTlvs};
Expand DownExpand Up@@ -345,6 +346,18 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessageHandler for OnionMessenger<Si
 let mut pending_msgs = self.pending_messages.lock().unwrap();
 pending_msgs.remove(their_node_id);
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_onion_messages_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_onion_messages_optional();
 features
	}
}

impl<Signer: Sign, K: Deref, L: Deref> OnionMessageProvider for OnionMessenger<Signer, K, L>
Expand Down

6 changes: 6 additions & 0 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,6 +571,12 @@ where C::Target: chain::Access, L::Target: Logger
 })
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

8 changes: 7 additions & 1 deletion
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ impl msgs::ChannelMessageHandler for TestChannelMessageHandler {
 self.received_msg(wire::Message::Error(msg.clone()));
	}
	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::empty()
 NodeFeatures::known_channel_features()
	}
	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 InitFeatures::known_channel_features()
Expand DownExpand Up@@ -511,6 +511,12 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 Ok(())
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Onion messages: flip feature bit 🎉#1688

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

from

Sep 9, 2022
 Merged


Onion messages: flip feature bit 🎉
#1688
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fe8b4c7

Enable all feature sets to OR with another set of the same type


valentinewallace Sep 9, 2022
c106d4f

OR NodeFeatures from both Channel and Routing message handlers


valentinewallace Sep 9, 2022
7eee797

Add a new NodeFeatures constructor to capture the types of flags


valentinewallace Sep 9, 2022
f5e1255

Add missing wumbo feature bit docs


valentinewallace Aug 6, 2022
1ac3fcc

Support forwarding onion messages in advertised features


valentinewallace Aug 26, 2022
90f5906

OR InitFeatures and NodeFeatures from onion message handler


valentinewallace Sep 9, 2022
9c3b6d2

Don't advertise onion messages in known channel features


valentinewallace Sep 9, 2022
5d9dddd

Update ChannelMessageHandler::provided_node_features docs


valentinewallace Sep 9, 2022

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


1 change: 1 addition & 0 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -582,6 +582,7 @@ mod tests {
 fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::known() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::known() }
	}
	impl ChannelMessageHandler for MsgHandler {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6122,7 +6122,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
	}

	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::known()
 NodeFeatures::known_channel_features()
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
Expand Down

61 changes: 44 additions & 17 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,13 @@
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
//! - `BasicMPP` - requires/supports that a node can receive basic multi-part payments
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md#basic-multi-part-payments) for more information).
//! - `Wumbo` - requires/supports that a node create large channels. Called `option_support_large_channel` in the spec.
@ariardariardSep 9, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Could say "large channels (superior to MAX_FUNDING_SATOSHIS_NO_WUMBO)"
@valentinewallacevalentinewallaceSep 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Ah, that const isn't public
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
//! - `ShutdownAnySegwit` - requires/supports that future segwit versions are allowed in `shutdown`
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `OnionMessages` - requires/supports forwarding onion messages
//! (see [BOLT-7](https://github.com/lightning/bolts/pull/759/files) for more information).
//! TODO: update link
//! - `ChannelType` - node supports the channel_type field in open/accept
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `SCIDPrivacy` - supply channel aliases for routing
Expand DownExpand Up@@ -164,7 +169,8 @@ mod sealed {
 ],
 optional_features: [
 // Note that if new "non-channel-related" flags are added here they should be
 // explicitly cleared in InitFeatures::known_channel_features.
 // explicitly cleared in InitFeatures::known_channel_features and
 // NodeFeatures::known_channel_features.
 // Byte 0
 DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
 // Byte 1
Expand All@@ -174,7 +180,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -208,7 +214,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -435,8 +441,6 @@ mod sealed {
	define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
 "Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
 set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
	// We do not yet advertise the onion messages feature bit, but we need to detect when peers
	// support it.
	define_feature!(39, OnionMessages, [InitContext, NodeContext],
 "Feature flags for `option_onion_messages`.", set_onion_messages_optional,
 set_onion_messages_required, supports_onion_messages, requires_onion_messages);
Expand DownExpand Up@@ -470,6 +474,17 @@ pub struct Features<T: sealed::Context> {
	mark: PhantomData<T>,
}

impl <T: sealed::Context> Features<T> {
	pub(crate) fn or(mut self, o: Self) -> Self {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}
}

impl<T: sealed::Context> Clone for Features<T> {
	fn clone(&self) -> Self {
 Self {
Expand DownExpand Up@@ -532,16 +547,6 @@ impl InitFeatures {
 Ok(())
	}

	/// or's another InitFeatures into this one.
	pub(crate) fn or(mut self, o: InitFeatures) -> InitFeatures {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}

	/// Converts `InitFeatures` to `Features<C>`. Only known `InitFeatures` relevant to context `C`
	/// are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
Expand All@@ -554,6 +559,16 @@ impl InitFeatures {
 Self::known()
 .clear_initial_routing_sync()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

impl NodeFeatures {
	/// Returns the set of known node features that are related to channels.
	pub fn known_channel_features() -> NodeFeatures {
 Self::known()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

Expand DownExpand Up@@ -787,6 +802,13 @@ impl<T: sealed::InitialRoutingSync> Features<T> {
	}
}

impl<T: sealed::OnionMessages> Features<T> {
	pub(crate) fn clear_onion_messages(mut self) -> Self {
 <T as sealed::OnionMessages>::clear_bits(&mut self.flags);
 self
	}
}

impl<T: sealed::ShutdownAnySegwit> Features<T> {
	#[cfg(test)]
	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
Expand DownExpand Up@@ -913,6 +935,11 @@ mod tests {
 assert!(!InitFeatures::known().requires_wumbo());
 assert!(!NodeFeatures::known().requires_wumbo());

 assert!(InitFeatures::known().supports_onion_messages());
 assert!(NodeFeatures::known().supports_onion_messages());
 assert!(!InitFeatures::known().requires_onion_messages());
 assert!(!NodeFeatures::known().requires_onion_messages());

 assert!(InitFeatures::known().supports_zero_conf());
 assert!(!InitFeatures::known().requires_zero_conf());
 assert!(NodeFeatures::known().supports_zero_conf());
Expand DownExpand Up@@ -957,15 +984,15 @@ mod tests {
 // - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
 // - basic_mpp | wumbo
 // - opt_shutdown_anysegwit
 // -
 // - onion_messages
 // - option_channel_type | option_scid_alias
 // - option_zeroconf
 assert_eq!(node_features.flags.len(), 7);
 assert_eq!(node_features.flags[0], 0b00000010);
 assert_eq!(node_features.flags[1], 0b01010001);
 assert_eq!(node_features.flags[2], 0b00001010);
 assert_eq!(node_features.flags[3], 0b00001000);
 assert_eq!(node_features.flags[4], 0b00000000);
 assert_eq!(node_features.flags[4], 0b10000000);
@dunxendunxenSep 2, 2022

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.

I think I gotta spend some time figuring out how we handle feature bits internally lol
 assert_eq!(node_features.flags[5], 0b10100000);
 assert_eq!(node_features.flags[6], 0b00001000);
 }
Expand Down

19 changes: 18 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -900,7 +900,7 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our node_announcement message.
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
Expand DownExpand Up@@ -958,6 +958,10 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;
	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
Expand All@@ -976,6 +980,19 @@ pub trait OnionMessageHandler : OnionMessageProvider {
	/// Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to
	/// drop and refuse to forward onion messages to this peer.
	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
	///
	/// Note that this method is called before [`Self::peer_connected`].
	fn provided_init_features(&self, their_node_id: &PublicKey) -> InitFeatures;
}

mod fuzzy_internal_msgs {
Expand Down

16 changes: 13 additions & 3 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ impl RoutingMessageHandler for IgnoringMessageHandler {
	fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: msgs::ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: msgs::QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
Expand All@@ -88,6 +89,10 @@ impl OnionMessageHandler for IgnoringMessageHandler {
	fn handle_onion_message(&self, _their_node_id: &PublicKey, _msg: &msgs::OnionMessage) {}
	fn peer_connected(&self, _their_node_id: &PublicKey, _init: &msgs::Init) {}
	fn peer_disconnected(&self, _their_node_id: &PublicKey, _no_connection_possible: bool) {}
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
}
impl Deref for IgnoringMessageHandler {
	type Target = IgnoringMessageHandler;
Expand DownExpand Up@@ -1061,7 +1066,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand All@@ -1074,7 +1080,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand DownExpand Up@@ -1969,8 +1976,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 // addresses be sorted for future compatibility.
 addresses.sort_by_key(|addr| addr.get_id());

 let features = self.message_handler.chan_handler.provided_node_features()
 .or(self.message_handler.route_handler.provided_node_features())
 .or(self.message_handler.onion_message_handler.provided_node_features());
 let announcement = msgs::UnsignedNodeAnnouncement {
 features: self.message_handler.chan_handler.provided_node_features(),
 features,
 timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel) as u32,
 node_id: PublicKey::from_secret_key(&self.secp_ctx, &self.our_node_secret),
 rgb, alias, addresses,
Expand Down

13 changes: 13 additions & 0 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient, Sign};
use ln::features::{InitFeatures, NodeFeatures};
use ln::msgs::{self, OnionMessageHandler};
use ln::onion_utils;
use super::blinded_route::{BlindedRoute, ForwardTlvs, ReceiveTlvs};
Expand DownExpand Up@@ -345,6 +346,18 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessageHandler for OnionMessenger<Si
 let mut pending_msgs = self.pending_messages.lock().unwrap();
 pending_msgs.remove(their_node_id);
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_onion_messages_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_onion_messages_optional();
 features
	}
}

impl<Signer: Sign, K: Deref, L: Deref> OnionMessageProvider for OnionMessenger<Signer, K, L>
Expand Down

6 changes: 6 additions & 0 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,6 +571,12 @@ where C::Target: chain::Access, L::Target: Logger
 })
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

8 changes: 7 additions & 1 deletion
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ impl msgs::ChannelMessageHandler for TestChannelMessageHandler {
 self.received_msg(wire::Message::Error(msg.clone()));
	}
	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::empty()
 NodeFeatures::known_channel_features()
	}
	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 InitFeatures::known_channel_features()
Expand DownExpand Up@@ -511,6 +511,12 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 Ok(())
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Onion messages: flip feature bit 🎉#1688

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

from

Sep 9, 2022
 Merged


Onion messages: flip feature bit 🎉
#1688
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fe8b4c7

Enable all feature sets to OR with another set of the same type


valentinewallace Sep 9, 2022
c106d4f

OR NodeFeatures from both Channel and Routing message handlers


valentinewallace Sep 9, 2022
7eee797

Add a new NodeFeatures constructor to capture the types of flags


valentinewallace Sep 9, 2022
f5e1255

Add missing wumbo feature bit docs


valentinewallace Aug 6, 2022
1ac3fcc

Support forwarding onion messages in advertised features


valentinewallace Aug 26, 2022
90f5906

OR InitFeatures and NodeFeatures from onion message handler


valentinewallace Sep 9, 2022
9c3b6d2

Don't advertise onion messages in known channel features


valentinewallace Sep 9, 2022
5d9dddd

Update ChannelMessageHandler::provided_node_features docs


valentinewallace Sep 9, 2022

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


1 change: 1 addition & 0 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -582,6 +582,7 @@ mod tests {
 fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::known() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::known() }
	}
	impl ChannelMessageHandler for MsgHandler {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6122,7 +6122,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
	}

	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::known()
 NodeFeatures::known_channel_features()
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
Expand Down

61 changes: 44 additions & 17 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,13 @@
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
//! - `BasicMPP` - requires/supports that a node can receive basic multi-part payments
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md#basic-multi-part-payments) for more information).
//! - `Wumbo` - requires/supports that a node create large channels. Called `option_support_large_channel` in the spec.
@ariardariardSep 9, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Could say "large channels (superior to MAX_FUNDING_SATOSHIS_NO_WUMBO)"
@valentinewallacevalentinewallaceSep 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Ah, that const isn't public
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
//! - `ShutdownAnySegwit` - requires/supports that future segwit versions are allowed in `shutdown`
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `OnionMessages` - requires/supports forwarding onion messages
//! (see [BOLT-7](https://github.com/lightning/bolts/pull/759/files) for more information).
//! TODO: update link
//! - `ChannelType` - node supports the channel_type field in open/accept
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `SCIDPrivacy` - supply channel aliases for routing
Expand DownExpand Up@@ -164,7 +169,8 @@ mod sealed {
 ],
 optional_features: [
 // Note that if new "non-channel-related" flags are added here they should be
 // explicitly cleared in InitFeatures::known_channel_features.
 // explicitly cleared in InitFeatures::known_channel_features and
 // NodeFeatures::known_channel_features.
 // Byte 0
 DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
 // Byte 1
Expand All@@ -174,7 +180,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -208,7 +214,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -435,8 +441,6 @@ mod sealed {
	define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
 "Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
 set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
	// We do not yet advertise the onion messages feature bit, but we need to detect when peers
	// support it.
	define_feature!(39, OnionMessages, [InitContext, NodeContext],
 "Feature flags for `option_onion_messages`.", set_onion_messages_optional,
 set_onion_messages_required, supports_onion_messages, requires_onion_messages);
Expand DownExpand Up@@ -470,6 +474,17 @@ pub struct Features<T: sealed::Context> {
	mark: PhantomData<T>,
}

impl <T: sealed::Context> Features<T> {
	pub(crate) fn or(mut self, o: Self) -> Self {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}
}

impl<T: sealed::Context> Clone for Features<T> {
	fn clone(&self) -> Self {
 Self {
Expand DownExpand Up@@ -532,16 +547,6 @@ impl InitFeatures {
 Ok(())
	}

	/// or's another InitFeatures into this one.
	pub(crate) fn or(mut self, o: InitFeatures) -> InitFeatures {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}

	/// Converts `InitFeatures` to `Features<C>`. Only known `InitFeatures` relevant to context `C`
	/// are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
Expand All@@ -554,6 +559,16 @@ impl InitFeatures {
 Self::known()
 .clear_initial_routing_sync()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

impl NodeFeatures {
	/// Returns the set of known node features that are related to channels.
	pub fn known_channel_features() -> NodeFeatures {
 Self::known()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

Expand DownExpand Up@@ -787,6 +802,13 @@ impl<T: sealed::InitialRoutingSync> Features<T> {
	}
}

impl<T: sealed::OnionMessages> Features<T> {
	pub(crate) fn clear_onion_messages(mut self) -> Self {
 <T as sealed::OnionMessages>::clear_bits(&mut self.flags);
 self
	}
}

impl<T: sealed::ShutdownAnySegwit> Features<T> {
	#[cfg(test)]
	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
Expand DownExpand Up@@ -913,6 +935,11 @@ mod tests {
 assert!(!InitFeatures::known().requires_wumbo());
 assert!(!NodeFeatures::known().requires_wumbo());

 assert!(InitFeatures::known().supports_onion_messages());
 assert!(NodeFeatures::known().supports_onion_messages());
 assert!(!InitFeatures::known().requires_onion_messages());
 assert!(!NodeFeatures::known().requires_onion_messages());

 assert!(InitFeatures::known().supports_zero_conf());
 assert!(!InitFeatures::known().requires_zero_conf());
 assert!(NodeFeatures::known().supports_zero_conf());
Expand DownExpand Up@@ -957,15 +984,15 @@ mod tests {
 // - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
 // - basic_mpp | wumbo
 // - opt_shutdown_anysegwit
 // -
 // - onion_messages
 // - option_channel_type | option_scid_alias
 // - option_zeroconf
 assert_eq!(node_features.flags.len(), 7);
 assert_eq!(node_features.flags[0], 0b00000010);
 assert_eq!(node_features.flags[1], 0b01010001);
 assert_eq!(node_features.flags[2], 0b00001010);
 assert_eq!(node_features.flags[3], 0b00001000);
 assert_eq!(node_features.flags[4], 0b00000000);
 assert_eq!(node_features.flags[4], 0b10000000);
@dunxendunxenSep 2, 2022

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.

I think I gotta spend some time figuring out how we handle feature bits internally lol
 assert_eq!(node_features.flags[5], 0b10100000);
 assert_eq!(node_features.flags[6], 0b00001000);
 }
Expand Down

19 changes: 18 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -900,7 +900,7 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our node_announcement message.
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
Expand DownExpand Up@@ -958,6 +958,10 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;
	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
Expand All@@ -976,6 +980,19 @@ pub trait OnionMessageHandler : OnionMessageProvider {
	/// Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to
	/// drop and refuse to forward onion messages to this peer.
	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
	///
	/// Note that this method is called before [`Self::peer_connected`].
	fn provided_init_features(&self, their_node_id: &PublicKey) -> InitFeatures;
}

mod fuzzy_internal_msgs {
Expand Down

16 changes: 13 additions & 3 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ impl RoutingMessageHandler for IgnoringMessageHandler {
	fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: msgs::ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: msgs::QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
Expand All@@ -88,6 +89,10 @@ impl OnionMessageHandler for IgnoringMessageHandler {
	fn handle_onion_message(&self, _their_node_id: &PublicKey, _msg: &msgs::OnionMessage) {}
	fn peer_connected(&self, _their_node_id: &PublicKey, _init: &msgs::Init) {}
	fn peer_disconnected(&self, _their_node_id: &PublicKey, _no_connection_possible: bool) {}
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
}
impl Deref for IgnoringMessageHandler {
	type Target = IgnoringMessageHandler;
Expand DownExpand Up@@ -1061,7 +1066,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand All@@ -1074,7 +1080,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand DownExpand Up@@ -1969,8 +1976,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 // addresses be sorted for future compatibility.
 addresses.sort_by_key(|addr| addr.get_id());

 let features = self.message_handler.chan_handler.provided_node_features()
 .or(self.message_handler.route_handler.provided_node_features())
 .or(self.message_handler.onion_message_handler.provided_node_features());
 let announcement = msgs::UnsignedNodeAnnouncement {
 features: self.message_handler.chan_handler.provided_node_features(),
 features,
 timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel) as u32,
 node_id: PublicKey::from_secret_key(&self.secp_ctx, &self.our_node_secret),
 rgb, alias, addresses,
Expand Down

13 changes: 13 additions & 0 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient, Sign};
use ln::features::{InitFeatures, NodeFeatures};
use ln::msgs::{self, OnionMessageHandler};
use ln::onion_utils;
use super::blinded_route::{BlindedRoute, ForwardTlvs, ReceiveTlvs};
Expand DownExpand Up@@ -345,6 +346,18 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessageHandler for OnionMessenger<Si
 let mut pending_msgs = self.pending_messages.lock().unwrap();
 pending_msgs.remove(their_node_id);
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_onion_messages_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_onion_messages_optional();
 features
	}
}

impl<Signer: Sign, K: Deref, L: Deref> OnionMessageProvider for OnionMessenger<Signer, K, L>
Expand Down

6 changes: 6 additions & 0 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,6 +571,12 @@ where C::Target: chain::Access, L::Target: Logger
 })
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

8 changes: 7 additions & 1 deletion
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ impl msgs::ChannelMessageHandler for TestChannelMessageHandler {
 self.received_msg(wire::Message::Error(msg.clone()));
	}
	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::empty()
 NodeFeatures::known_channel_features()
	}
	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 InitFeatures::known_channel_features()
Expand DownExpand Up@@ -511,6 +511,12 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 Ok(())
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

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

Skip to content
Onion messages: flip feature bit 🎉#1688

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

from

Sep 9, 2022
 Merged


Onion messages: flip feature bit 🎉
#1688
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
fe8b4c7

Enable all feature sets to OR with another set of the same type


valentinewallace Sep 9, 2022
c106d4f

OR NodeFeatures from both Channel and Routing message handlers


valentinewallace Sep 9, 2022
7eee797

Add a new NodeFeatures constructor to capture the types of flags


valentinewallace Sep 9, 2022
f5e1255

Add missing wumbo feature bit docs


valentinewallace Aug 6, 2022
1ac3fcc

Support forwarding onion messages in advertised features


valentinewallace Aug 26, 2022
90f5906

OR InitFeatures and NodeFeatures from onion message handler


valentinewallace Sep 9, 2022
9c3b6d2

Don't advertise onion messages in known channel features


valentinewallace Sep 9, 2022
5d9dddd

Update ChannelMessageHandler::provided_node_features docs


valentinewallace Sep 9, 2022

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


1 change: 1 addition & 0 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -582,6 +582,7 @@ mod tests {
 fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
 fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::known() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::known() }
	}
	impl ChannelMessageHandler for MsgHandler {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6122,7 +6122,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
	}

	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::known()
 NodeFeatures::known_channel_features()
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
Expand Down

61 changes: 44 additions & 17 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,13 @@
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
//! - `BasicMPP` - requires/supports that a node can receive basic multi-part payments
//! (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md#basic-multi-part-payments) for more information).
//! - `Wumbo` - requires/supports that a node create large channels. Called `option_support_large_channel` in the spec.
@ariardariardSep 9, 2022

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Could say "large channels (superior to MAX_FUNDING_SATOSHIS_NO_WUMBO)"
@valentinewallacevalentinewallaceSep 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Ah, that const isn't public
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
//! - `ShutdownAnySegwit` - requires/supports that future segwit versions are allowed in `shutdown`
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `OnionMessages` - requires/supports forwarding onion messages
//! (see [BOLT-7](https://github.com/lightning/bolts/pull/759/files) for more information).
//! TODO: update link
//! - `ChannelType` - node supports the channel_type field in open/accept
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
//! - `SCIDPrivacy` - supply channel aliases for routing
Expand DownExpand Up@@ -164,7 +169,8 @@ mod sealed {
 ],
 optional_features: [
 // Note that if new "non-channel-related" flags are added here they should be
 // explicitly cleared in InitFeatures::known_channel_features.
 // explicitly cleared in InitFeatures::known_channel_features and
 // NodeFeatures::known_channel_features.
 // Byte 0
 DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
 // Byte 1
Expand All@@ -174,7 +180,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -208,7 +214,7 @@ mod sealed {
 // Byte 3
 ShutdownAnySegwit,
 // Byte 4
 ,
OnionMessages,
 // Byte 5
 ChannelType | SCIDPrivacy,
 // Byte 6
Expand DownExpand Up@@ -435,8 +441,6 @@ mod sealed {
	define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
 "Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
 set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
	// We do not yet advertise the onion messages feature bit, but we need to detect when peers
	// support it.
	define_feature!(39, OnionMessages, [InitContext, NodeContext],
 "Feature flags for `option_onion_messages`.", set_onion_messages_optional,
 set_onion_messages_required, supports_onion_messages, requires_onion_messages);
Expand DownExpand Up@@ -470,6 +474,17 @@ pub struct Features<T: sealed::Context> {
	mark: PhantomData<T>,
}

impl <T: sealed::Context> Features<T> {
	pub(crate) fn or(mut self, o: Self) -> Self {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}
}

impl<T: sealed::Context> Clone for Features<T> {
	fn clone(&self) -> Self {
 Self {
Expand DownExpand Up@@ -532,16 +547,6 @@ impl InitFeatures {
 Ok(())
	}

	/// or's another InitFeatures into this one.
	pub(crate) fn or(mut self, o: InitFeatures) -> InitFeatures {
 let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
 self.flags.resize(total_feature_len, 0u8);
 for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
 *byte |= *o_byte;
 }
 self
	}

	/// Converts `InitFeatures` to `Features<C>`. Only known `InitFeatures` relevant to context `C`
	/// are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
Expand All@@ -554,6 +559,16 @@ impl InitFeatures {
 Self::known()
 .clear_initial_routing_sync()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

impl NodeFeatures {
	/// Returns the set of known node features that are related to channels.
	pub fn known_channel_features() -> NodeFeatures {
 Self::known()
 .clear_gossip_queries()
 .clear_onion_messages()
	}
}

Expand DownExpand Up@@ -787,6 +802,13 @@ impl<T: sealed::InitialRoutingSync> Features<T> {
	}
}

impl<T: sealed::OnionMessages> Features<T> {
	pub(crate) fn clear_onion_messages(mut self) -> Self {
 <T as sealed::OnionMessages>::clear_bits(&mut self.flags);
 self
	}
}

impl<T: sealed::ShutdownAnySegwit> Features<T> {
	#[cfg(test)]
	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
Expand DownExpand Up@@ -913,6 +935,11 @@ mod tests {
 assert!(!InitFeatures::known().requires_wumbo());
 assert!(!NodeFeatures::known().requires_wumbo());

 assert!(InitFeatures::known().supports_onion_messages());
 assert!(NodeFeatures::known().supports_onion_messages());
 assert!(!InitFeatures::known().requires_onion_messages());
 assert!(!NodeFeatures::known().requires_onion_messages());

 assert!(InitFeatures::known().supports_zero_conf());
 assert!(!InitFeatures::known().requires_zero_conf());
 assert!(NodeFeatures::known().supports_zero_conf());
Expand DownExpand Up@@ -957,15 +984,15 @@ mod tests {
 // - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
 // - basic_mpp | wumbo
 // - opt_shutdown_anysegwit
 // -
 // - onion_messages
 // - option_channel_type | option_scid_alias
 // - option_zeroconf
 assert_eq!(node_features.flags.len(), 7);
 assert_eq!(node_features.flags[0], 0b00000010);
 assert_eq!(node_features.flags[1], 0b01010001);
 assert_eq!(node_features.flags[2], 0b00001010);
 assert_eq!(node_features.flags[3], 0b00001000);
 assert_eq!(node_features.flags[4], 0b00000000);
 assert_eq!(node_features.flags[4], 0b10000000);
@dunxendunxenSep 2, 2022

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.

I think I gotta spend some time figuring out how we handle feature bits internally lol
 assert_eq!(node_features.flags[5], 0b10100000);
 assert_eq!(node_features.flags[6], 0b00001000);
 }
Expand Down

19 changes: 18 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -900,7 +900,7 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our node_announcement message.
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
Expand DownExpand Up@@ -958,6 +958,10 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;
	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
Expand All@@ -976,6 +980,19 @@ pub trait OnionMessageHandler : OnionMessageProvider {
	/// Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to
	/// drop and refuse to forward onion messages to this peer.
	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);

	// Handler information:
	/// Gets the node feature flags which this handler itself supports. All available handlers are
	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
	/// which are broadcasted in our [`NodeAnnouncement`] message.
	fn provided_node_features(&self) -> NodeFeatures;

	/// Gets the init feature flags which should be sent to the given peer. All available handlers
	/// are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
	/// which are sent in our [`Init`] message.
	///
	/// Note that this method is called before [`Self::peer_connected`].
	fn provided_init_features(&self, their_node_id: &PublicKey) -> InitFeatures;
}

mod fuzzy_internal_msgs {
Expand Down

16 changes: 13 additions & 3 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ impl RoutingMessageHandler for IgnoringMessageHandler {
	fn handle_reply_short_channel_ids_end(&self, _their_node_id: &PublicKey, _msg: msgs::ReplyShortChannelIdsEnd) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::QueryChannelRange) -> Result<(), LightningError> { Ok(()) }
	fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: msgs::QueryShortChannelIds) -> Result<(), LightningError> { Ok(()) }
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
Expand All@@ -88,6 +89,10 @@ impl OnionMessageHandler for IgnoringMessageHandler {
	fn handle_onion_message(&self, _their_node_id: &PublicKey, _msg: &msgs::OnionMessage) {}
	fn peer_connected(&self, _their_node_id: &PublicKey, _init: &msgs::Init) {}
	fn peer_disconnected(&self, _their_node_id: &PublicKey, _no_connection_possible: bool) {}
	fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 InitFeatures::empty()
	}
}
impl Deref for IgnoringMessageHandler {
	type Target = IgnoringMessageHandler;
Expand DownExpand Up@@ -1061,7 +1066,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand All@@ -1074,7 +1080,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.their_node_id = Some(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id));
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
 .or(self.message_handler.onion_message_handler.provided_init_features(&their_node_id));
 let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 self.enqueue_message(peer, &resp);
 peer.awaiting_pong_timer_tick_intervals = 0;
Expand DownExpand Up@@ -1969,8 +1976,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 // addresses be sorted for future compatibility.
 addresses.sort_by_key(|addr| addr.get_id());

 let features = self.message_handler.chan_handler.provided_node_features()
 .or(self.message_handler.route_handler.provided_node_features())
 .or(self.message_handler.onion_message_handler.provided_node_features());
 let announcement = msgs::UnsignedNodeAnnouncement {
 features: self.message_handler.chan_handler.provided_node_features(),
 features,
 timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel) as u32,
 node_id: PublicKey::from_secret_key(&self.secp_ctx, &self.our_node_secret),
 rgb, alias, addresses,
Expand Down

13 changes: 13 additions & 0 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient, Sign};
use ln::features::{InitFeatures, NodeFeatures};
use ln::msgs::{self, OnionMessageHandler};
use ln::onion_utils;
use super::blinded_route::{BlindedRoute, ForwardTlvs, ReceiveTlvs};
Expand DownExpand Up@@ -345,6 +346,18 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessageHandler for OnionMessenger<Si
 let mut pending_msgs = self.pending_messages.lock().unwrap();
 pending_msgs.remove(their_node_id);
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_onion_messages_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_onion_messages_optional();
 features
	}
}

impl<Signer: Sign, K: Deref, L: Deref> OnionMessageProvider for OnionMessenger<Signer, K, L>
Expand Down

6 changes: 6 additions & 0 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,6 +571,12 @@ where C::Target: chain::Access, L::Target: Logger
 })
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down

8 changes: 7 additions & 1 deletion
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ impl msgs::ChannelMessageHandler for TestChannelMessageHandler {
 self.received_msg(wire::Message::Error(msg.clone()));
	}
	fn provided_node_features(&self) -> NodeFeatures {
 NodeFeatures::empty()
 NodeFeatures::known_channel_features()
	}
	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 InitFeatures::known_channel_features()
Expand DownExpand Up@@ -511,6 +511,12 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 Ok(())
	}

	fn provided_node_features(&self) -> NodeFeatures {
 let mut features = NodeFeatures::empty();
 features.set_gossip_queries_optional();
 features
	}

	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
 let mut features = InitFeatures::empty();
 features.set_gossip_queries_optional();
Expand Down