Skip to content

Multi-hop BlindedPath creation interface#2781

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 14 commits into from
Dec 15, 2023
Merged

Multi-hop BlindedPath creation interface #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ee026d4
Re-order AnchorsZeroFeeHtlcTx in module docs/tests
jkczyz Mar 2, 2023
ffb0d83
Add RouteBlinding feature flag
jkczyz Mar 2, 2023
97049da
Add create_blinded_paths to MessageRouter
jkczyz Dec 7, 2023
bedc2c6
Require any Router also implements MessageRouter
jkczyz Dec 7, 2023
c558ccd
Fix create_one_hop_blinded_payment_path docs
jkczyz Dec 8, 2023
dcd8d58
Use CLTV_FAR_FAR_AWAY in PaymentConstraints
jkczyz Dec 15, 2023
606304a
Multi-hop blinded paths in ChannelManager
jkczyz Mar 3, 2023
4da0862
Fix broken doc link in create_refund_builder
jkczyz Dec 15, 2023
edb5892
CounterpartyForwardingInfo to PaymentRelay mapping
jkczyz Dec 8, 2023
62f8669
Add create_blinded_payment_paths to Router
jkczyz Dec 8, 2023
827833c
Multi-hop blinded payment paths in ChannelManager
jkczyz Dec 8, 2023
16ee240
DRY up OffersMessage::InvoiceRequest handling
jkczyz Dec 14, 2023
164c855
Use one-hop blinded paths only for announced nodes
jkczyz Dec 15, 2023
37319a6
Fix build warning
jkczyz Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, channelmonitor, Confirm, Watch};
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
Expand All@@ -44,8 +46,9 @@ use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::util::test_channel_signer::{TestChannelSigner, EnforcementState};
use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
Expand All@@ -56,7 +59,7 @@ use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RoutePara
use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -99,6 +102,32 @@ impl Router for FuzzRouter {
action: msgs::ErrorAction::IgnoreError
})
}

fn create_blinded_payment_paths<
ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
>(
&self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
_amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
unreachable!()
}
}

impl MessageRouter for FuzzRouter {
fn find_path(
&self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
) -> Result<OnionMessagePath, ()> {
unreachable!()
}

fn create_blinded_paths<
ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
>(
&self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
_secp_ctx: &Secp256k1<T>
) -> Result<Vec<BlindedPath>, ()> {
unreachable!()
}
}

pub struct TestBroadcaster {}
Expand Down
33 changes: 31 additions & 2 deletions fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{Txid, BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
Expand All@@ -41,8 +43,9 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::{self, DecodeError};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
use lightning::routing::utxo::UtxoLookup;
use lightning::routing::router::{InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
Expand All@@ -55,7 +58,7 @@ use lightning::util::ser::{ReadableArgs, Writeable};
use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -142,6 +145,32 @@ impl Router for FuzzRouter {
action: msgs::ErrorAction::IgnoreError
})
}

fn create_blinded_payment_paths<
ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
>(
&self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
_amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
unreachable!()
}
}

impl MessageRouter for FuzzRouter {
fn find_path(
&self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
) -> Result<OnionMessagePath, ()> {
unreachable!()
}

fn create_blinded_paths<
ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
>(
&self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
_secp_ctx: &Secp256k1<T>
) -> Result<Vec<BlindedPath>, ()> {
unreachable!()
}
}

struct TestBroadcaster {
Expand Down
14 changes: 12 additions & 2 deletions fuzz/src/onion_message.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
use bitcoin::secp256k1::schnorr;

use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::blinded_path::BlindedPath;
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::util::test_channel_signer::TestChannelSigner;
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -82,6 +83,15 @@ impl MessageRouter for TestMessageRouter {
first_node_addresses: None,
})
}

fn create_blinded_paths<
ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
>(
&self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
_secp_ctx: &Secp256k1<T>
) -> Result<Vec<BlindedPath>, ()> {
unreachable!()
}
}

struct TestOffersMessageHandler {}
Expand Down
10 changes: 10 additions & 0 deletions lightning/src/blinded_path/payment.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ use crate::blinded_path::BlindedHop;
use crate::blinded_path::utils;
use crate::io;
use crate::ln::PaymentSecret;
use crate::ln::channelmanager::CounterpartyForwardingInfo;
use crate::ln::features::BlindedHopFeatures;
use crate::ln::msgs::DecodeError;
use crate::offers::invoice::BlindedPayInfo;
Expand DownExpand Up@@ -96,6 +97,15 @@ pub struct PaymentConstraints {
pub htlc_minimum_msat: u64,
}

impl From<CounterpartyForwardingInfo> for PaymentRelay {
fn from(info: CounterpartyForwardingInfo) -> Self {
let CounterpartyForwardingInfo {
fee_base_msat, fee_proportional_millionths, cltv_expiry_delta
} = info;
Self { cltv_expiry_delta, fee_proportional_millionths, fee_base_msat }
}
}

impl Writeable for ForwardTlvs {
fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
encode_tlv_stream!(w, {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Multi-hop `BlindedPath` creation interface by jkczyz · Pull Request #2781 · lightningdevkit/rust-lightning · GitHub
Skip to content
Multi-hop BlindedPath creation interface#2781

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 14 commits into

from

Dec 15, 2023
 Merged


Multi-hop BlindedPath creation interface
#2781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
ee026d4

Re-order AnchorsZeroFeeHtlcTx in module docs/tests


jkczyz Mar 2, 2023
ffb0d83

Add RouteBlinding feature flag


jkczyz Mar 2, 2023
97049da

Add create_blinded_paths to MessageRouter


jkczyz Dec 7, 2023
bedc2c6

Require any Router also implements MessageRouter


jkczyz Dec 7, 2023
c558ccd

Fix create_one_hop_blinded_payment_path docs


jkczyz Dec 8, 2023
dcd8d58

Use CLTV_FAR_FAR_AWAY in PaymentConstraints


jkczyz Dec 15, 2023
606304a

Multi-hop blinded paths in ChannelManager


jkczyz Mar 3, 2023
4da0862

Fix broken doc link in create_refund_builder


jkczyz Dec 15, 2023
edb5892

CounterpartyForwardingInfo to PaymentRelay mapping


jkczyz Dec 8, 2023
62f8669

Add create_blinded_payment_paths to Router


jkczyz Dec 8, 2023
827833c

Multi-hop blinded payment paths in ChannelManager


jkczyz Dec 8, 2023
16ee240

DRY up OffersMessage::InvoiceRequest handling


jkczyz Dec 14, 2023
164c855

Use one-hop blinded paths only for announced nodes


jkczyz Dec 15, 2023
37319a6

Fix build warning


jkczyz Dec 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 31 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, channelmonitor, Confirm, Watch};
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
Expand All@@ -44,8 +46,9 @@ use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::util::test_channel_signer::{TestChannelSigner, EnforcementState};
use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
Expand All@@ -56,7 +59,7 @@ use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RoutePara
use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -99,6 +102,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

pub struct TestBroadcaster {}
Expand Down

33 changes: 31 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{Txid, BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
Expand All@@ -41,8 +43,9 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::{self, DecodeError};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
use lightning::routing::utxo::UtxoLookup;
use lightning::routing::router::{InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
Expand All@@ -55,7 +58,7 @@ use lightning::util::ser::{ReadableArgs, Writeable};
use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -142,6 +145,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestBroadcaster {
Expand Down

14 changes: 12 additions & 2 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
use bitcoin::secp256k1::schnorr;

use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::blinded_path::BlindedPath;
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::util::test_channel_signer::TestChannelSigner;
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -82,6 +83,15 @@ impl MessageRouter for TestMessageRouter {
 first_node_addresses: None,
 })
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestOffersMessageHandler {}
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ use crate::blinded_path::BlindedHop;
use crate::blinded_path::utils;
use crate::io;
use crate::ln::PaymentSecret;
use crate::ln::channelmanager::CounterpartyForwardingInfo;
use crate::ln::features::BlindedHopFeatures;
use crate::ln::msgs::DecodeError;
use crate::offers::invoice::BlindedPayInfo;
Expand DownExpand Up@@ -96,6 +97,15 @@ pub struct PaymentConstraints {
	pub htlc_minimum_msat: u64,
}

impl From<CounterpartyForwardingInfo> for PaymentRelay {
	fn from(info: CounterpartyForwardingInfo) -> Self {
 let CounterpartyForwardingInfo {
 fee_base_msat, fee_proportional_millionths, cltv_expiry_delta
 } = info;
 Self { cltv_expiry_delta, fee_proportional_millionths, fee_base_msat }
	}
}

impl Writeable for ForwardTlvs {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 encode_tlv_stream!(w, {
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 14 commits into

from

Dec 15, 2023
 Merged


Multi-hop BlindedPath creation interface
#2781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
ee026d4

Re-order AnchorsZeroFeeHtlcTx in module docs/tests


jkczyz Mar 2, 2023
ffb0d83

Add RouteBlinding feature flag


jkczyz Mar 2, 2023
97049da

Add create_blinded_paths to MessageRouter


jkczyz Dec 7, 2023
bedc2c6

Require any Router also implements MessageRouter


jkczyz Dec 7, 2023
c558ccd

Fix create_one_hop_blinded_payment_path docs


jkczyz Dec 8, 2023
dcd8d58

Use CLTV_FAR_FAR_AWAY in PaymentConstraints


jkczyz Dec 15, 2023
606304a

Multi-hop blinded paths in ChannelManager


jkczyz Mar 3, 2023
4da0862

Fix broken doc link in create_refund_builder


jkczyz Dec 15, 2023
edb5892

CounterpartyForwardingInfo to PaymentRelay mapping


jkczyz Dec 8, 2023
62f8669

Add create_blinded_payment_paths to Router


jkczyz Dec 8, 2023
827833c

Multi-hop blinded payment paths in ChannelManager


jkczyz Dec 8, 2023
16ee240

DRY up OffersMessage::InvoiceRequest handling


jkczyz Dec 14, 2023
164c855

Use one-hop blinded paths only for announced nodes


jkczyz Dec 15, 2023
37319a6

Fix build warning


jkczyz Dec 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 31 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, channelmonitor, Confirm, Watch};
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
Expand All@@ -44,8 +46,9 @@ use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::util::test_channel_signer::{TestChannelSigner, EnforcementState};
use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
Expand All@@ -56,7 +59,7 @@ use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RoutePara
use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -99,6 +102,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

pub struct TestBroadcaster {}
Expand Down

33 changes: 31 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{Txid, BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
Expand All@@ -41,8 +43,9 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::{self, DecodeError};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
use lightning::routing::utxo::UtxoLookup;
use lightning::routing::router::{InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
Expand All@@ -55,7 +58,7 @@ use lightning::util::ser::{ReadableArgs, Writeable};
use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -142,6 +145,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestBroadcaster {
Expand Down

14 changes: 12 additions & 2 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
use bitcoin::secp256k1::schnorr;

use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::blinded_path::BlindedPath;
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::util::test_channel_signer::TestChannelSigner;
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -82,6 +83,15 @@ impl MessageRouter for TestMessageRouter {
 first_node_addresses: None,
 })
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestOffersMessageHandler {}
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ use crate::blinded_path::BlindedHop;
use crate::blinded_path::utils;
use crate::io;
use crate::ln::PaymentSecret;
use crate::ln::channelmanager::CounterpartyForwardingInfo;
use crate::ln::features::BlindedHopFeatures;
use crate::ln::msgs::DecodeError;
use crate::offers::invoice::BlindedPayInfo;
Expand DownExpand Up@@ -96,6 +97,15 @@ pub struct PaymentConstraints {
	pub htlc_minimum_msat: u64,
}

impl From<CounterpartyForwardingInfo> for PaymentRelay {
	fn from(info: CounterpartyForwardingInfo) -> Self {
 let CounterpartyForwardingInfo {
 fee_base_msat, fee_proportional_millionths, cltv_expiry_delta
 } = info;
 Self { cltv_expiry_delta, fee_proportional_millionths, fee_base_msat }
	}
}

impl Writeable for ForwardTlvs {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 encode_tlv_stream!(w, {
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 14 commits into

from

Dec 15, 2023
 Merged


Multi-hop BlindedPath creation interface
#2781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
ee026d4

Re-order AnchorsZeroFeeHtlcTx in module docs/tests


jkczyz Mar 2, 2023
ffb0d83

Add RouteBlinding feature flag


jkczyz Mar 2, 2023
97049da

Add create_blinded_paths to MessageRouter


jkczyz Dec 7, 2023
bedc2c6

Require any Router also implements MessageRouter


jkczyz Dec 7, 2023
c558ccd

Fix create_one_hop_blinded_payment_path docs


jkczyz Dec 8, 2023
dcd8d58

Use CLTV_FAR_FAR_AWAY in PaymentConstraints


jkczyz Dec 15, 2023
606304a

Multi-hop blinded paths in ChannelManager


jkczyz Mar 3, 2023
4da0862

Fix broken doc link in create_refund_builder


jkczyz Dec 15, 2023
edb5892

CounterpartyForwardingInfo to PaymentRelay mapping


jkczyz Dec 8, 2023
62f8669

Add create_blinded_payment_paths to Router


jkczyz Dec 8, 2023
827833c

Multi-hop blinded payment paths in ChannelManager


jkczyz Dec 8, 2023
16ee240

DRY up OffersMessage::InvoiceRequest handling


jkczyz Dec 14, 2023
164c855

Use one-hop blinded paths only for announced nodes


jkczyz Dec 15, 2023
37319a6

Fix build warning


jkczyz Dec 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 31 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, channelmonitor, Confirm, Watch};
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
Expand All@@ -44,8 +46,9 @@ use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::util::test_channel_signer::{TestChannelSigner, EnforcementState};
use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
Expand All@@ -56,7 +59,7 @@ use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RoutePara
use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -99,6 +102,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

pub struct TestBroadcaster {}
Expand Down

33 changes: 31 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{Txid, BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
Expand All@@ -41,8 +43,9 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::{self, DecodeError};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
use lightning::routing::utxo::UtxoLookup;
use lightning::routing::router::{InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
Expand All@@ -55,7 +58,7 @@ use lightning::util::ser::{ReadableArgs, Writeable};
use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -142,6 +145,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestBroadcaster {
Expand Down

14 changes: 12 additions & 2 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
use bitcoin::secp256k1::schnorr;

use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::blinded_path::BlindedPath;
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::util::test_channel_signer::TestChannelSigner;
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -82,6 +83,15 @@ impl MessageRouter for TestMessageRouter {
 first_node_addresses: None,
 })
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestOffersMessageHandler {}
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ use crate::blinded_path::BlindedHop;
use crate::blinded_path::utils;
use crate::io;
use crate::ln::PaymentSecret;
use crate::ln::channelmanager::CounterpartyForwardingInfo;
use crate::ln::features::BlindedHopFeatures;
use crate::ln::msgs::DecodeError;
use crate::offers::invoice::BlindedPayInfo;
Expand DownExpand Up@@ -96,6 +97,15 @@ pub struct PaymentConstraints {
	pub htlc_minimum_msat: u64,
}

impl From<CounterpartyForwardingInfo> for PaymentRelay {
	fn from(info: CounterpartyForwardingInfo) -> Self {
 let CounterpartyForwardingInfo {
 fee_base_msat, fee_proportional_millionths, cltv_expiry_delta
 } = info;
 Self { cltv_expiry_delta, fee_proportional_millionths, fee_base_msat }
	}
}

impl Writeable for ForwardTlvs {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 encode_tlv_stream!(w, {
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 14 commits into

from

Dec 15, 2023
 Merged


Multi-hop BlindedPath creation interface
#2781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
ee026d4

Re-order AnchorsZeroFeeHtlcTx in module docs/tests


jkczyz Mar 2, 2023
ffb0d83

Add RouteBlinding feature flag


jkczyz Mar 2, 2023
97049da

Add create_blinded_paths to MessageRouter


jkczyz Dec 7, 2023
bedc2c6

Require any Router also implements MessageRouter


jkczyz Dec 7, 2023
c558ccd

Fix create_one_hop_blinded_payment_path docs


jkczyz Dec 8, 2023
dcd8d58

Use CLTV_FAR_FAR_AWAY in PaymentConstraints


jkczyz Dec 15, 2023
606304a

Multi-hop blinded paths in ChannelManager


jkczyz Mar 3, 2023
4da0862

Fix broken doc link in create_refund_builder


jkczyz Dec 15, 2023
edb5892

CounterpartyForwardingInfo to PaymentRelay mapping


jkczyz Dec 8, 2023
62f8669

Add create_blinded_payment_paths to Router


jkczyz Dec 8, 2023
827833c

Multi-hop blinded payment paths in ChannelManager


jkczyz Dec 8, 2023
16ee240

DRY up OffersMessage::InvoiceRequest handling


jkczyz Dec 14, 2023
164c855

Use one-hop blinded paths only for announced nodes


jkczyz Dec 15, 2023
37319a6

Fix build warning


jkczyz Dec 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 31 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, channelmonitor, Confirm, Watch};
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
Expand All@@ -44,8 +46,9 @@ use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::util::test_channel_signer::{TestChannelSigner, EnforcementState};
use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
Expand All@@ -56,7 +59,7 @@ use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RoutePara
use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -99,6 +102,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

pub struct TestBroadcaster {}
Expand Down

33 changes: 31 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{Txid, BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
Expand All@@ -41,8 +43,9 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::{self, DecodeError};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
use lightning::routing::utxo::UtxoLookup;
use lightning::routing::router::{InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
Expand All@@ -55,7 +58,7 @@ use lightning::util::ser::{ReadableArgs, Writeable};
use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -142,6 +145,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestBroadcaster {
Expand Down

14 changes: 12 additions & 2 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
use bitcoin::secp256k1::schnorr;

use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::blinded_path::BlindedPath;
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::util::test_channel_signer::TestChannelSigner;
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -82,6 +83,15 @@ impl MessageRouter for TestMessageRouter {
 first_node_addresses: None,
 })
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestOffersMessageHandler {}
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ use crate::blinded_path::BlindedHop;
use crate::blinded_path::utils;
use crate::io;
use crate::ln::PaymentSecret;
use crate::ln::channelmanager::CounterpartyForwardingInfo;
use crate::ln::features::BlindedHopFeatures;
use crate::ln::msgs::DecodeError;
use crate::offers::invoice::BlindedPayInfo;
Expand DownExpand Up@@ -96,6 +97,15 @@ pub struct PaymentConstraints {
	pub htlc_minimum_msat: u64,
}

impl From<CounterpartyForwardingInfo> for PaymentRelay {
	fn from(info: CounterpartyForwardingInfo) -> Self {
 let CounterpartyForwardingInfo {
 fee_base_msat, fee_proportional_millionths, cltv_expiry_delta
 } = info;
 Self { cltv_expiry_delta, fee_proportional_millionths, fee_base_msat }
	}
}

impl Writeable for ForwardTlvs {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 encode_tlv_stream!(w, {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Multi-hop `BlindedPath` creation interface by jkczyz · Pull Request #2781 · lightningdevkit/rust-lightning · GitHub
Skip to content
Multi-hop BlindedPath creation interface#2781

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 14 commits into

from

Dec 15, 2023
 Merged


Multi-hop BlindedPath creation interface
#2781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
ee026d4

Re-order AnchorsZeroFeeHtlcTx in module docs/tests


jkczyz Mar 2, 2023
ffb0d83

Add RouteBlinding feature flag


jkczyz Mar 2, 2023
97049da

Add create_blinded_paths to MessageRouter


jkczyz Dec 7, 2023
bedc2c6

Require any Router also implements MessageRouter


jkczyz Dec 7, 2023
c558ccd

Fix create_one_hop_blinded_payment_path docs


jkczyz Dec 8, 2023
dcd8d58

Use CLTV_FAR_FAR_AWAY in PaymentConstraints


jkczyz Dec 15, 2023
606304a

Multi-hop blinded paths in ChannelManager


jkczyz Mar 3, 2023
4da0862

Fix broken doc link in create_refund_builder


jkczyz Dec 15, 2023
edb5892

CounterpartyForwardingInfo to PaymentRelay mapping


jkczyz Dec 8, 2023
62f8669

Add create_blinded_payment_paths to Router


jkczyz Dec 8, 2023
827833c

Multi-hop blinded payment paths in ChannelManager


jkczyz Dec 8, 2023
16ee240

DRY up OffersMessage::InvoiceRequest handling


jkczyz Dec 14, 2023
164c855

Use one-hop blinded paths only for announced nodes


jkczyz Dec 15, 2023
37319a6

Fix build warning


jkczyz Dec 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 31 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, channelmonitor, Confirm, Watch};
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
Expand All@@ -44,8 +46,9 @@ use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::util::test_channel_signer::{TestChannelSigner, EnforcementState};
use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
Expand All@@ -56,7 +59,7 @@ use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RoutePara
use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -99,6 +102,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

pub struct TestBroadcaster {}
Expand Down

33 changes: 31 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{Txid, BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
Expand All@@ -41,8 +43,9 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::{self, DecodeError};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
use lightning::routing::utxo::UtxoLookup;
use lightning::routing::router::{InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
Expand All@@ -55,7 +58,7 @@ use lightning::util::ser::{ReadableArgs, Writeable};
use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -142,6 +145,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestBroadcaster {
Expand Down

14 changes: 12 additions & 2 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
use bitcoin::secp256k1::schnorr;

use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::blinded_path::BlindedPath;
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::util::test_channel_signer::TestChannelSigner;
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -82,6 +83,15 @@ impl MessageRouter for TestMessageRouter {
 first_node_addresses: None,
 })
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestOffersMessageHandler {}
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ use crate::blinded_path::BlindedHop;
use crate::blinded_path::utils;
use crate::io;
use crate::ln::PaymentSecret;
use crate::ln::channelmanager::CounterpartyForwardingInfo;
use crate::ln::features::BlindedHopFeatures;
use crate::ln::msgs::DecodeError;
use crate::offers::invoice::BlindedPayInfo;
Expand DownExpand Up@@ -96,6 +97,15 @@ pub struct PaymentConstraints {
	pub htlc_minimum_msat: u64,
}

impl From<CounterpartyForwardingInfo> for PaymentRelay {
	fn from(info: CounterpartyForwardingInfo) -> Self {
 let CounterpartyForwardingInfo {
 fee_base_msat, fee_proportional_millionths, cltv_expiry_delta
 } = info;
 Self { cltv_expiry_delta, fee_proportional_millionths, fee_base_msat }
	}
}

impl Writeable for ForwardTlvs {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 encode_tlv_stream!(w, {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Multi-hop `BlindedPath` creation interface by jkczyz · Pull Request #2781 · lightningdevkit/rust-lightning · GitHub
Skip to content
Multi-hop BlindedPath creation interface#2781

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 14 commits into

from

Dec 15, 2023
 Merged


Multi-hop BlindedPath creation interface
#2781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
ee026d4

Re-order AnchorsZeroFeeHtlcTx in module docs/tests


jkczyz Mar 2, 2023
ffb0d83

Add RouteBlinding feature flag


jkczyz Mar 2, 2023
97049da

Add create_blinded_paths to MessageRouter


jkczyz Dec 7, 2023
bedc2c6

Require any Router also implements MessageRouter


jkczyz Dec 7, 2023
c558ccd

Fix create_one_hop_blinded_payment_path docs


jkczyz Dec 8, 2023
dcd8d58

Use CLTV_FAR_FAR_AWAY in PaymentConstraints


jkczyz Dec 15, 2023
606304a

Multi-hop blinded paths in ChannelManager


jkczyz Mar 3, 2023
4da0862

Fix broken doc link in create_refund_builder


jkczyz Dec 15, 2023
edb5892

CounterpartyForwardingInfo to PaymentRelay mapping


jkczyz Dec 8, 2023
62f8669

Add create_blinded_payment_paths to Router


jkczyz Dec 8, 2023
827833c

Multi-hop blinded payment paths in ChannelManager


jkczyz Dec 8, 2023
16ee240

DRY up OffersMessage::InvoiceRequest handling


jkczyz Dec 14, 2023
164c855

Use one-hop blinded paths only for announced nodes


jkczyz Dec 15, 2023
37319a6

Fix build warning


jkczyz Dec 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 31 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, channelmonitor, Confirm, Watch};
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
Expand All@@ -44,8 +46,9 @@ use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::util::test_channel_signer::{TestChannelSigner, EnforcementState};
use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
Expand All@@ -56,7 +59,7 @@ use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RoutePara
use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -99,6 +102,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

pub struct TestBroadcaster {}
Expand Down

33 changes: 31 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hash_types::{Txid, BlockHash, WPubkeyHash};

use lightning::blinded_path::BlindedPath;
use lightning::blinded_path::payment::ReceiveTlvs;
use lightning::chain;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
Expand All@@ -41,8 +43,9 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::{self, DecodeError};
use lightning::ln::script::ShutdownScript;
use lightning::ln::functional_test_utils::*;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::onion_message::{Destination, MessageRouter, OnionMessagePath};
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
use lightning::routing::utxo::UtxoLookup;
use lightning::routing::router::{InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
Expand All@@ -55,7 +58,7 @@ use lightning::util::ser::{ReadableArgs, Writeable};
use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;

use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
use bitcoin::secp256k1::schnorr;
Expand DownExpand Up@@ -142,6 +145,32 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}

	fn create_blinded_payment_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
 _amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
 unreachable!()
	}
}

impl MessageRouter for FuzzRouter {
	fn find_path(
 &self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
	) -> Result<OnionMessagePath, ()> {
 unreachable!()
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestBroadcaster {
Expand Down

14 changes: 12 additions & 2 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, self};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
use bitcoin::secp256k1::schnorr;

use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::blinded_path::BlindedPath;
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::offers::invoice::UnsignedBolt12Invoice;
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
use lightning::util::test_channel_signer::TestChannelSigner;
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -82,6 +83,15 @@ impl MessageRouter for TestMessageRouter {
 first_node_addresses: None,
 })
	}

	fn create_blinded_paths<
 ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
	>(
 &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
 _secp_ctx: &Secp256k1<T>
	) -> Result<Vec<BlindedPath>, ()> {
 unreachable!()
	}
}

struct TestOffersMessageHandler {}
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ use crate::blinded_path::BlindedHop;
use crate::blinded_path::utils;
use crate::io;
use crate::ln::PaymentSecret;
use crate::ln::channelmanager::CounterpartyForwardingInfo;
use crate::ln::features::BlindedHopFeatures;
use crate::ln::msgs::DecodeError;
use crate::offers::invoice::BlindedPayInfo;
Expand DownExpand Up@@ -96,6 +97,15 @@ pub struct PaymentConstraints {
	pub htlc_minimum_msat: u64,
}

impl From<CounterpartyForwardingInfo> for PaymentRelay {
	fn from(info: CounterpartyForwardingInfo) -> Self {
 let CounterpartyForwardingInfo {
 fee_base_msat, fee_proportional_millionths, cltv_expiry_delta
 } = info;
 Self { cltv_expiry_delta, fee_proportional_millionths, fee_base_msat }
	}
}

impl Writeable for ForwardTlvs {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 encode_tlv_stream!(w, {
Expand Down
Loading