Onion messages API #1432

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
valentinewallace wants to merge 6 commits into from
Closed

Onion messages API #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b9bd8f
Add onion_messages module
valentinewallace May 27, 2022
a79d741
Enable the construction of blinded routes
valentinewallace May 27, 2022
0e184cb
Add onion_messages::Packet and adapt relevant onion util
valentinewallace Jun 4, 2022
6daa533
Add empty OnionMessenger, OnionMessageHandler trait, and boilerplate
valentinewallace Jun 4, 2022
e3ececc
Support sending onion messages
valentinewallace Jun 4, 2022
6916934
Implement receiving and forwarding onion messages
valentinewallace Jun 4, 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
4 changes: 3 additions & 1 deletion lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -178,14 +178,15 @@ impl BackgroundProcessor {
P: 'static + Deref + Send + Sync,
Descriptor: 'static + SocketDescriptor + Send + Sync,
CMH: 'static + Deref + Send + Sync,
OMH: 'static + Deref + Send + Sync,
RMH: 'static + Deref + Send + Sync,
EH: 'static + EventHandler + Send,
PS: 'static + Deref + Send,
M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
CM: 'static + Deref<Target = ChannelManager<Signer, CW, T, K, F, L>> + Send + Sync,
PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
UMH: 'static + Deref + Send + Sync,
PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, L, UMH>> + Send + Sync,
PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, OMH, L, UMH>> + Send + Sync,
S: 'static + Deref<Target = SC> + Send + Sync,
SC: WriteableScore<'a>,
RGS: 'static + Deref<Target = RapidGossipSync<G>> + Send
Expand All@@ -204,6 +205,7 @@ impl BackgroundProcessor {
L::Target: 'static + Logger,
P::Target: 'static + Persist<Signer>,
CMH::Target: 'static + ChannelMessageHandler,
OMH::Target: 'static + OnionMessageHandler,
RMH::Target: 'static + RoutingMessageHandler,
UMH::Target: 'static + CustomMessageHandler,
PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
Expand Down
15 changes: 10 additions & 5 deletions lightning-net-tokio/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,9 +120,10 @@ struct Connection {
id: u64,
}
impl Connection {
async fn poll_event_process<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
async fn poll_event_process<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
CMH: ChannelMessageHandler + 'static + Send + Sync,
RMH: RoutingMessageHandler + 'static + Send + Sync,
OMH: OnionMessageHandler + 'static + Send + Sync,
L: Logger + 'static + ?Sized + Send + Sync,
UMH: CustomMessageHandler + 'static + Send + Sync {
loop {
Expand All@@ -133,9 +134,10 @@ impl Connection {
}
}

async fn schedule_read<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
async fn schedule_read<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
CMH: ChannelMessageHandler + 'static + Send + Sync,
RMH: RoutingMessageHandler + 'static + Send + Sync,
OMH: OnionMessageHandler + 'static + Send + Sync,
L: Logger + 'static + ?Sized + Send + Sync,
UMH: CustomMessageHandler + 'static + Send + Sync {
// Create a waker to wake up poll_event_process, above
Expand DownExpand Up@@ -255,9 +257,10 @@ fn get_addr_from_stream(stream: &StdTcpStream) -> Option<NetAddress> {
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
CMH: ChannelMessageHandler + 'static + Send + Sync,
RMH: RoutingMessageHandler + 'static + Send + Sync,
OMH: OnionMessageHandler + 'static + Send + Sync,
L: Logger + 'static + ?Sized + Send + Sync,
UMH: CustomMessageHandler + 'static + Send + Sync {
let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -297,9 +300,10 @@ pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManag
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
CMH: ChannelMessageHandler + 'static + Send + Sync,
RMH: RoutingMessageHandler + 'static + Send + Sync,
OMH: OnionMessageHandler + 'static + Send + Sync,
L: Logger + 'static + ?Sized + Send + Sync,
UMH: CustomMessageHandler + 'static + Send + Sync {
let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -368,9 +372,10 @@ pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerMana
/// disconnected and associated handling futures are freed, though, because all processing in said
/// futures are spawned with tokio::spawn, you do not need to poll the second future in order to
/// make progress.
pub async fn connect_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
pub async fn connect_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
CMH: ChannelMessageHandler + 'static + Send + Sync,
RMH: RoutingMessageHandler + 'static + Send + Sync,
OMH: OnionMessageHandler + 'static + Send + Sync,
L: Logger + 'static + ?Sized + Send + Sync,
UMH: CustomMessageHandler + 'static + Send + Sync {
if let Ok(Ok(stream)) = time::timeout(Duration::from_secs(10), async { TcpStream::connect(&addr).await.map(|s| s.into_std().unwrap()) }).await {
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2139,7 +2139,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
}
}

let next_hop = match onion_utils::decode_next_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
let next_hop = match onion_utils::decode_next_payment_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
Ok(res) => res,
Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
return_malformed_err!(err_msg, err_code);
Expand DownExpand Up@@ -2967,7 +2967,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
let phantom_secret_res = self.keys_manager.get_node_secret(Recipient::PhantomNode);
if phantom_secret_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id) {
let phantom_shared_secret = SharedSecret::new(&onion_packet.public_key.unwrap(), &phantom_secret_res.unwrap()).secret_bytes();
let next_hop = match onion_utils::decode_next_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
let next_hop = match onion_utils::decode_next_payment_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
Ok(res) => res,
Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
let sha256_of_onion = Sha256::hash(&onion_packet.hop_data).into_inner();
Expand Down
1 change: 1 addition & 0 deletions lightning/src/ln/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ pub mod functional_test_utils;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
pub mod onion_message;
pub mod peer_handler;
pub mod chan_utils;
pub mod features;
Expand Down
25 changes: 25 additions & 0 deletions lightning/src/ln/msgs.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,16 @@ pub struct UpdateAddHTLC {
pub(crate) onion_routing_packet: OnionPacket,
}

/// An onion message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct OnionMessage {
/// This blinding point is used in the shared secret that is used to decrypt the onion message
/// payload's `encrypted_data` field.
pub(crate) blinding_point: PublicKey,
pub(crate) len: u16,
pub(crate) onion_routing_packet: onion_message::Packet,
}

/// An update_fulfill_htlc message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct UpdateFulfillHTLC {
Expand DownExpand Up@@ -912,6 +922,12 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;
}

/// A trait to describe an object that can receive onion messages.
pub trait OnionMessageHandler : MessageSendEventsProvider {
/// Handle an incoming onion_message message from the given peer.
fn handle_onion_message(&self, their_node_id: &PublicKey, msg: &OnionMessage);
}

mod fuzzy_internal_msgs {
use prelude::*;
use ln::{PaymentPreimage, PaymentSecret};
Expand DownExpand Up@@ -1304,6 +1320,15 @@ impl_writeable_msg!(UpdateAddHTLC, {
onion_routing_packet
}, {});

impl Readable for OnionMessage {
fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
}
}

impl Writeable for OnionMessage {
}
}

impl Writeable for FinalOnionHopData {
fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
self.payment_secret.0.write(w)?;
Expand Down
Loading
, '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 API #1432

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

valentinewallace
wants to merge
6
commits into

from

 Closed


Onion messages API #1432
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1b9bd8f

Add onion_messages module


valentinewallace May 27, 2022
a79d741

Enable the construction of blinded routes


valentinewallace May 27, 2022
0e184cb

Add onion_messages::Packet and adapt relevant onion util


valentinewallace Jun 4, 2022
6daa533

Add empty OnionMessenger, OnionMessageHandler trait, and boilerplate


valentinewallace Jun 4, 2022
e3ececc

Support sending onion messages


valentinewallace Jun 4, 2022
6916934

Implement receiving and forwarding onion messages


valentinewallace Jun 4, 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


4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,14 +178,15 @@ impl BackgroundProcessor {
 P: 'static + Deref + Send + Sync,
 Descriptor: 'static + SocketDescriptor + Send + Sync,
 CMH: 'static + Deref + Send + Sync,
 OMH: 'static + Deref + Send + Sync,
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<Signer, CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 UMH: 'static + Deref + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, L, UMH>> + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, OMH, L, UMH>> + Send + Sync,
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: WriteableScore<'a>,
 RGS: 'static + Deref<Target = RapidGossipSync<G>> + Send
Expand All@@ -204,6 +205,7 @@ impl BackgroundProcessor {
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
 UMH::Target: 'static + CustomMessageHandler,
 PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
Expand Down

15 changes: 10 additions & 5 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,9 +120,10 @@ struct Connection {
	id: u64,
}
impl Connection {
	async fn poll_event_process<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
	async fn poll_event_process<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 loop {
Expand All@@ -133,9 +134,10 @@ impl Connection {
 }
	}

	async fn schedule_read<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
	async fn schedule_read<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 // Create a waker to wake up poll_event_process, above
Expand DownExpand Up@@ -255,9 +257,10 @@ fn get_addr_from_stream(stream: &StdTcpStream) -> Option<NetAddress> {
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -297,9 +300,10 @@ pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManag
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -368,9 +372,10 @@ pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerMana
/// disconnected and associated handling futures are freed, though, because all processing in said
/// futures are spawned with tokio::spawn, you do not need to poll the second future in order to
/// make progress.
pub async fn connect_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
pub async fn connect_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	if let Ok(Ok(stream)) = time::timeout(Duration::from_secs(10), async { TcpStream::connect(&addr).await.map(|s| s.into_std().unwrap()) }).await {
Expand Down

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

View file


Open in desktop

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

 let next_hop = match onion_utils::decode_next_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 return_malformed_err!(err_msg, err_code);
Expand DownExpand Up@@ -2967,7 +2967,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 let phantom_secret_res = self.keys_manager.get_node_secret(Recipient::PhantomNode);
 if phantom_secret_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id) {
 let phantom_shared_secret = SharedSecret::new(&onion_packet.public_key.unwrap(), &phantom_secret_res.unwrap()).secret_bytes();
 let next_hop = match onion_utils::decode_next_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 let sha256_of_onion = Sha256::hash(&onion_packet.hop_data).into_inner();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ pub mod functional_test_utils;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
pub mod onion_message;
pub mod peer_handler;
pub mod chan_utils;
pub mod features;
Expand Down

25 changes: 25 additions & 0 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,16 @@ pub struct UpdateAddHTLC {
	pub(crate) onion_routing_packet: OnionPacket,
}

 /// An onion message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct OnionMessage {
	/// This blinding point is used in the shared secret that is used to decrypt the onion message
	/// payload's `encrypted_data` field.
	pub(crate) blinding_point: PublicKey,
	pub(crate) len: u16,
	pub(crate) onion_routing_packet: onion_message::Packet,
}

/// An update_fulfill_htlc message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct UpdateFulfillHTLC {
Expand DownExpand Up@@ -912,6 +922,12 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;
}

/// A trait to describe an object that can receive onion messages.
pub trait OnionMessageHandler : MessageSendEventsProvider {
	/// Handle an incoming onion_message message from the given peer.
	fn handle_onion_message(&self, their_node_id: &PublicKey, msg: &OnionMessage);
}

mod fuzzy_internal_msgs {
	use prelude::*;
	use ln::{PaymentPreimage, PaymentSecret};
Expand DownExpand Up@@ -1304,6 +1320,15 @@ impl_writeable_msg!(UpdateAddHTLC, {
	onion_routing_packet
}, {});

impl Readable for OnionMessage {
	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
	}
}

impl Writeable for OnionMessage {
	}
}

impl Writeable for FinalOnionHopData {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 self.payment_secret.0.write(w)?;
Expand Down
Loading

, '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 API #1432

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

valentinewallace
wants to merge
6
commits into

from

 Closed


Onion messages API #1432
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1b9bd8f

Add onion_messages module


valentinewallace May 27, 2022
a79d741

Enable the construction of blinded routes


valentinewallace May 27, 2022
0e184cb

Add onion_messages::Packet and adapt relevant onion util


valentinewallace Jun 4, 2022
6daa533

Add empty OnionMessenger, OnionMessageHandler trait, and boilerplate


valentinewallace Jun 4, 2022
e3ececc

Support sending onion messages


valentinewallace Jun 4, 2022
6916934

Implement receiving and forwarding onion messages


valentinewallace Jun 4, 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


4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,14 +178,15 @@ impl BackgroundProcessor {
 P: 'static + Deref + Send + Sync,
 Descriptor: 'static + SocketDescriptor + Send + Sync,
 CMH: 'static + Deref + Send + Sync,
 OMH: 'static + Deref + Send + Sync,
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<Signer, CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 UMH: 'static + Deref + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, L, UMH>> + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, OMH, L, UMH>> + Send + Sync,
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: WriteableScore<'a>,
 RGS: 'static + Deref<Target = RapidGossipSync<G>> + Send
Expand All@@ -204,6 +205,7 @@ impl BackgroundProcessor {
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
 UMH::Target: 'static + CustomMessageHandler,
 PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
Expand Down

15 changes: 10 additions & 5 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,9 +120,10 @@ struct Connection {
	id: u64,
}
impl Connection {
	async fn poll_event_process<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
	async fn poll_event_process<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 loop {
Expand All@@ -133,9 +134,10 @@ impl Connection {
 }
	}

	async fn schedule_read<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
	async fn schedule_read<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 // Create a waker to wake up poll_event_process, above
Expand DownExpand Up@@ -255,9 +257,10 @@ fn get_addr_from_stream(stream: &StdTcpStream) -> Option<NetAddress> {
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -297,9 +300,10 @@ pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManag
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -368,9 +372,10 @@ pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerMana
/// disconnected and associated handling futures are freed, though, because all processing in said
/// futures are spawned with tokio::spawn, you do not need to poll the second future in order to
/// make progress.
pub async fn connect_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
pub async fn connect_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	if let Ok(Ok(stream)) = time::timeout(Duration::from_secs(10), async { TcpStream::connect(&addr).await.map(|s| s.into_std().unwrap()) }).await {
Expand Down

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

View file


Open in desktop

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

 let next_hop = match onion_utils::decode_next_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 return_malformed_err!(err_msg, err_code);
Expand DownExpand Up@@ -2967,7 +2967,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 let phantom_secret_res = self.keys_manager.get_node_secret(Recipient::PhantomNode);
 if phantom_secret_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id) {
 let phantom_shared_secret = SharedSecret::new(&onion_packet.public_key.unwrap(), &phantom_secret_res.unwrap()).secret_bytes();
 let next_hop = match onion_utils::decode_next_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 let sha256_of_onion = Sha256::hash(&onion_packet.hop_data).into_inner();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ pub mod functional_test_utils;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
pub mod onion_message;
pub mod peer_handler;
pub mod chan_utils;
pub mod features;
Expand Down

25 changes: 25 additions & 0 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,16 @@ pub struct UpdateAddHTLC {
	pub(crate) onion_routing_packet: OnionPacket,
}

 /// An onion message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct OnionMessage {
	/// This blinding point is used in the shared secret that is used to decrypt the onion message
	/// payload's `encrypted_data` field.
	pub(crate) blinding_point: PublicKey,
	pub(crate) len: u16,
	pub(crate) onion_routing_packet: onion_message::Packet,
}

/// An update_fulfill_htlc message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct UpdateFulfillHTLC {
Expand DownExpand Up@@ -912,6 +922,12 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;
}

/// A trait to describe an object that can receive onion messages.
pub trait OnionMessageHandler : MessageSendEventsProvider {
	/// Handle an incoming onion_message message from the given peer.
	fn handle_onion_message(&self, their_node_id: &PublicKey, msg: &OnionMessage);
}

mod fuzzy_internal_msgs {
	use prelude::*;
	use ln::{PaymentPreimage, PaymentSecret};
Expand DownExpand Up@@ -1304,6 +1320,15 @@ impl_writeable_msg!(UpdateAddHTLC, {
	onion_routing_packet
}, {});

impl Readable for OnionMessage {
	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
	}
}

impl Writeable for OnionMessage {
	}
}

impl Writeable for FinalOnionHopData {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 self.payment_secret.0.write(w)?;
Expand Down
Loading

, '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 API #1432

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

valentinewallace
wants to merge
6
commits into

from

 Closed


Onion messages API #1432
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1b9bd8f

Add onion_messages module


valentinewallace May 27, 2022
a79d741

Enable the construction of blinded routes


valentinewallace May 27, 2022
0e184cb

Add onion_messages::Packet and adapt relevant onion util


valentinewallace Jun 4, 2022
6daa533

Add empty OnionMessenger, OnionMessageHandler trait, and boilerplate


valentinewallace Jun 4, 2022
e3ececc

Support sending onion messages


valentinewallace Jun 4, 2022
6916934

Implement receiving and forwarding onion messages


valentinewallace Jun 4, 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


4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,14 +178,15 @@ impl BackgroundProcessor {
 P: 'static + Deref + Send + Sync,
 Descriptor: 'static + SocketDescriptor + Send + Sync,
 CMH: 'static + Deref + Send + Sync,
 OMH: 'static + Deref + Send + Sync,
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<Signer, CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 UMH: 'static + Deref + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, L, UMH>> + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, OMH, L, UMH>> + Send + Sync,
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: WriteableScore<'a>,
 RGS: 'static + Deref<Target = RapidGossipSync<G>> + Send
Expand All@@ -204,6 +205,7 @@ impl BackgroundProcessor {
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
 UMH::Target: 'static + CustomMessageHandler,
 PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
Expand Down

15 changes: 10 additions & 5 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,9 +120,10 @@ struct Connection {
	id: u64,
}
impl Connection {
	async fn poll_event_process<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
	async fn poll_event_process<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 loop {
Expand All@@ -133,9 +134,10 @@ impl Connection {
 }
	}

	async fn schedule_read<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
	async fn schedule_read<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 // Create a waker to wake up poll_event_process, above
Expand DownExpand Up@@ -255,9 +257,10 @@ fn get_addr_from_stream(stream: &StdTcpStream) -> Option<NetAddress> {
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -297,9 +300,10 @@ pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManag
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -368,9 +372,10 @@ pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerMana
/// disconnected and associated handling futures are freed, though, because all processing in said
/// futures are spawned with tokio::spawn, you do not need to poll the second future in order to
/// make progress.
pub async fn connect_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
pub async fn connect_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	if let Ok(Ok(stream)) = time::timeout(Duration::from_secs(10), async { TcpStream::connect(&addr).await.map(|s| s.into_std().unwrap()) }).await {
Expand Down

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

View file


Open in desktop

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

 let next_hop = match onion_utils::decode_next_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 return_malformed_err!(err_msg, err_code);
Expand DownExpand Up@@ -2967,7 +2967,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 let phantom_secret_res = self.keys_manager.get_node_secret(Recipient::PhantomNode);
 if phantom_secret_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id) {
 let phantom_shared_secret = SharedSecret::new(&onion_packet.public_key.unwrap(), &phantom_secret_res.unwrap()).secret_bytes();
 let next_hop = match onion_utils::decode_next_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 let sha256_of_onion = Sha256::hash(&onion_packet.hop_data).into_inner();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ pub mod functional_test_utils;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
pub mod onion_message;
pub mod peer_handler;
pub mod chan_utils;
pub mod features;
Expand Down

25 changes: 25 additions & 0 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,16 @@ pub struct UpdateAddHTLC {
	pub(crate) onion_routing_packet: OnionPacket,
}

 /// An onion message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct OnionMessage {
	/// This blinding point is used in the shared secret that is used to decrypt the onion message
	/// payload's `encrypted_data` field.
	pub(crate) blinding_point: PublicKey,
	pub(crate) len: u16,
	pub(crate) onion_routing_packet: onion_message::Packet,
}

/// An update_fulfill_htlc message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct UpdateFulfillHTLC {
Expand DownExpand Up@@ -912,6 +922,12 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;
}

/// A trait to describe an object that can receive onion messages.
pub trait OnionMessageHandler : MessageSendEventsProvider {
	/// Handle an incoming onion_message message from the given peer.
	fn handle_onion_message(&self, their_node_id: &PublicKey, msg: &OnionMessage);
}

mod fuzzy_internal_msgs {
	use prelude::*;
	use ln::{PaymentPreimage, PaymentSecret};
Expand DownExpand Up@@ -1304,6 +1320,15 @@ impl_writeable_msg!(UpdateAddHTLC, {
	onion_routing_packet
}, {});

impl Readable for OnionMessage {
	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
	}
}

impl Writeable for OnionMessage {
	}
}

impl Writeable for FinalOnionHopData {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 self.payment_secret.0.write(w)?;
Expand Down
Loading

, '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 API #1432

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

valentinewallace
wants to merge
6
commits into

from

 Closed


Onion messages API #1432
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1b9bd8f

Add onion_messages module


valentinewallace May 27, 2022
a79d741

Enable the construction of blinded routes


valentinewallace May 27, 2022
0e184cb

Add onion_messages::Packet and adapt relevant onion util


valentinewallace Jun 4, 2022
6daa533

Add empty OnionMessenger, OnionMessageHandler trait, and boilerplate


valentinewallace Jun 4, 2022
e3ececc

Support sending onion messages


valentinewallace Jun 4, 2022
6916934

Implement receiving and forwarding onion messages


valentinewallace Jun 4, 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


4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,14 +178,15 @@ impl BackgroundProcessor {
 P: 'static + Deref + Send + Sync,
 Descriptor: 'static + SocketDescriptor + Send + Sync,
 CMH: 'static + Deref + Send + Sync,
 OMH: 'static + Deref + Send + Sync,
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<Signer, CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 UMH: 'static + Deref + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, L, UMH>> + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, OMH, L, UMH>> + Send + Sync,
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: WriteableScore<'a>,
 RGS: 'static + Deref<Target = RapidGossipSync<G>> + Send
Expand All@@ -204,6 +205,7 @@ impl BackgroundProcessor {
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
 UMH::Target: 'static + CustomMessageHandler,
 PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
Expand Down

15 changes: 10 additions & 5 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,9 +120,10 @@ struct Connection {
	id: u64,
}
impl Connection {
	async fn poll_event_process<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
	async fn poll_event_process<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 loop {
Expand All@@ -133,9 +134,10 @@ impl Connection {
 }
	}

	async fn schedule_read<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
	async fn schedule_read<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 // Create a waker to wake up poll_event_process, above
Expand DownExpand Up@@ -255,9 +257,10 @@ fn get_addr_from_stream(stream: &StdTcpStream) -> Option<NetAddress> {
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -297,9 +300,10 @@ pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManag
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -368,9 +372,10 @@ pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerMana
/// disconnected and associated handling futures are freed, though, because all processing in said
/// futures are spawned with tokio::spawn, you do not need to poll the second future in order to
/// make progress.
pub async fn connect_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
pub async fn connect_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	if let Ok(Ok(stream)) = time::timeout(Duration::from_secs(10), async { TcpStream::connect(&addr).await.map(|s| s.into_std().unwrap()) }).await {
Expand Down

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

View file


Open in desktop

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

 let next_hop = match onion_utils::decode_next_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 return_malformed_err!(err_msg, err_code);
Expand DownExpand Up@@ -2967,7 +2967,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 let phantom_secret_res = self.keys_manager.get_node_secret(Recipient::PhantomNode);
 if phantom_secret_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id) {
 let phantom_shared_secret = SharedSecret::new(&onion_packet.public_key.unwrap(), &phantom_secret_res.unwrap()).secret_bytes();
 let next_hop = match onion_utils::decode_next_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 let sha256_of_onion = Sha256::hash(&onion_packet.hop_data).into_inner();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ pub mod functional_test_utils;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
pub mod onion_message;
pub mod peer_handler;
pub mod chan_utils;
pub mod features;
Expand Down

25 changes: 25 additions & 0 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,16 @@ pub struct UpdateAddHTLC {
	pub(crate) onion_routing_packet: OnionPacket,
}

 /// An onion message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct OnionMessage {
	/// This blinding point is used in the shared secret that is used to decrypt the onion message
	/// payload's `encrypted_data` field.
	pub(crate) blinding_point: PublicKey,
	pub(crate) len: u16,
	pub(crate) onion_routing_packet: onion_message::Packet,
}

/// An update_fulfill_htlc message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct UpdateFulfillHTLC {
Expand DownExpand Up@@ -912,6 +922,12 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;
}

/// A trait to describe an object that can receive onion messages.
pub trait OnionMessageHandler : MessageSendEventsProvider {
	/// Handle an incoming onion_message message from the given peer.
	fn handle_onion_message(&self, their_node_id: &PublicKey, msg: &OnionMessage);
}

mod fuzzy_internal_msgs {
	use prelude::*;
	use ln::{PaymentPreimage, PaymentSecret};
Expand DownExpand Up@@ -1304,6 +1320,15 @@ impl_writeable_msg!(UpdateAddHTLC, {
	onion_routing_packet
}, {});

impl Readable for OnionMessage {
	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
	}
}

impl Writeable for OnionMessage {
	}
}

impl Writeable for FinalOnionHopData {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 self.payment_secret.0.write(w)?;
Expand Down
Loading

, '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 API #1432

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

valentinewallace
wants to merge
6
commits into

from

 Closed


Onion messages API #1432
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1b9bd8f

Add onion_messages module


valentinewallace May 27, 2022
a79d741

Enable the construction of blinded routes


valentinewallace May 27, 2022
0e184cb

Add onion_messages::Packet and adapt relevant onion util


valentinewallace Jun 4, 2022
6daa533

Add empty OnionMessenger, OnionMessageHandler trait, and boilerplate


valentinewallace Jun 4, 2022
e3ececc

Support sending onion messages


valentinewallace Jun 4, 2022
6916934

Implement receiving and forwarding onion messages


valentinewallace Jun 4, 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


4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,14 +178,15 @@ impl BackgroundProcessor {
 P: 'static + Deref + Send + Sync,
 Descriptor: 'static + SocketDescriptor + Send + Sync,
 CMH: 'static + Deref + Send + Sync,
 OMH: 'static + Deref + Send + Sync,
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<Signer, CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 UMH: 'static + Deref + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, L, UMH>> + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, OMH, L, UMH>> + Send + Sync,
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: WriteableScore<'a>,
 RGS: 'static + Deref<Target = RapidGossipSync<G>> + Send
Expand All@@ -204,6 +205,7 @@ impl BackgroundProcessor {
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
 UMH::Target: 'static + CustomMessageHandler,
 PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
Expand Down

15 changes: 10 additions & 5 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,9 +120,10 @@ struct Connection {
	id: u64,
}
impl Connection {
	async fn poll_event_process<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
	async fn poll_event_process<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 loop {
Expand All@@ -133,9 +134,10 @@ impl Connection {
 }
	}

	async fn schedule_read<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
	async fn schedule_read<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 // Create a waker to wake up poll_event_process, above
Expand DownExpand Up@@ -255,9 +257,10 @@ fn get_addr_from_stream(stream: &StdTcpStream) -> Option<NetAddress> {
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -297,9 +300,10 @@ pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManag
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -368,9 +372,10 @@ pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerMana
/// disconnected and associated handling futures are freed, though, because all processing in said
/// futures are spawned with tokio::spawn, you do not need to poll the second future in order to
/// make progress.
pub async fn connect_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
pub async fn connect_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	if let Ok(Ok(stream)) = time::timeout(Duration::from_secs(10), async { TcpStream::connect(&addr).await.map(|s| s.into_std().unwrap()) }).await {
Expand Down

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

View file


Open in desktop

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

 let next_hop = match onion_utils::decode_next_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 return_malformed_err!(err_msg, err_code);
Expand DownExpand Up@@ -2967,7 +2967,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 let phantom_secret_res = self.keys_manager.get_node_secret(Recipient::PhantomNode);
 if phantom_secret_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id) {
 let phantom_shared_secret = SharedSecret::new(&onion_packet.public_key.unwrap(), &phantom_secret_res.unwrap()).secret_bytes();
 let next_hop = match onion_utils::decode_next_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 let sha256_of_onion = Sha256::hash(&onion_packet.hop_data).into_inner();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ pub mod functional_test_utils;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
pub mod onion_message;
pub mod peer_handler;
pub mod chan_utils;
pub mod features;
Expand Down

25 changes: 25 additions & 0 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,16 @@ pub struct UpdateAddHTLC {
	pub(crate) onion_routing_packet: OnionPacket,
}

 /// An onion message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct OnionMessage {
	/// This blinding point is used in the shared secret that is used to decrypt the onion message
	/// payload's `encrypted_data` field.
	pub(crate) blinding_point: PublicKey,
	pub(crate) len: u16,
	pub(crate) onion_routing_packet: onion_message::Packet,
}

/// An update_fulfill_htlc message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct UpdateFulfillHTLC {
Expand DownExpand Up@@ -912,6 +922,12 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;
}

/// A trait to describe an object that can receive onion messages.
pub trait OnionMessageHandler : MessageSendEventsProvider {
	/// Handle an incoming onion_message message from the given peer.
	fn handle_onion_message(&self, their_node_id: &PublicKey, msg: &OnionMessage);
}

mod fuzzy_internal_msgs {
	use prelude::*;
	use ln::{PaymentPreimage, PaymentSecret};
Expand DownExpand Up@@ -1304,6 +1320,15 @@ impl_writeable_msg!(UpdateAddHTLC, {
	onion_routing_packet
}, {});

impl Readable for OnionMessage {
	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
	}
}

impl Writeable for OnionMessage {
	}
}

impl Writeable for FinalOnionHopData {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 self.payment_secret.0.write(w)?;
Expand Down
Loading

, '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 API #1432

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

valentinewallace
wants to merge
6
commits into

from

 Closed


Onion messages API #1432
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1b9bd8f

Add onion_messages module


valentinewallace May 27, 2022
a79d741

Enable the construction of blinded routes


valentinewallace May 27, 2022
0e184cb

Add onion_messages::Packet and adapt relevant onion util


valentinewallace Jun 4, 2022
6daa533

Add empty OnionMessenger, OnionMessageHandler trait, and boilerplate


valentinewallace Jun 4, 2022
e3ececc

Support sending onion messages


valentinewallace Jun 4, 2022
6916934

Implement receiving and forwarding onion messages


valentinewallace Jun 4, 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


4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,14 +178,15 @@ impl BackgroundProcessor {
 P: 'static + Deref + Send + Sync,
 Descriptor: 'static + SocketDescriptor + Send + Sync,
 CMH: 'static + Deref + Send + Sync,
 OMH: 'static + Deref + Send + Sync,
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<Signer, CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 UMH: 'static + Deref + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, L, UMH>> + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, OMH, L, UMH>> + Send + Sync,
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: WriteableScore<'a>,
 RGS: 'static + Deref<Target = RapidGossipSync<G>> + Send
Expand All@@ -204,6 +205,7 @@ impl BackgroundProcessor {
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
 UMH::Target: 'static + CustomMessageHandler,
 PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
Expand Down

15 changes: 10 additions & 5 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,9 +120,10 @@ struct Connection {
	id: u64,
}
impl Connection {
	async fn poll_event_process<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
	async fn poll_event_process<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 loop {
Expand All@@ -133,9 +134,10 @@ impl Connection {
 }
	}

	async fn schedule_read<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
	async fn schedule_read<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 // Create a waker to wake up poll_event_process, above
Expand DownExpand Up@@ -255,9 +257,10 @@ fn get_addr_from_stream(stream: &StdTcpStream) -> Option<NetAddress> {
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -297,9 +300,10 @@ pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManag
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -368,9 +372,10 @@ pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerMana
/// disconnected and associated handling futures are freed, though, because all processing in said
/// futures are spawned with tokio::spawn, you do not need to poll the second future in order to
/// make progress.
pub async fn connect_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
pub async fn connect_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	if let Ok(Ok(stream)) = time::timeout(Duration::from_secs(10), async { TcpStream::connect(&addr).await.map(|s| s.into_std().unwrap()) }).await {
Expand Down

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

View file


Open in desktop

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

 let next_hop = match onion_utils::decode_next_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 return_malformed_err!(err_msg, err_code);
Expand DownExpand Up@@ -2967,7 +2967,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 let phantom_secret_res = self.keys_manager.get_node_secret(Recipient::PhantomNode);
 if phantom_secret_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id) {
 let phantom_shared_secret = SharedSecret::new(&onion_packet.public_key.unwrap(), &phantom_secret_res.unwrap()).secret_bytes();
 let next_hop = match onion_utils::decode_next_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 let sha256_of_onion = Sha256::hash(&onion_packet.hop_data).into_inner();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ pub mod functional_test_utils;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
pub mod onion_message;
pub mod peer_handler;
pub mod chan_utils;
pub mod features;
Expand Down

25 changes: 25 additions & 0 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,16 @@ pub struct UpdateAddHTLC {
	pub(crate) onion_routing_packet: OnionPacket,
}

 /// An onion message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct OnionMessage {
	/// This blinding point is used in the shared secret that is used to decrypt the onion message
	/// payload's `encrypted_data` field.
	pub(crate) blinding_point: PublicKey,
	pub(crate) len: u16,
	pub(crate) onion_routing_packet: onion_message::Packet,
}

/// An update_fulfill_htlc message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct UpdateFulfillHTLC {
Expand DownExpand Up@@ -912,6 +922,12 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;
}

/// A trait to describe an object that can receive onion messages.
pub trait OnionMessageHandler : MessageSendEventsProvider {
	/// Handle an incoming onion_message message from the given peer.
	fn handle_onion_message(&self, their_node_id: &PublicKey, msg: &OnionMessage);
}

mod fuzzy_internal_msgs {
	use prelude::*;
	use ln::{PaymentPreimage, PaymentSecret};
Expand DownExpand Up@@ -1304,6 +1320,15 @@ impl_writeable_msg!(UpdateAddHTLC, {
	onion_routing_packet
}, {});

impl Readable for OnionMessage {
	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
	}
}

impl Writeable for OnionMessage {
	}
}

impl Writeable for FinalOnionHopData {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 self.payment_secret.0.write(w)?;
Expand Down
Loading

, '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 API #1432

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

valentinewallace
wants to merge
6
commits into

from

 Closed


Onion messages API #1432
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1b9bd8f

Add onion_messages module


valentinewallace May 27, 2022
a79d741

Enable the construction of blinded routes


valentinewallace May 27, 2022
0e184cb

Add onion_messages::Packet and adapt relevant onion util


valentinewallace Jun 4, 2022
6daa533

Add empty OnionMessenger, OnionMessageHandler trait, and boilerplate


valentinewallace Jun 4, 2022
e3ececc

Support sending onion messages


valentinewallace Jun 4, 2022
6916934

Implement receiving and forwarding onion messages


valentinewallace Jun 4, 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


4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,14 +178,15 @@ impl BackgroundProcessor {
 P: 'static + Deref + Send + Sync,
 Descriptor: 'static + SocketDescriptor + Send + Sync,
 CMH: 'static + Deref + Send + Sync,
 OMH: 'static + Deref + Send + Sync,
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<Signer, CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 UMH: 'static + Deref + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, L, UMH>> + Send + Sync,
 PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, OMH, L, UMH>> + Send + Sync,
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: WriteableScore<'a>,
 RGS: 'static + Deref<Target = RapidGossipSync<G>> + Send
Expand All@@ -204,6 +205,7 @@ impl BackgroundProcessor {
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
 UMH::Target: 'static + CustomMessageHandler,
 PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
Expand Down

15 changes: 10 additions & 5 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,9 +120,10 @@ struct Connection {
	id: u64,
}
impl Connection {
	async fn poll_event_process<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
	async fn poll_event_process<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, mut event_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 loop {
Expand All@@ -133,9 +134,10 @@ impl Connection {
 }
	}

	async fn schedule_read<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
	async fn schedule_read<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, us: Arc<Mutex<Self>>, mut reader: io::ReadHalf<TcpStream>, mut read_wake_receiver: mpsc::Receiver<()>, mut write_avail_receiver: mpsc::Receiver<()>) where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
 // Create a waker to wake up poll_event_process, above
Expand DownExpand Up@@ -255,9 +257,10 @@ fn get_addr_from_stream(stream: &StdTcpStream) -> Option<NetAddress> {
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -297,9 +300,10 @@ pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManag
/// The returned future will complete when the peer is disconnected and associated handling
/// futures are freed, though, because all processing futures are spawned with tokio::spawn, you do
/// not need to poll the provided future in order to make progress.
pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, stream: StdTcpStream) -> impl std::future::Future<Output=()> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	let remote_addr = get_addr_from_stream(&stream);
Expand DownExpand Up@@ -368,9 +372,10 @@ pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerMana
/// disconnected and associated handling futures are freed, though, because all processing in said
/// futures are spawned with tokio::spawn, you do not need to poll the second future in order to
/// make progress.
pub async fn connect_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
pub async fn connect_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor, Arc<CMH>, Arc<RMH>, Arc<OMH>, Arc<L>, Arc<UMH>>>, their_node_id: PublicKey, addr: SocketAddr) -> Option<impl std::future::Future<Output=()>> where
 CMH: ChannelMessageHandler + 'static + Send + Sync,
 RMH: RoutingMessageHandler + 'static + Send + Sync,
 OMH: OnionMessageHandler + 'static + Send + Sync,
 L: Logger + 'static + ?Sized + Send + Sync,
 UMH: CustomMessageHandler + 'static + Send + Sync {
	if let Ok(Ok(stream)) = time::timeout(Duration::from_secs(10), async { TcpStream::connect(&addr).await.map(|s| s.into_std().unwrap()) }).await {
Expand Down

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

View file


Open in desktop

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

 let next_hop = match onion_utils::decode_next_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(shared_secret, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac, msg.payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 return_malformed_err!(err_msg, err_code);
Expand DownExpand Up@@ -2967,7 +2967,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 let phantom_secret_res = self.keys_manager.get_node_secret(Recipient::PhantomNode);
 if phantom_secret_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id) {
 let phantom_shared_secret = SharedSecret::new(&onion_packet.public_key.unwrap(), &phantom_secret_res.unwrap()).secret_bytes();
 let next_hop = match onion_utils::decode_next_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 let next_hop = match onion_utils::decode_next_payment_hop(phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac, payment_hash) {
 Ok(res) => res,
 Err(onion_utils::OnionDecodeErr::Malformed { err_msg, err_code }) => {
 let sha256_of_onion = Sha256::hash(&onion_packet.hop_data).into_inner();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ pub mod functional_test_utils;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
pub mod onion_message;
pub mod peer_handler;
pub mod chan_utils;
pub mod features;
Expand Down

25 changes: 25 additions & 0 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,16 @@ pub struct UpdateAddHTLC {
	pub(crate) onion_routing_packet: OnionPacket,
}

 /// An onion message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct OnionMessage {
	/// This blinding point is used in the shared secret that is used to decrypt the onion message
	/// payload's `encrypted_data` field.
	pub(crate) blinding_point: PublicKey,
	pub(crate) len: u16,
	pub(crate) onion_routing_packet: onion_message::Packet,
}

/// An update_fulfill_htlc message to be sent or received from a peer
#[derive(Clone, Debug, PartialEq)]
pub struct UpdateFulfillHTLC {
Expand DownExpand Up@@ -912,6 +922,12 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;
}

/// A trait to describe an object that can receive onion messages.
pub trait OnionMessageHandler : MessageSendEventsProvider {
	/// Handle an incoming onion_message message from the given peer.
	fn handle_onion_message(&self, their_node_id: &PublicKey, msg: &OnionMessage);
}

mod fuzzy_internal_msgs {
	use prelude::*;
	use ln::{PaymentPreimage, PaymentSecret};
Expand DownExpand Up@@ -1304,6 +1320,15 @@ impl_writeable_msg!(UpdateAddHTLC, {
	onion_routing_packet
}, {});

impl Readable for OnionMessage {
	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
	}
}

impl Writeable for OnionMessage {
	}
}

impl Writeable for FinalOnionHopData {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 self.payment_secret.0.write(w)?;
Expand Down
Loading