Skip to content

BOLT 12 Offers message flow#2039

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 19 commits into from
Oct 20, 2023
Merged

BOLT 12 Offers message flow #2039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bc0203d
Expand docs on failing expired outbound payments
jkczyz Oct 19, 2023
ddfeb3f
Store OffersMessages for later sending
jkczyz Sep 14, 2023
34bdf22
Absolute expiry or timer tick payment expiration
jkczyz Oct 19, 2023
ffe9ae2
Utility for paying for an Offer
jkczyz Sep 14, 2023
46b794e
Utility for creating and sending Bolt12Invoices
jkczyz Sep 15, 2023
1d85efe
Qualify BOLT11 ChannelManager invoice_features
jkczyz Sep 1, 2023
6f6e086
BOLT12 invoice_feature methods for ChannelManager
jkczyz Sep 1, 2023
8954280
Grammar fix in docs
jkczyz Sep 1, 2023
b191fd4
Check offer expiry when building invoice in no-std
jkczyz Oct 19, 2023
debc20c
OffersMessageHandler impl for ChannelManager
jkczyz Sep 1, 2023
0e41d80
Use ChannelManager as OffersMessageHandler
jkczyz Jun 6, 2023
2840252
Revert "Config-guard Event::InvoiceRequestFailed"
jkczyz Oct 12, 2023
5a0b111
Document InvoiceRequestFailed in ChannelManager
jkczyz Oct 19, 2023
3fd9fc6
Organize create_refund and pay_for_offer docs
jkczyz Oct 19, 2023
681f898
Add privacy section to pay_for_offer docs
jkczyz Oct 19, 2023
a841e6b
Onion message routing to immediate peers.
jkczyz Oct 19, 2023
6d2ffdd
Expand request_refund_payment docs for limitations
jkczyz Oct 19, 2023
6a97f64
Fix build warnings
jkczyz Oct 19, 2023
fe90448
Fix PaymentConstraints::max_cltv_expiry docs
jkczyz Oct 20, 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
4 changes: 2 additions & 2 deletions lightning/src/blinded_path/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ impl BlindedPath {
}

/// Create a one-hop blinded path for a payment.
pub fn one_hop_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
pub fn one_hop_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
payee_node_id: PublicKey, payee_tlvs: payment::ReceiveTlvs, entropy_source: &ES,
secp_ctx: &Secp256k1<T>
) -> Result<(BlindedPayInfo, Self), ()> {
Expand All@@ -105,7 +105,7 @@ impl BlindedPath {
///
/// [`ForwardTlvs`]: crate::blinded_path::payment::ForwardTlvs
// TODO: make all payloads the same size with padding + add dummy hops
pub(crate) fn new_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
pub(crate) fn new_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
intermediate_nodes: &[payment::ForwardNode], payee_node_id: PublicKey,
payee_tlvs: payment::ReceiveTlvs, htlc_maximum_msat: u64, entropy_source: &ES,
secp_ctx: &Secp256k1<T>
Expand Down
3 changes: 1 addition & 2 deletions lightning/src/blinded_path/payment.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ pub struct PaymentRelay {
/// [`BlindedHop`]: crate::blinded_path::BlindedHop
#[derive(Clone, Debug)]
pub struct PaymentConstraints {
/// The maximum total CLTV delta that is acceptable when relaying a payment over this
/// [`BlindedHop`].
/// The maximum total CLTV that is acceptable when relaying a payment over this [`BlindedHop`].
pub max_cltv_expiry: u32,
/// The minimum value, in msat, that may be accepted by the node corresponding to this
/// [`BlindedHop`].
Expand Down
9 changes: 5 additions & 4 deletions lightning/src/events/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,10 +514,13 @@ pub enum Event {
sender_intended_total_msat: Option<u64>,
},
/// Indicates a request for an invoice failed to yield a response in a reasonable amount of time
/// or was explicitly abandoned by [`ChannelManager::abandon_payment`].
/// or was explicitly abandoned by [`ChannelManager::abandon_payment`]. This may be for an
/// [`InvoiceRequest`] sent for an [`Offer`] or for a [`Refund`] that hasn't been redeemed.
///
/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
#[cfg(invreqfailed)]
/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
/// [`Offer`]: crate::offers::offer::Offer
/// [`Refund`]: crate::offers::refund::Refund
InvoiceRequestFailed {
/// The `payment_id` to have been associated with payment for the requested invoice.
payment_id: PaymentId,
Expand DownExpand Up@@ -1164,7 +1167,6 @@ impl Writeable for Event {
(8, funding_txo, required),
});
},
#[cfg(invreqfailed)]
&Event::InvoiceRequestFailed { ref payment_id } => {
33u8.write(writer)?;
write_tlv_fields!(writer, {
Expand DownExpand Up@@ -1558,7 +1560,6 @@ impl MaybeReadable for Event {
};
f()
},
#[cfg(invreqfailed)]
33u8 => {
let f = || {
_init_and_read_len_prefixed_tlv_fields!(reader, {
Expand Down
8 changes: 3 additions & 5 deletions lightning/src/ln/blinded_payment_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};
use crate::events::MessageSendEventsProvider;
use crate::ln::channelmanager;
use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
use crate::ln::features::Bolt12InvoiceFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::outbound_payment::Retry;
use crate::prelude::*;
Expand DownExpand Up@@ -88,11 +87,10 @@ fn mpp_to_one_hop_blinded_path() {
nodes[3].node.get_our_node_id(), payee_tlvs, &chanmon_cfgs[3].keys_manager, &secp_ctx
).unwrap();

let bolt12_features: Bolt12InvoiceFeatures =
channelmanager::provided_invoice_features(&UserConfig::default()).to_context();
let bolt12_features =
channelmanager::provided_bolt12_invoice_features(&UserConfig::default());
let route_params = RouteParameters::from_payment_params_and_value(
PaymentParameters::blinded(vec![blinded_path])
.with_bolt12_features(bolt12_features).unwrap(),
PaymentParameters::blinded(vec![blinded_path]).with_bolt12_features(bolt12_features).unwrap(),
amt_msat,
);
nodes[0].node.send_payment(payment_hash, RecipientOnionFields::spontaneous_empty(), PaymentId(payment_hash.0), route_params, Retry::Attempts(0)).unwrap();
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" + '
BOLT 12 Offers message flow by jkczyz · Pull Request #2039 · lightningdevkit/rust-lightning · GitHub
Skip to content
BOLT 12 Offers message flow#2039

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

from

Oct 20, 2023
 Merged


BOLT 12 Offers message flow
#2039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
bc0203d

Expand docs on failing expired outbound payments


jkczyz Oct 19, 2023
ddfeb3f

Store OffersMessages for later sending


jkczyz Sep 14, 2023
34bdf22

Absolute expiry or timer tick payment expiration


jkczyz Oct 19, 2023
ffe9ae2

Utility for paying for an Offer


jkczyz Sep 14, 2023
46b794e

Utility for creating and sending Bolt12Invoices


jkczyz Sep 15, 2023
1d85efe

Qualify BOLT11 ChannelManager invoice_features


jkczyz Sep 1, 2023
6f6e086

BOLT12 invoice_feature methods for ChannelManager


jkczyz Sep 1, 2023
8954280

Grammar fix in docs


jkczyz Sep 1, 2023
b191fd4

Check offer expiry when building invoice in no-std


jkczyz Oct 19, 2023
debc20c

OffersMessageHandler impl for ChannelManager


jkczyz Sep 1, 2023
0e41d80

Use ChannelManager as OffersMessageHandler


jkczyz Jun 6, 2023
2840252

Revert "Config-guard Event::InvoiceRequestFailed"


jkczyz Oct 12, 2023
5a0b111

Document InvoiceRequestFailed in ChannelManager


jkczyz Oct 19, 2023
3fd9fc6

Organize create_refund and pay_for_offer docs


jkczyz Oct 19, 2023
681f898

Add privacy section to pay_for_offer docs


jkczyz Oct 19, 2023
a841e6b

Onion message routing to immediate peers.


jkczyz Oct 19, 2023
6d2ffdd

Expand request_refund_payment docs for limitations


jkczyz Oct 19, 2023
6a97f64

Fix build warnings


jkczyz Oct 19, 2023
fe90448

Fix PaymentConstraints::max_cltv_expiry docs


jkczyz Oct 20, 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


4 changes: 2 additions & 2 deletions
lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ impl BlindedPath {
	}

	/// Create a one-hop blinded path for a payment.
	pub fn one_hop_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub fn one_hop_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 payee_node_id: PublicKey, payee_tlvs: payment::ReceiveTlvs, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
	) -> Result<(BlindedPayInfo, Self), ()> {
Expand All@@ -105,7 +105,7 @@ impl BlindedPath {
	///
	/// [`ForwardTlvs`]: crate::blinded_path::payment::ForwardTlvs
	// TODO: make all payloads the same size with padding + add dummy hops
	pub(crate) fn new_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub(crate) fn new_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 intermediate_nodes: &[payment::ForwardNode], payee_node_id: PublicKey,
 payee_tlvs: payment::ReceiveTlvs, htlc_maximum_msat: u64, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ pub struct PaymentRelay {
/// [`BlindedHop`]: crate::blinded_path::BlindedHop
#[derive(Clone, Debug)]
pub struct PaymentConstraints {
	/// The maximum total CLTV delta that is acceptable when relaying a payment over this
	/// [`BlindedHop`].
	/// The maximum total CLTV that is acceptable when relaying a payment over this [`BlindedHop`].
	pub max_cltv_expiry: u32,
	/// The minimum value, in msat, that may be accepted by the node corresponding to this
	/// [`BlindedHop`].
Expand Down

9 changes: 5 additions & 4 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,10 +514,13 @@ pub enum Event {
 sender_intended_total_msat: Option<u64>,
	},
	/// Indicates a request for an invoice failed to yield a response in a reasonable amount of time
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`].
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`]. This may be for an
	/// [`InvoiceRequest`] sent for an [`Offer`] or for a [`Refund`] that hasn't been redeemed.
	///
	/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
	#[cfg(invreqfailed)]
	/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
	/// [`Offer`]: crate::offers::offer::Offer
	/// [`Refund`]: crate::offers::refund::Refund
	InvoiceRequestFailed {
 /// The `payment_id` to have been associated with payment for the requested invoice.
 payment_id: PaymentId,
Expand DownExpand Up@@ -1164,7 +1167,6 @@ impl Writeable for Event {
 (8, funding_txo, required),
 });
 },
 #[cfg(invreqfailed)]
 &Event::InvoiceRequestFailed { ref payment_id } => {
 33u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand DownExpand Up@@ -1558,7 +1560,6 @@ impl MaybeReadable for Event {
 };
 f()
 },
 #[cfg(invreqfailed)]
 33u8 => {
 let f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
Expand Down

8 changes: 3 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};
use crate::events::MessageSendEventsProvider;
use crate::ln::channelmanager;
use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
use crate::ln::features::Bolt12InvoiceFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::outbound_payment::Retry;
use crate::prelude::*;
Expand DownExpand Up@@ -88,11 +87,10 @@ fn mpp_to_one_hop_blinded_path() {
 nodes[3].node.get_our_node_id(), payee_tlvs, &chanmon_cfgs[3].keys_manager, &secp_ctx
	).unwrap();

	let bolt12_features: Bolt12InvoiceFeatures =
 channelmanager::provided_invoice_features(&UserConfig::default()).to_context();
	let bolt12_features =
 channelmanager::provided_bolt12_invoice_features(&UserConfig::default());
	let route_params = RouteParameters::from_payment_params_and_value(
 PaymentParameters::blinded(vec![blinded_path])
 .with_bolt12_features(bolt12_features).unwrap(),
 PaymentParameters::blinded(vec![blinded_path]).with_bolt12_features(bolt12_features).unwrap(),
 amt_msat,
	);
	nodes[0].node.send_payment(payment_hash, RecipientOnionFields::spontaneous_empty(), PaymentId(payment_hash.0), route_params, Retry::Attempts(0)).unwrap();
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('^' + ".*" + '
BOLT 12 Offers message flow by jkczyz · Pull Request #2039 · lightningdevkit/rust-lightning · GitHub
Skip to content
BOLT 12 Offers message flow#2039

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

from

Oct 20, 2023
 Merged


BOLT 12 Offers message flow
#2039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
bc0203d

Expand docs on failing expired outbound payments


jkczyz Oct 19, 2023
ddfeb3f

Store OffersMessages for later sending


jkczyz Sep 14, 2023
34bdf22

Absolute expiry or timer tick payment expiration


jkczyz Oct 19, 2023
ffe9ae2

Utility for paying for an Offer


jkczyz Sep 14, 2023
46b794e

Utility for creating and sending Bolt12Invoices


jkczyz Sep 15, 2023
1d85efe

Qualify BOLT11 ChannelManager invoice_features


jkczyz Sep 1, 2023
6f6e086

BOLT12 invoice_feature methods for ChannelManager


jkczyz Sep 1, 2023
8954280

Grammar fix in docs


jkczyz Sep 1, 2023
b191fd4

Check offer expiry when building invoice in no-std


jkczyz Oct 19, 2023
debc20c

OffersMessageHandler impl for ChannelManager


jkczyz Sep 1, 2023
0e41d80

Use ChannelManager as OffersMessageHandler


jkczyz Jun 6, 2023
2840252

Revert "Config-guard Event::InvoiceRequestFailed"


jkczyz Oct 12, 2023
5a0b111

Document InvoiceRequestFailed in ChannelManager


jkczyz Oct 19, 2023
3fd9fc6

Organize create_refund and pay_for_offer docs


jkczyz Oct 19, 2023
681f898

Add privacy section to pay_for_offer docs


jkczyz Oct 19, 2023
a841e6b

Onion message routing to immediate peers.


jkczyz Oct 19, 2023
6d2ffdd

Expand request_refund_payment docs for limitations


jkczyz Oct 19, 2023
6a97f64

Fix build warnings


jkczyz Oct 19, 2023
fe90448

Fix PaymentConstraints::max_cltv_expiry docs


jkczyz Oct 20, 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


4 changes: 2 additions & 2 deletions
lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ impl BlindedPath {
	}

	/// Create a one-hop blinded path for a payment.
	pub fn one_hop_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub fn one_hop_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 payee_node_id: PublicKey, payee_tlvs: payment::ReceiveTlvs, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
	) -> Result<(BlindedPayInfo, Self), ()> {
Expand All@@ -105,7 +105,7 @@ impl BlindedPath {
	///
	/// [`ForwardTlvs`]: crate::blinded_path::payment::ForwardTlvs
	// TODO: make all payloads the same size with padding + add dummy hops
	pub(crate) fn new_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub(crate) fn new_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 intermediate_nodes: &[payment::ForwardNode], payee_node_id: PublicKey,
 payee_tlvs: payment::ReceiveTlvs, htlc_maximum_msat: u64, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ pub struct PaymentRelay {
/// [`BlindedHop`]: crate::blinded_path::BlindedHop
#[derive(Clone, Debug)]
pub struct PaymentConstraints {
	/// The maximum total CLTV delta that is acceptable when relaying a payment over this
	/// [`BlindedHop`].
	/// The maximum total CLTV that is acceptable when relaying a payment over this [`BlindedHop`].
	pub max_cltv_expiry: u32,
	/// The minimum value, in msat, that may be accepted by the node corresponding to this
	/// [`BlindedHop`].
Expand Down

9 changes: 5 additions & 4 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,10 +514,13 @@ pub enum Event {
 sender_intended_total_msat: Option<u64>,
	},
	/// Indicates a request for an invoice failed to yield a response in a reasonable amount of time
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`].
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`]. This may be for an
	/// [`InvoiceRequest`] sent for an [`Offer`] or for a [`Refund`] that hasn't been redeemed.
	///
	/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
	#[cfg(invreqfailed)]
	/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
	/// [`Offer`]: crate::offers::offer::Offer
	/// [`Refund`]: crate::offers::refund::Refund
	InvoiceRequestFailed {
 /// The `payment_id` to have been associated with payment for the requested invoice.
 payment_id: PaymentId,
Expand DownExpand Up@@ -1164,7 +1167,6 @@ impl Writeable for Event {
 (8, funding_txo, required),
 });
 },
 #[cfg(invreqfailed)]
 &Event::InvoiceRequestFailed { ref payment_id } => {
 33u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand DownExpand Up@@ -1558,7 +1560,6 @@ impl MaybeReadable for Event {
 };
 f()
 },
 #[cfg(invreqfailed)]
 33u8 => {
 let f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
Expand Down

8 changes: 3 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};
use crate::events::MessageSendEventsProvider;
use crate::ln::channelmanager;
use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
use crate::ln::features::Bolt12InvoiceFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::outbound_payment::Retry;
use crate::prelude::*;
Expand DownExpand Up@@ -88,11 +87,10 @@ fn mpp_to_one_hop_blinded_path() {
 nodes[3].node.get_our_node_id(), payee_tlvs, &chanmon_cfgs[3].keys_manager, &secp_ctx
	).unwrap();

	let bolt12_features: Bolt12InvoiceFeatures =
 channelmanager::provided_invoice_features(&UserConfig::default()).to_context();
	let bolt12_features =
 channelmanager::provided_bolt12_invoice_features(&UserConfig::default());
	let route_params = RouteParameters::from_payment_params_and_value(
 PaymentParameters::blinded(vec![blinded_path])
 .with_bolt12_features(bolt12_features).unwrap(),
 PaymentParameters::blinded(vec![blinded_path]).with_bolt12_features(bolt12_features).unwrap(),
 amt_msat,
	);
	nodes[0].node.send_payment(payment_hash, RecipientOnionFields::spontaneous_empty(), PaymentId(payment_hash.0), route_params, Retry::Attempts(0)).unwrap();
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('^' + ".*" + '
BOLT 12 Offers message flow by jkczyz · Pull Request #2039 · lightningdevkit/rust-lightning · GitHub
Skip to content
BOLT 12 Offers message flow#2039

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

from

Oct 20, 2023
 Merged


BOLT 12 Offers message flow
#2039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
bc0203d

Expand docs on failing expired outbound payments


jkczyz Oct 19, 2023
ddfeb3f

Store OffersMessages for later sending


jkczyz Sep 14, 2023
34bdf22

Absolute expiry or timer tick payment expiration


jkczyz Oct 19, 2023
ffe9ae2

Utility for paying for an Offer


jkczyz Sep 14, 2023
46b794e

Utility for creating and sending Bolt12Invoices


jkczyz Sep 15, 2023
1d85efe

Qualify BOLT11 ChannelManager invoice_features


jkczyz Sep 1, 2023
6f6e086

BOLT12 invoice_feature methods for ChannelManager


jkczyz Sep 1, 2023
8954280

Grammar fix in docs


jkczyz Sep 1, 2023
b191fd4

Check offer expiry when building invoice in no-std


jkczyz Oct 19, 2023
debc20c

OffersMessageHandler impl for ChannelManager


jkczyz Sep 1, 2023
0e41d80

Use ChannelManager as OffersMessageHandler


jkczyz Jun 6, 2023
2840252

Revert "Config-guard Event::InvoiceRequestFailed"


jkczyz Oct 12, 2023
5a0b111

Document InvoiceRequestFailed in ChannelManager


jkczyz Oct 19, 2023
3fd9fc6

Organize create_refund and pay_for_offer docs


jkczyz Oct 19, 2023
681f898

Add privacy section to pay_for_offer docs


jkczyz Oct 19, 2023
a841e6b

Onion message routing to immediate peers.


jkczyz Oct 19, 2023
6d2ffdd

Expand request_refund_payment docs for limitations


jkczyz Oct 19, 2023
6a97f64

Fix build warnings


jkczyz Oct 19, 2023
fe90448

Fix PaymentConstraints::max_cltv_expiry docs


jkczyz Oct 20, 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


4 changes: 2 additions & 2 deletions
lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ impl BlindedPath {
	}

	/// Create a one-hop blinded path for a payment.
	pub fn one_hop_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub fn one_hop_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 payee_node_id: PublicKey, payee_tlvs: payment::ReceiveTlvs, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
	) -> Result<(BlindedPayInfo, Self), ()> {
Expand All@@ -105,7 +105,7 @@ impl BlindedPath {
	///
	/// [`ForwardTlvs`]: crate::blinded_path::payment::ForwardTlvs
	// TODO: make all payloads the same size with padding + add dummy hops
	pub(crate) fn new_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub(crate) fn new_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 intermediate_nodes: &[payment::ForwardNode], payee_node_id: PublicKey,
 payee_tlvs: payment::ReceiveTlvs, htlc_maximum_msat: u64, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ pub struct PaymentRelay {
/// [`BlindedHop`]: crate::blinded_path::BlindedHop
#[derive(Clone, Debug)]
pub struct PaymentConstraints {
	/// The maximum total CLTV delta that is acceptable when relaying a payment over this
	/// [`BlindedHop`].
	/// The maximum total CLTV that is acceptable when relaying a payment over this [`BlindedHop`].
	pub max_cltv_expiry: u32,
	/// The minimum value, in msat, that may be accepted by the node corresponding to this
	/// [`BlindedHop`].
Expand Down

9 changes: 5 additions & 4 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,10 +514,13 @@ pub enum Event {
 sender_intended_total_msat: Option<u64>,
	},
	/// Indicates a request for an invoice failed to yield a response in a reasonable amount of time
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`].
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`]. This may be for an
	/// [`InvoiceRequest`] sent for an [`Offer`] or for a [`Refund`] that hasn't been redeemed.
	///
	/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
	#[cfg(invreqfailed)]
	/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
	/// [`Offer`]: crate::offers::offer::Offer
	/// [`Refund`]: crate::offers::refund::Refund
	InvoiceRequestFailed {
 /// The `payment_id` to have been associated with payment for the requested invoice.
 payment_id: PaymentId,
Expand DownExpand Up@@ -1164,7 +1167,6 @@ impl Writeable for Event {
 (8, funding_txo, required),
 });
 },
 #[cfg(invreqfailed)]
 &Event::InvoiceRequestFailed { ref payment_id } => {
 33u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand DownExpand Up@@ -1558,7 +1560,6 @@ impl MaybeReadable for Event {
 };
 f()
 },
 #[cfg(invreqfailed)]
 33u8 => {
 let f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
Expand Down

8 changes: 3 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};
use crate::events::MessageSendEventsProvider;
use crate::ln::channelmanager;
use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
use crate::ln::features::Bolt12InvoiceFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::outbound_payment::Retry;
use crate::prelude::*;
Expand DownExpand Up@@ -88,11 +87,10 @@ fn mpp_to_one_hop_blinded_path() {
 nodes[3].node.get_our_node_id(), payee_tlvs, &chanmon_cfgs[3].keys_manager, &secp_ctx
	).unwrap();

	let bolt12_features: Bolt12InvoiceFeatures =
 channelmanager::provided_invoice_features(&UserConfig::default()).to_context();
	let bolt12_features =
 channelmanager::provided_bolt12_invoice_features(&UserConfig::default());
	let route_params = RouteParameters::from_payment_params_and_value(
 PaymentParameters::blinded(vec![blinded_path])
 .with_bolt12_features(bolt12_features).unwrap(),
 PaymentParameters::blinded(vec![blinded_path]).with_bolt12_features(bolt12_features).unwrap(),
 amt_msat,
	);
	nodes[0].node.send_payment(payment_hash, RecipientOnionFields::spontaneous_empty(), PaymentId(payment_hash.0), route_params, Retry::Attempts(0)).unwrap();
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" + '
BOLT 12 Offers message flow by jkczyz · Pull Request #2039 · lightningdevkit/rust-lightning · GitHub
Skip to content
BOLT 12 Offers message flow#2039

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

from

Oct 20, 2023
 Merged


BOLT 12 Offers message flow
#2039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
bc0203d

Expand docs on failing expired outbound payments


jkczyz Oct 19, 2023
ddfeb3f

Store OffersMessages for later sending


jkczyz Sep 14, 2023
34bdf22

Absolute expiry or timer tick payment expiration


jkczyz Oct 19, 2023
ffe9ae2

Utility for paying for an Offer


jkczyz Sep 14, 2023
46b794e

Utility for creating and sending Bolt12Invoices


jkczyz Sep 15, 2023
1d85efe

Qualify BOLT11 ChannelManager invoice_features


jkczyz Sep 1, 2023
6f6e086

BOLT12 invoice_feature methods for ChannelManager


jkczyz Sep 1, 2023
8954280

Grammar fix in docs


jkczyz Sep 1, 2023
b191fd4

Check offer expiry when building invoice in no-std


jkczyz Oct 19, 2023
debc20c

OffersMessageHandler impl for ChannelManager


jkczyz Sep 1, 2023
0e41d80

Use ChannelManager as OffersMessageHandler


jkczyz Jun 6, 2023
2840252

Revert "Config-guard Event::InvoiceRequestFailed"


jkczyz Oct 12, 2023
5a0b111

Document InvoiceRequestFailed in ChannelManager


jkczyz Oct 19, 2023
3fd9fc6

Organize create_refund and pay_for_offer docs


jkczyz Oct 19, 2023
681f898

Add privacy section to pay_for_offer docs


jkczyz Oct 19, 2023
a841e6b

Onion message routing to immediate peers.


jkczyz Oct 19, 2023
6d2ffdd

Expand request_refund_payment docs for limitations


jkczyz Oct 19, 2023
6a97f64

Fix build warnings


jkczyz Oct 19, 2023
fe90448

Fix PaymentConstraints::max_cltv_expiry docs


jkczyz Oct 20, 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


4 changes: 2 additions & 2 deletions
lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ impl BlindedPath {
	}

	/// Create a one-hop blinded path for a payment.
	pub fn one_hop_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub fn one_hop_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 payee_node_id: PublicKey, payee_tlvs: payment::ReceiveTlvs, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
	) -> Result<(BlindedPayInfo, Self), ()> {
Expand All@@ -105,7 +105,7 @@ impl BlindedPath {
	///
	/// [`ForwardTlvs`]: crate::blinded_path::payment::ForwardTlvs
	// TODO: make all payloads the same size with padding + add dummy hops
	pub(crate) fn new_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub(crate) fn new_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 intermediate_nodes: &[payment::ForwardNode], payee_node_id: PublicKey,
 payee_tlvs: payment::ReceiveTlvs, htlc_maximum_msat: u64, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ pub struct PaymentRelay {
/// [`BlindedHop`]: crate::blinded_path::BlindedHop
#[derive(Clone, Debug)]
pub struct PaymentConstraints {
	/// The maximum total CLTV delta that is acceptable when relaying a payment over this
	/// [`BlindedHop`].
	/// The maximum total CLTV that is acceptable when relaying a payment over this [`BlindedHop`].
	pub max_cltv_expiry: u32,
	/// The minimum value, in msat, that may be accepted by the node corresponding to this
	/// [`BlindedHop`].
Expand Down

9 changes: 5 additions & 4 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,10 +514,13 @@ pub enum Event {
 sender_intended_total_msat: Option<u64>,
	},
	/// Indicates a request for an invoice failed to yield a response in a reasonable amount of time
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`].
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`]. This may be for an
	/// [`InvoiceRequest`] sent for an [`Offer`] or for a [`Refund`] that hasn't been redeemed.
	///
	/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
	#[cfg(invreqfailed)]
	/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
	/// [`Offer`]: crate::offers::offer::Offer
	/// [`Refund`]: crate::offers::refund::Refund
	InvoiceRequestFailed {
 /// The `payment_id` to have been associated with payment for the requested invoice.
 payment_id: PaymentId,
Expand DownExpand Up@@ -1164,7 +1167,6 @@ impl Writeable for Event {
 (8, funding_txo, required),
 });
 },
 #[cfg(invreqfailed)]
 &Event::InvoiceRequestFailed { ref payment_id } => {
 33u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand DownExpand Up@@ -1558,7 +1560,6 @@ impl MaybeReadable for Event {
 };
 f()
 },
 #[cfg(invreqfailed)]
 33u8 => {
 let f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
Expand Down

8 changes: 3 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};
use crate::events::MessageSendEventsProvider;
use crate::ln::channelmanager;
use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
use crate::ln::features::Bolt12InvoiceFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::outbound_payment::Retry;
use crate::prelude::*;
Expand DownExpand Up@@ -88,11 +87,10 @@ fn mpp_to_one_hop_blinded_path() {
 nodes[3].node.get_our_node_id(), payee_tlvs, &chanmon_cfgs[3].keys_manager, &secp_ctx
	).unwrap();

	let bolt12_features: Bolt12InvoiceFeatures =
 channelmanager::provided_invoice_features(&UserConfig::default()).to_context();
	let bolt12_features =
 channelmanager::provided_bolt12_invoice_features(&UserConfig::default());
	let route_params = RouteParameters::from_payment_params_and_value(
 PaymentParameters::blinded(vec![blinded_path])
 .with_bolt12_features(bolt12_features).unwrap(),
 PaymentParameters::blinded(vec![blinded_path]).with_bolt12_features(bolt12_features).unwrap(),
 amt_msat,
	);
	nodes[0].node.send_payment(payment_hash, RecipientOnionFields::spontaneous_empty(), PaymentId(payment_hash.0), route_params, Retry::Attempts(0)).unwrap();
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('^' + ".*" + '
BOLT 12 Offers message flow by jkczyz · Pull Request #2039 · lightningdevkit/rust-lightning · GitHub
Skip to content
BOLT 12 Offers message flow#2039

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

from

Oct 20, 2023
 Merged


BOLT 12 Offers message flow
#2039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
bc0203d

Expand docs on failing expired outbound payments


jkczyz Oct 19, 2023
ddfeb3f

Store OffersMessages for later sending


jkczyz Sep 14, 2023
34bdf22

Absolute expiry or timer tick payment expiration


jkczyz Oct 19, 2023
ffe9ae2

Utility for paying for an Offer


jkczyz Sep 14, 2023
46b794e

Utility for creating and sending Bolt12Invoices


jkczyz Sep 15, 2023
1d85efe

Qualify BOLT11 ChannelManager invoice_features


jkczyz Sep 1, 2023
6f6e086

BOLT12 invoice_feature methods for ChannelManager


jkczyz Sep 1, 2023
8954280

Grammar fix in docs


jkczyz Sep 1, 2023
b191fd4

Check offer expiry when building invoice in no-std


jkczyz Oct 19, 2023
debc20c

OffersMessageHandler impl for ChannelManager


jkczyz Sep 1, 2023
0e41d80

Use ChannelManager as OffersMessageHandler


jkczyz Jun 6, 2023
2840252

Revert "Config-guard Event::InvoiceRequestFailed"


jkczyz Oct 12, 2023
5a0b111

Document InvoiceRequestFailed in ChannelManager


jkczyz Oct 19, 2023
3fd9fc6

Organize create_refund and pay_for_offer docs


jkczyz Oct 19, 2023
681f898

Add privacy section to pay_for_offer docs


jkczyz Oct 19, 2023
a841e6b

Onion message routing to immediate peers.


jkczyz Oct 19, 2023
6d2ffdd

Expand request_refund_payment docs for limitations


jkczyz Oct 19, 2023
6a97f64

Fix build warnings


jkczyz Oct 19, 2023
fe90448

Fix PaymentConstraints::max_cltv_expiry docs


jkczyz Oct 20, 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


4 changes: 2 additions & 2 deletions
lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ impl BlindedPath {
	}

	/// Create a one-hop blinded path for a payment.
	pub fn one_hop_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub fn one_hop_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 payee_node_id: PublicKey, payee_tlvs: payment::ReceiveTlvs, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
	) -> Result<(BlindedPayInfo, Self), ()> {
Expand All@@ -105,7 +105,7 @@ impl BlindedPath {
	///
	/// [`ForwardTlvs`]: crate::blinded_path::payment::ForwardTlvs
	// TODO: make all payloads the same size with padding + add dummy hops
	pub(crate) fn new_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub(crate) fn new_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 intermediate_nodes: &[payment::ForwardNode], payee_node_id: PublicKey,
 payee_tlvs: payment::ReceiveTlvs, htlc_maximum_msat: u64, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ pub struct PaymentRelay {
/// [`BlindedHop`]: crate::blinded_path::BlindedHop
#[derive(Clone, Debug)]
pub struct PaymentConstraints {
	/// The maximum total CLTV delta that is acceptable when relaying a payment over this
	/// [`BlindedHop`].
	/// The maximum total CLTV that is acceptable when relaying a payment over this [`BlindedHop`].
	pub max_cltv_expiry: u32,
	/// The minimum value, in msat, that may be accepted by the node corresponding to this
	/// [`BlindedHop`].
Expand Down

9 changes: 5 additions & 4 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,10 +514,13 @@ pub enum Event {
 sender_intended_total_msat: Option<u64>,
	},
	/// Indicates a request for an invoice failed to yield a response in a reasonable amount of time
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`].
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`]. This may be for an
	/// [`InvoiceRequest`] sent for an [`Offer`] or for a [`Refund`] that hasn't been redeemed.
	///
	/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
	#[cfg(invreqfailed)]
	/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
	/// [`Offer`]: crate::offers::offer::Offer
	/// [`Refund`]: crate::offers::refund::Refund
	InvoiceRequestFailed {
 /// The `payment_id` to have been associated with payment for the requested invoice.
 payment_id: PaymentId,
Expand DownExpand Up@@ -1164,7 +1167,6 @@ impl Writeable for Event {
 (8, funding_txo, required),
 });
 },
 #[cfg(invreqfailed)]
 &Event::InvoiceRequestFailed { ref payment_id } => {
 33u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand DownExpand Up@@ -1558,7 +1560,6 @@ impl MaybeReadable for Event {
 };
 f()
 },
 #[cfg(invreqfailed)]
 33u8 => {
 let f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
Expand Down

8 changes: 3 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};
use crate::events::MessageSendEventsProvider;
use crate::ln::channelmanager;
use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
use crate::ln::features::Bolt12InvoiceFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::outbound_payment::Retry;
use crate::prelude::*;
Expand DownExpand Up@@ -88,11 +87,10 @@ fn mpp_to_one_hop_blinded_path() {
 nodes[3].node.get_our_node_id(), payee_tlvs, &chanmon_cfgs[3].keys_manager, &secp_ctx
	).unwrap();

	let bolt12_features: Bolt12InvoiceFeatures =
 channelmanager::provided_invoice_features(&UserConfig::default()).to_context();
	let bolt12_features =
 channelmanager::provided_bolt12_invoice_features(&UserConfig::default());
	let route_params = RouteParameters::from_payment_params_and_value(
 PaymentParameters::blinded(vec![blinded_path])
 .with_bolt12_features(bolt12_features).unwrap(),
 PaymentParameters::blinded(vec![blinded_path]).with_bolt12_features(bolt12_features).unwrap(),
 amt_msat,
	);
	nodes[0].node.send_payment(payment_hash, RecipientOnionFields::spontaneous_empty(), PaymentId(payment_hash.0), route_params, Retry::Attempts(0)).unwrap();
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); }
})();
})();
BOLT 12 Offers message flow by jkczyz · Pull Request #2039 · lightningdevkit/rust-lightning · GitHub
Skip to content
BOLT 12 Offers message flow#2039

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

from

Oct 20, 2023
 Merged


BOLT 12 Offers message flow
#2039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
bc0203d

Expand docs on failing expired outbound payments


jkczyz Oct 19, 2023
ddfeb3f

Store OffersMessages for later sending


jkczyz Sep 14, 2023
34bdf22

Absolute expiry or timer tick payment expiration


jkczyz Oct 19, 2023
ffe9ae2

Utility for paying for an Offer


jkczyz Sep 14, 2023
46b794e

Utility for creating and sending Bolt12Invoices


jkczyz Sep 15, 2023
1d85efe

Qualify BOLT11 ChannelManager invoice_features


jkczyz Sep 1, 2023
6f6e086

BOLT12 invoice_feature methods for ChannelManager


jkczyz Sep 1, 2023
8954280

Grammar fix in docs


jkczyz Sep 1, 2023
b191fd4

Check offer expiry when building invoice in no-std


jkczyz Oct 19, 2023
debc20c

OffersMessageHandler impl for ChannelManager


jkczyz Sep 1, 2023
0e41d80

Use ChannelManager as OffersMessageHandler


jkczyz Jun 6, 2023
2840252

Revert "Config-guard Event::InvoiceRequestFailed"


jkczyz Oct 12, 2023
5a0b111

Document InvoiceRequestFailed in ChannelManager


jkczyz Oct 19, 2023
3fd9fc6

Organize create_refund and pay_for_offer docs


jkczyz Oct 19, 2023
681f898

Add privacy section to pay_for_offer docs


jkczyz Oct 19, 2023
a841e6b

Onion message routing to immediate peers.


jkczyz Oct 19, 2023
6d2ffdd

Expand request_refund_payment docs for limitations


jkczyz Oct 19, 2023
6a97f64

Fix build warnings


jkczyz Oct 19, 2023
fe90448

Fix PaymentConstraints::max_cltv_expiry docs


jkczyz Oct 20, 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


4 changes: 2 additions & 2 deletions
lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ impl BlindedPath {
	}

	/// Create a one-hop blinded path for a payment.
	pub fn one_hop_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub fn one_hop_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 payee_node_id: PublicKey, payee_tlvs: payment::ReceiveTlvs, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
	) -> Result<(BlindedPayInfo, Self), ()> {
Expand All@@ -105,7 +105,7 @@ impl BlindedPath {
	///
	/// [`ForwardTlvs`]: crate::blinded_path::payment::ForwardTlvs
	// TODO: make all payloads the same size with padding + add dummy hops
	pub(crate) fn new_for_payment<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>(
	pub(crate) fn new_for_payment<ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification>(
 intermediate_nodes: &[payment::ForwardNode], payee_node_id: PublicKey,
 payee_tlvs: payment::ReceiveTlvs, htlc_maximum_msat: u64, entropy_source: &ES,
 secp_ctx: &Secp256k1<T>
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/blinded_path/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ pub struct PaymentRelay {
/// [`BlindedHop`]: crate::blinded_path::BlindedHop
#[derive(Clone, Debug)]
pub struct PaymentConstraints {
	/// The maximum total CLTV delta that is acceptable when relaying a payment over this
	/// [`BlindedHop`].
	/// The maximum total CLTV that is acceptable when relaying a payment over this [`BlindedHop`].
	pub max_cltv_expiry: u32,
	/// The minimum value, in msat, that may be accepted by the node corresponding to this
	/// [`BlindedHop`].
Expand Down

9 changes: 5 additions & 4 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,10 +514,13 @@ pub enum Event {
 sender_intended_total_msat: Option<u64>,
	},
	/// Indicates a request for an invoice failed to yield a response in a reasonable amount of time
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`].
	/// or was explicitly abandoned by [`ChannelManager::abandon_payment`]. This may be for an
	/// [`InvoiceRequest`] sent for an [`Offer`] or for a [`Refund`] that hasn't been redeemed.
	///
	/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
	#[cfg(invreqfailed)]
	/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
	/// [`Offer`]: crate::offers::offer::Offer
	/// [`Refund`]: crate::offers::refund::Refund
	InvoiceRequestFailed {
 /// The `payment_id` to have been associated with payment for the requested invoice.
 payment_id: PaymentId,
Expand DownExpand Up@@ -1164,7 +1167,6 @@ impl Writeable for Event {
 (8, funding_txo, required),
 });
 },
 #[cfg(invreqfailed)]
 &Event::InvoiceRequestFailed { ref payment_id } => {
 33u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand DownExpand Up@@ -1558,7 +1560,6 @@ impl MaybeReadable for Event {
 };
 f()
 },
 #[cfg(invreqfailed)]
 33u8 => {
 let f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
Expand Down

8 changes: 3 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};
use crate::events::MessageSendEventsProvider;
use crate::ln::channelmanager;
use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
use crate::ln::features::Bolt12InvoiceFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::outbound_payment::Retry;
use crate::prelude::*;
Expand DownExpand Up@@ -88,11 +87,10 @@ fn mpp_to_one_hop_blinded_path() {
 nodes[3].node.get_our_node_id(), payee_tlvs, &chanmon_cfgs[3].keys_manager, &secp_ctx
	).unwrap();

	let bolt12_features: Bolt12InvoiceFeatures =
 channelmanager::provided_invoice_features(&UserConfig::default()).to_context();
	let bolt12_features =
 channelmanager::provided_bolt12_invoice_features(&UserConfig::default());
	let route_params = RouteParameters::from_payment_params_and_value(
 PaymentParameters::blinded(vec![blinded_path])
 .with_bolt12_features(bolt12_features).unwrap(),
 PaymentParameters::blinded(vec![blinded_path]).with_bolt12_features(bolt12_features).unwrap(),
 amt_msat,
	);
	nodes[0].node.send_payment(payment_hash, RecipientOnionFields::spontaneous_empty(), PaymentId(payment_hash.0), route_params, Retry::Attempts(0)).unwrap();
Expand Down
Loading