Skip to content

Follow-ups to #2970#3028

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 4 commits into from
Apr 29, 2024
Merged

Follow-ups to #2970 #3028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d690072
Remove unnecessary PaymentPreimage clone
jkczyz Apr 22, 2024
8e562be
Remove PaymentContext from OnionPayload
jkczyz Apr 26, 2024
7b86442
Remove InvoiceRequestFields::amount_msats
jkczyz Apr 26, 2024
33b6162
Remove InvoiceRequestFields::features
jkczyz Apr 26, 2024
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
46 changes: 18 additions & 28 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,11 +357,6 @@ enum OnionPayload {
/// This is only here for backwards-compatibility in serialization, in the future it can be
/// removed, breaking clients running 0.0.106 and earlier.
_legacy_hop_data: Option<msgs::FinalOnionHopData>,
/// The context of the payment included by the recipient in a blinded path, or `None` if a
/// blinded path was not used.
///
/// Used in part to determine the [`events::PaymentPurpose`].
payment_context: Option<PaymentContext>,
},
/// Contains the payer-provided preimage.
Spontaneous(PaymentPreimage),
Expand DownExpand Up@@ -5346,7 +5341,7 @@ where
}
}) => {
let blinded_failure = routing.blinded_failure();
let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret, mut onion_fields) = match routing {
let (cltv_expiry, onion_payload, payment_data, payment_context, phantom_shared_secret, mut onion_fields) = match routing {
PendingHTLCRouting::Receive {
payment_data, payment_metadata, payment_context,
incoming_cltv_expiry, phantom_shared_secret, custom_tlvs,
Expand All@@ -5355,8 +5350,8 @@ where
let _legacy_hop_data = Some(payment_data.clone());
let onion_fields = RecipientOnionFields { payment_secret: Some(payment_data.payment_secret),
payment_metadata, custom_tlvs };
(incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data, payment_context },
Some(payment_data), phantom_shared_secret, onion_fields)
(incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data },
Some(payment_data), payment_context, phantom_shared_secret, onion_fields)
},
PendingHTLCRouting::ReceiveKeysend {
payment_data, payment_preimage, payment_metadata,
Expand All@@ -5368,7 +5363,7 @@ where
custom_tlvs,
};
(incoming_cltv_expiry, OnionPayload::Spontaneous(payment_preimage),
payment_data, None, onion_fields)
payment_data, None, None, onion_fields)
},
_ => {
panic!("short_channel_id == 0 should imply any pending_forward entries are of type Receive");
Expand DownExpand Up@@ -5530,7 +5525,7 @@ where
match payment_secrets.entry(payment_hash) {
hash_map::Entry::Vacant(_) => {
match claimable_htlc.onion_payload {
OnionPayload::Invoice { ref payment_context, .. } => {
OnionPayload::Invoice { .. } => {
let payment_data = payment_data.unwrap();
let (payment_preimage, min_final_cltv_expiry_delta) = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
Ok(result) => result,
Expand All@@ -5548,9 +5543,9 @@ where
}
}
let purpose = events::PaymentPurpose::from_parts(
payment_preimage.clone(),
payment_preimage,
payment_data.payment_secret,
payment_context.clone(),
payment_context,
);
check_total_value!(purpose);
},
Expand All@@ -5561,13 +5556,10 @@ where
}
},
hash_map::Entry::Occupied(inbound_payment) => {
let payment_context = match claimable_htlc.onion_payload {
OnionPayload::Spontaneous(_) => {
log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
fail_htlc!(claimable_htlc, payment_hash);
},
OnionPayload::Invoice { ref payment_context, .. } => payment_context,
};
if let OnionPayload::Spontaneous(_) = claimable_htlc.onion_payload {
log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
fail_htlc!(claimable_htlc, payment_hash);
}
let payment_data = payment_data.unwrap();
if inbound_payment.get().payment_secret != payment_data.payment_secret {
log_trace!(self.logger, "Failing new HTLC with payment_hash {} as it didn't match our expected payment secret.", &payment_hash);
Expand All@@ -5580,7 +5572,7 @@ where
let purpose = events::PaymentPurpose::from_parts(
inbound_payment.get().payment_preimage,
payment_data.payment_secret,
payment_context.clone(),
payment_context,
);
let payment_claimable_generated = check_total_value!(purpose);
if payment_claimable_generated {
Expand DownExpand Up@@ -10815,11 +10807,11 @@ impl_writeable_tlv_based!(HTLCPreviousHopData, {

impl Writeable for ClaimableHTLC {
fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
let (payment_data, keysend_preimage, payment_context) = match &self.onion_payload {
OnionPayload::Invoice { _legacy_hop_data, payment_context } => {
(_legacy_hop_data.as_ref(), None, payment_context.as_ref())
let (payment_data, keysend_preimage) = match &self.onion_payload {
OnionPayload::Invoice { _legacy_hop_data } => {
(_legacy_hop_data.as_ref(), None)
},
OnionPayload::Spontaneous(preimage) => (None, Some(preimage), None),
OnionPayload::Spontaneous(preimage) => (None, Some(preimage)),
};
write_tlv_fields!(writer, {
(0, self.prev_hop, required),
Expand All@@ -10831,7 +10823,6 @@ impl Writeable for ClaimableHTLC {
(6, self.cltv_expiry, required),
(8, keysend_preimage, option),
(10, self.counterparty_skimmed_fee_msat, option),
(11, payment_context, option),
});
Ok(())
}
Expand All@@ -10849,7 +10840,6 @@ impl Readable for ClaimableHTLC {
(6, cltv_expiry, required),
(8, keysend_preimage, option),
(10, counterparty_skimmed_fee_msat, option),
(11, payment_context, option),
});
let payment_data: Option<msgs::FinalOnionHopData> = payment_data_opt;
let value = value_ser.0.unwrap();
Expand All@@ -10870,7 +10860,7 @@ impl Readable for ClaimableHTLC {
}
total_msat = Some(payment_data.as_ref().unwrap().total_msat);
}
OnionPayload::Invoice { _legacy_hop_data: payment_data, payment_context }
OnionPayload::Invoice { _legacy_hop_data: payment_data }
},
};
Ok(Self {
Expand DownExpand Up@@ -12106,7 +12096,7 @@ where
return Err(DecodeError::InvalidValue);
}
let purpose = match &htlcs[0].onion_payload {
OnionPayload::Invoice { _legacy_hop_data, payment_context: _ } => {
OnionPayload::Invoice { _legacy_hop_data } => {
if let Some(hop_data) = _legacy_hop_data {
events::PaymentPurpose::Bolt11InvoicePayment {
payment_preimage: match pending_inbound_payments.get(&payment_hash) {
Expand Down
7 changes: 0 additions & 7 deletions lightning/src/ln/offers_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ use crate::blinded_path::{BlindedPath, IntroductionNode};
use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext};
use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
use crate::ln::features::InvoiceRequestFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::msgs::{ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
use crate::offers::invoice::Bolt12Invoice;
Expand DownExpand Up@@ -412,8 +411,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
offer_id: offer.id(),
invoice_request: InvoiceRequestFields {
payer_id: invoice_request.payer_id(),
amount_msats: None,
features: InvoiceRequestFeatures::empty(),
quantity: None,
payer_note_truncated: None,
},
Expand DownExpand Up@@ -565,8 +562,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
offer_id: offer.id(),
invoice_request: InvoiceRequestFields {
payer_id: invoice_request.payer_id(),
amount_msats: None,
features: InvoiceRequestFeatures::empty(),
quantity: None,
payer_note_truncated: None,
},
Expand DownExpand Up@@ -687,8 +682,6 @@ fn pays_for_offer_without_blinded_paths() {
offer_id: offer.id(),
invoice_request: InvoiceRequestFields {
payer_id: invoice_request.payer_id(),
amount_msats: None,
features: InvoiceRequestFeatures::empty(),
quantity: None,
payer_note_truncated: None,
},
Expand Down
32 changes: 7 additions & 25 deletions lightning/src/offers/invoice_request.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -877,14 +877,12 @@ impl VerifiedInvoiceRequest {
let InvoiceRequestContents {
payer_id,
inner: InvoiceRequestContentsWithoutPayerId {
payer: _, offer: _, chain: _, amount_msats, features, quantity, payer_note
payer: _, offer: _, chain: _, amount_msats: _, features: _, quantity, payer_note
},
} = &self.inner.contents;

InvoiceRequestFields {
payer_id: *payer_id,
amount_msats: *amount_msats,
features: features.clone(),
quantity: *quantity,
payer_note_truncated: payer_note.clone()
.map(|mut s| { s.truncate(PAYER_NOTE_LIMIT); UntrustedString(s) }),
Expand DownExpand Up@@ -1126,15 +1124,6 @@ pub struct InvoiceRequestFields {
/// A possibly transient pubkey used to sign the invoice request.
pub payer_id: PublicKey,

/// The amount to pay in msats (i.e., the minimum lightning-payable unit for [`chain`]), which
/// must be greater than or equal to [`Offer::amount`], converted if necessary.
///
/// [`chain`]: InvoiceRequest::chain
pub amount_msats: Option<u64>,

/// Features pertaining to requesting an invoice.
pub features: InvoiceRequestFeatures,

/// The quantity of the offer's item conforming to [`Offer::is_valid_quantity`].
pub quantity: Option<u64>,

Expand All@@ -1150,10 +1139,8 @@ impl Writeable for InvoiceRequestFields {
fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
write_tlv_fields!(writer, {
(0, self.payer_id, required),
(2, self.amount_msats.map(|v| HighZeroBytesDroppedBigSize(v)), option),
(4, WithoutLength(&self.features), required),
(6, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
(8, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
(2, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
(4, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
});
Ok(())
}
Expand All@@ -1163,15 +1150,13 @@ impl Readable for InvoiceRequestFields {
fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
_init_and_read_len_prefixed_tlv_fields!(reader, {
(0, payer_id, required),
(2, amount_msats, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
(4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
(6, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
(8, payer_note_truncated, (option, encoding: (String, WithoutLength))),
(2, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
(4, payer_note_truncated, (option, encoding: (String, WithoutLength))),
});
let features = features.unwrap_or(InvoiceRequestFeatures::empty());

Ok(InvoiceRequestFields {
payer_id: payer_id.0.unwrap(), amount_msats, features, quantity,
payer_id: payer_id.0.unwrap(),
quantity,
payer_note_truncated: payer_note_truncated.map(|s| UntrustedString(s)),
})
}
Expand DownExpand Up@@ -2264,7 +2249,6 @@ mod tests {

let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
.chain(Network::Testnet).unwrap()
.amount_msats(1001).unwrap()
.quantity(1).unwrap()
.payer_note("0".repeat(PAYER_NOTE_LIMIT * 2))
.build().unwrap()
Expand All@@ -2277,8 +2261,6 @@ mod tests {
fields,
InvoiceRequestFields {
payer_id: payer_pubkey(),
amount_msats: Some(1001),
features: InvoiceRequestFeatures::empty(),
quantity: Some(1),
payer_note_truncated: Some(UntrustedString("0".repeat(PAYER_NOTE_LIMIT))),
}
Expand Down
, '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" + '
Follow-ups to #2970 by jkczyz · Pull Request #3028 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups to #2970#3028

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

from

Apr 29, 2024
 Merged


Follow-ups to #2970
#3028
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d690072

Remove unnecessary PaymentPreimage clone


jkczyz Apr 22, 2024
8e562be

Remove PaymentContext from OnionPayload


jkczyz Apr 26, 2024
7b86442

Remove InvoiceRequestFields::amount_msats


jkczyz Apr 26, 2024
33b6162

Remove InvoiceRequestFields::features


jkczyz Apr 26, 2024

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


46 changes: 18 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,11 +357,6 @@ enum OnionPayload {
 /// This is only here for backwards-compatibility in serialization, in the future it can be
 /// removed, breaking clients running 0.0.106 and earlier.
 _legacy_hop_data: Option<msgs::FinalOnionHopData>,
 /// The context of the payment included by the recipient in a blinded path, or `None` if a
 /// blinded path was not used.
 ///
 /// Used in part to determine the [`events::PaymentPurpose`].
 payment_context: Option<PaymentContext>,
	},
	/// Contains the payer-provided preimage.
	Spontaneous(PaymentPreimage),
Expand DownExpand Up@@ -5346,7 +5341,7 @@ where
 }
 }) => {
 let blinded_failure = routing.blinded_failure();
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret, mut onion_fields) = match routing {
 let (cltv_expiry, onion_payload, payment_data, payment_context, phantom_shared_secret, mut onion_fields) = match routing {
 PendingHTLCRouting::Receive {
 payment_data, payment_metadata, payment_context,
 incoming_cltv_expiry, phantom_shared_secret, custom_tlvs,
Expand All@@ -5355,8 +5350,8 @@ where
 let _legacy_hop_data = Some(payment_data.clone());
 let onion_fields = RecipientOnionFields { payment_secret: Some(payment_data.payment_secret),
 payment_metadata, custom_tlvs };
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data, payment_context },
 Some(payment_data), phantom_shared_secret, onion_fields)
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data },
 Some(payment_data), payment_context, phantom_shared_secret, onion_fields)
 },
 PendingHTLCRouting::ReceiveKeysend {
 payment_data, payment_preimage, payment_metadata,
Expand All@@ -5368,7 +5363,7 @@ where
 custom_tlvs,
 };
 (incoming_cltv_expiry, OnionPayload::Spontaneous(payment_preimage),
 payment_data, None, onion_fields)
 payment_data, None, None, onion_fields)
 },
 _ => {
 panic!("short_channel_id == 0 should imply any pending_forward entries are of type Receive");
Expand DownExpand Up@@ -5530,7 +5525,7 @@ where
 match payment_secrets.entry(payment_hash) {
 hash_map::Entry::Vacant(_) => {
 match claimable_htlc.onion_payload {
 OnionPayload::Invoice { ref payment_context, .. } => {
 OnionPayload::Invoice { .. } => {
 let payment_data = payment_data.unwrap();
 let (payment_preimage, min_final_cltv_expiry_delta) = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
 Ok(result) => result,
Expand All@@ -5548,9 +5543,9 @@ where
 }
 }
 let purpose = events::PaymentPurpose::from_parts(
 payment_preimage.clone(),
 payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 check_total_value!(purpose);
 },
Expand All@@ -5561,13 +5556,10 @@ where
 }
 },
 hash_map::Entry::Occupied(inbound_payment) => {
 let payment_context = match claimable_htlc.onion_payload {
 OnionPayload::Spontaneous(_) => {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 },
 OnionPayload::Invoice { ref payment_context, .. } => payment_context,
 };
 if let OnionPayload::Spontaneous(_) = claimable_htlc.onion_payload {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 }
 let payment_data = payment_data.unwrap();
 if inbound_payment.get().payment_secret != payment_data.payment_secret {
 log_trace!(self.logger, "Failing new HTLC with payment_hash {} as it didn't match our expected payment secret.", &payment_hash);
Expand All@@ -5580,7 +5572,7 @@ where
 let purpose = events::PaymentPurpose::from_parts(
 inbound_payment.get().payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 let payment_claimable_generated = check_total_value!(purpose);
 if payment_claimable_generated {
Expand DownExpand Up@@ -10815,11 +10807,11 @@ impl_writeable_tlv_based!(HTLCPreviousHopData, {

impl Writeable for ClaimableHTLC {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 let (payment_data, keysend_preimage, payment_context) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context } => {
 (_legacy_hop_data.as_ref(), None, payment_context.as_ref())
 let (payment_data, keysend_preimage) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data } => {
 (_legacy_hop_data.as_ref(), None)
 },
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage), None),
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage)),
 };
 write_tlv_fields!(writer, {
 (0, self.prev_hop, required),
Expand All@@ -10831,7 +10823,6 @@ impl Writeable for ClaimableHTLC {
 (6, self.cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, self.counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 Ok(())
	}
Expand All@@ -10849,7 +10840,6 @@ impl Readable for ClaimableHTLC {
 (6, cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 let payment_data: Option<msgs::FinalOnionHopData> = payment_data_opt;
 let value = value_ser.0.unwrap();
Expand All@@ -10870,7 +10860,7 @@ impl Readable for ClaimableHTLC {
 }
 total_msat = Some(payment_data.as_ref().unwrap().total_msat);
 }
 OnionPayload::Invoice { _legacy_hop_data: payment_data, payment_context }
 OnionPayload::Invoice { _legacy_hop_data: payment_data }
 },
 };
 Ok(Self {
Expand DownExpand Up@@ -12106,7 +12096,7 @@ where
 return Err(DecodeError::InvalidValue);
 }
 let purpose = match &htlcs[0].onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context: _ } => {
 OnionPayload::Invoice { _legacy_hop_data } => {
 if let Some(hop_data) = _legacy_hop_data {
 events::PaymentPurpose::Bolt11InvoicePayment {
 payment_preimage: match pending_inbound_payments.get(&payment_hash) {
Expand Down

7 changes: 0 additions & 7 deletions
lightning/src/ln/offers_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ use crate::blinded_path::{BlindedPath, IntroductionNode};
use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext};
use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
use crate::ln::features::InvoiceRequestFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::msgs::{ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
use crate::offers::invoice::Bolt12Invoice;
Expand DownExpand Up@@ -412,8 +411,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -565,8 +562,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -687,8 +682,6 @@ fn pays_for_offer_without_blinded_paths() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand Down

32 changes: 7 additions & 25 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -877,14 +877,12 @@ impl VerifiedInvoiceRequest {
 let InvoiceRequestContents {
 payer_id,
 inner: InvoiceRequestContentsWithoutPayerId {
 payer: _, offer: _, chain: _, amount_msats, features, quantity, payer_note
 payer: _, offer: _, chain: _, amount_msats: _, features: _, quantity, payer_note
 },
 } = &self.inner.contents;

 InvoiceRequestFields {
 payer_id: *payer_id,
 amount_msats: *amount_msats,
 features: features.clone(),
 quantity: *quantity,
 payer_note_truncated: payer_note.clone()
 .map(|mut s| { s.truncate(PAYER_NOTE_LIMIT); UntrustedString(s) }),
Expand DownExpand Up@@ -1126,15 +1124,6 @@ pub struct InvoiceRequestFields {
	/// A possibly transient pubkey used to sign the invoice request.
	pub payer_id: PublicKey,

	/// The amount to pay in msats (i.e., the minimum lightning-payable unit for [`chain`]), which
	/// must be greater than or equal to [`Offer::amount`], converted if necessary.
	///
	/// [`chain`]: InvoiceRequest::chain
	pub amount_msats: Option<u64>,

	/// Features pertaining to requesting an invoice.
	pub features: InvoiceRequestFeatures,

	/// The quantity of the offer's item conforming to [`Offer::is_valid_quantity`].
	pub quantity: Option<u64>,

Expand All@@ -1150,10 +1139,8 @@ impl Writeable for InvoiceRequestFields {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 write_tlv_fields!(writer, {
 (0, self.payer_id, required),
 (2, self.amount_msats.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, WithoutLength(&self.features), required),
 (6, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (8, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 (2, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 });
 Ok(())
	}
Expand All@@ -1163,15 +1150,13 @@ impl Readable for InvoiceRequestFields {
	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payer_id, required),
 (2, amount_msats, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
 (6, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (8, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 (2, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 });
 let features = features.unwrap_or(InvoiceRequestFeatures::empty());

 Ok(InvoiceRequestFields {
 payer_id: payer_id.0.unwrap(), amount_msats, features, quantity,
 payer_id: payer_id.0.unwrap(),
 quantity,
 payer_note_truncated: payer_note_truncated.map(|s| UntrustedString(s)),
 })
	}
Expand DownExpand Up@@ -2264,7 +2249,6 @@ mod tests {

 let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
 .chain(Network::Testnet).unwrap()
 .amount_msats(1001).unwrap()
 .quantity(1).unwrap()
 .payer_note("0".repeat(PAYER_NOTE_LIMIT * 2))
 .build().unwrap()
Expand All@@ -2277,8 +2261,6 @@ mod tests {
 fields,
 InvoiceRequestFields {
 payer_id: payer_pubkey(),
 amount_msats: Some(1001),
 features: InvoiceRequestFeatures::empty(),
 quantity: Some(1),
 payer_note_truncated: Some(UntrustedString("0".repeat(PAYER_NOTE_LIMIT))),
 }
Expand Down

, '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('^' + ".*" + '
Follow-ups to #2970 by jkczyz · Pull Request #3028 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups to #2970#3028

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

from

Apr 29, 2024
 Merged


Follow-ups to #2970
#3028
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d690072

Remove unnecessary PaymentPreimage clone


jkczyz Apr 22, 2024
8e562be

Remove PaymentContext from OnionPayload


jkczyz Apr 26, 2024
7b86442

Remove InvoiceRequestFields::amount_msats


jkczyz Apr 26, 2024
33b6162

Remove InvoiceRequestFields::features


jkczyz Apr 26, 2024

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


46 changes: 18 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,11 +357,6 @@ enum OnionPayload {
 /// This is only here for backwards-compatibility in serialization, in the future it can be
 /// removed, breaking clients running 0.0.106 and earlier.
 _legacy_hop_data: Option<msgs::FinalOnionHopData>,
 /// The context of the payment included by the recipient in a blinded path, or `None` if a
 /// blinded path was not used.
 ///
 /// Used in part to determine the [`events::PaymentPurpose`].
 payment_context: Option<PaymentContext>,
	},
	/// Contains the payer-provided preimage.
	Spontaneous(PaymentPreimage),
Expand DownExpand Up@@ -5346,7 +5341,7 @@ where
 }
 }) => {
 let blinded_failure = routing.blinded_failure();
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret, mut onion_fields) = match routing {
 let (cltv_expiry, onion_payload, payment_data, payment_context, phantom_shared_secret, mut onion_fields) = match routing {
 PendingHTLCRouting::Receive {
 payment_data, payment_metadata, payment_context,
 incoming_cltv_expiry, phantom_shared_secret, custom_tlvs,
Expand All@@ -5355,8 +5350,8 @@ where
 let _legacy_hop_data = Some(payment_data.clone());
 let onion_fields = RecipientOnionFields { payment_secret: Some(payment_data.payment_secret),
 payment_metadata, custom_tlvs };
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data, payment_context },
 Some(payment_data), phantom_shared_secret, onion_fields)
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data },
 Some(payment_data), payment_context, phantom_shared_secret, onion_fields)
 },
 PendingHTLCRouting::ReceiveKeysend {
 payment_data, payment_preimage, payment_metadata,
Expand All@@ -5368,7 +5363,7 @@ where
 custom_tlvs,
 };
 (incoming_cltv_expiry, OnionPayload::Spontaneous(payment_preimage),
 payment_data, None, onion_fields)
 payment_data, None, None, onion_fields)
 },
 _ => {
 panic!("short_channel_id == 0 should imply any pending_forward entries are of type Receive");
Expand DownExpand Up@@ -5530,7 +5525,7 @@ where
 match payment_secrets.entry(payment_hash) {
 hash_map::Entry::Vacant(_) => {
 match claimable_htlc.onion_payload {
 OnionPayload::Invoice { ref payment_context, .. } => {
 OnionPayload::Invoice { .. } => {
 let payment_data = payment_data.unwrap();
 let (payment_preimage, min_final_cltv_expiry_delta) = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
 Ok(result) => result,
Expand All@@ -5548,9 +5543,9 @@ where
 }
 }
 let purpose = events::PaymentPurpose::from_parts(
 payment_preimage.clone(),
 payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 check_total_value!(purpose);
 },
Expand All@@ -5561,13 +5556,10 @@ where
 }
 },
 hash_map::Entry::Occupied(inbound_payment) => {
 let payment_context = match claimable_htlc.onion_payload {
 OnionPayload::Spontaneous(_) => {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 },
 OnionPayload::Invoice { ref payment_context, .. } => payment_context,
 };
 if let OnionPayload::Spontaneous(_) = claimable_htlc.onion_payload {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 }
 let payment_data = payment_data.unwrap();
 if inbound_payment.get().payment_secret != payment_data.payment_secret {
 log_trace!(self.logger, "Failing new HTLC with payment_hash {} as it didn't match our expected payment secret.", &payment_hash);
Expand All@@ -5580,7 +5572,7 @@ where
 let purpose = events::PaymentPurpose::from_parts(
 inbound_payment.get().payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 let payment_claimable_generated = check_total_value!(purpose);
 if payment_claimable_generated {
Expand DownExpand Up@@ -10815,11 +10807,11 @@ impl_writeable_tlv_based!(HTLCPreviousHopData, {

impl Writeable for ClaimableHTLC {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 let (payment_data, keysend_preimage, payment_context) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context } => {
 (_legacy_hop_data.as_ref(), None, payment_context.as_ref())
 let (payment_data, keysend_preimage) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data } => {
 (_legacy_hop_data.as_ref(), None)
 },
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage), None),
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage)),
 };
 write_tlv_fields!(writer, {
 (0, self.prev_hop, required),
Expand All@@ -10831,7 +10823,6 @@ impl Writeable for ClaimableHTLC {
 (6, self.cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, self.counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 Ok(())
	}
Expand All@@ -10849,7 +10840,6 @@ impl Readable for ClaimableHTLC {
 (6, cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 let payment_data: Option<msgs::FinalOnionHopData> = payment_data_opt;
 let value = value_ser.0.unwrap();
Expand All@@ -10870,7 +10860,7 @@ impl Readable for ClaimableHTLC {
 }
 total_msat = Some(payment_data.as_ref().unwrap().total_msat);
 }
 OnionPayload::Invoice { _legacy_hop_data: payment_data, payment_context }
 OnionPayload::Invoice { _legacy_hop_data: payment_data }
 },
 };
 Ok(Self {
Expand DownExpand Up@@ -12106,7 +12096,7 @@ where
 return Err(DecodeError::InvalidValue);
 }
 let purpose = match &htlcs[0].onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context: _ } => {
 OnionPayload::Invoice { _legacy_hop_data } => {
 if let Some(hop_data) = _legacy_hop_data {
 events::PaymentPurpose::Bolt11InvoicePayment {
 payment_preimage: match pending_inbound_payments.get(&payment_hash) {
Expand Down

7 changes: 0 additions & 7 deletions
lightning/src/ln/offers_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ use crate::blinded_path::{BlindedPath, IntroductionNode};
use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext};
use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
use crate::ln::features::InvoiceRequestFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::msgs::{ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
use crate::offers::invoice::Bolt12Invoice;
Expand DownExpand Up@@ -412,8 +411,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -565,8 +562,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -687,8 +682,6 @@ fn pays_for_offer_without_blinded_paths() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand Down

32 changes: 7 additions & 25 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -877,14 +877,12 @@ impl VerifiedInvoiceRequest {
 let InvoiceRequestContents {
 payer_id,
 inner: InvoiceRequestContentsWithoutPayerId {
 payer: _, offer: _, chain: _, amount_msats, features, quantity, payer_note
 payer: _, offer: _, chain: _, amount_msats: _, features: _, quantity, payer_note
 },
 } = &self.inner.contents;

 InvoiceRequestFields {
 payer_id: *payer_id,
 amount_msats: *amount_msats,
 features: features.clone(),
 quantity: *quantity,
 payer_note_truncated: payer_note.clone()
 .map(|mut s| { s.truncate(PAYER_NOTE_LIMIT); UntrustedString(s) }),
Expand DownExpand Up@@ -1126,15 +1124,6 @@ pub struct InvoiceRequestFields {
	/// A possibly transient pubkey used to sign the invoice request.
	pub payer_id: PublicKey,

	/// The amount to pay in msats (i.e., the minimum lightning-payable unit for [`chain`]), which
	/// must be greater than or equal to [`Offer::amount`], converted if necessary.
	///
	/// [`chain`]: InvoiceRequest::chain
	pub amount_msats: Option<u64>,

	/// Features pertaining to requesting an invoice.
	pub features: InvoiceRequestFeatures,

	/// The quantity of the offer's item conforming to [`Offer::is_valid_quantity`].
	pub quantity: Option<u64>,

Expand All@@ -1150,10 +1139,8 @@ impl Writeable for InvoiceRequestFields {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 write_tlv_fields!(writer, {
 (0, self.payer_id, required),
 (2, self.amount_msats.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, WithoutLength(&self.features), required),
 (6, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (8, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 (2, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 });
 Ok(())
	}
Expand All@@ -1163,15 +1150,13 @@ impl Readable for InvoiceRequestFields {
	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payer_id, required),
 (2, amount_msats, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
 (6, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (8, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 (2, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 });
 let features = features.unwrap_or(InvoiceRequestFeatures::empty());

 Ok(InvoiceRequestFields {
 payer_id: payer_id.0.unwrap(), amount_msats, features, quantity,
 payer_id: payer_id.0.unwrap(),
 quantity,
 payer_note_truncated: payer_note_truncated.map(|s| UntrustedString(s)),
 })
	}
Expand DownExpand Up@@ -2264,7 +2249,6 @@ mod tests {

 let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
 .chain(Network::Testnet).unwrap()
 .amount_msats(1001).unwrap()
 .quantity(1).unwrap()
 .payer_note("0".repeat(PAYER_NOTE_LIMIT * 2))
 .build().unwrap()
Expand All@@ -2277,8 +2261,6 @@ mod tests {
 fields,
 InvoiceRequestFields {
 payer_id: payer_pubkey(),
 amount_msats: Some(1001),
 features: InvoiceRequestFeatures::empty(),
 quantity: Some(1),
 payer_note_truncated: Some(UntrustedString("0".repeat(PAYER_NOTE_LIMIT))),
 }
Expand Down

, '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('^' + ".*" + '
Follow-ups to #2970 by jkczyz · Pull Request #3028 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups to #2970#3028

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

from

Apr 29, 2024
 Merged


Follow-ups to #2970
#3028
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d690072

Remove unnecessary PaymentPreimage clone


jkczyz Apr 22, 2024
8e562be

Remove PaymentContext from OnionPayload


jkczyz Apr 26, 2024
7b86442

Remove InvoiceRequestFields::amount_msats


jkczyz Apr 26, 2024
33b6162

Remove InvoiceRequestFields::features


jkczyz Apr 26, 2024

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


46 changes: 18 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,11 +357,6 @@ enum OnionPayload {
 /// This is only here for backwards-compatibility in serialization, in the future it can be
 /// removed, breaking clients running 0.0.106 and earlier.
 _legacy_hop_data: Option<msgs::FinalOnionHopData>,
 /// The context of the payment included by the recipient in a blinded path, or `None` if a
 /// blinded path was not used.
 ///
 /// Used in part to determine the [`events::PaymentPurpose`].
 payment_context: Option<PaymentContext>,
	},
	/// Contains the payer-provided preimage.
	Spontaneous(PaymentPreimage),
Expand DownExpand Up@@ -5346,7 +5341,7 @@ where
 }
 }) => {
 let blinded_failure = routing.blinded_failure();
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret, mut onion_fields) = match routing {
 let (cltv_expiry, onion_payload, payment_data, payment_context, phantom_shared_secret, mut onion_fields) = match routing {
 PendingHTLCRouting::Receive {
 payment_data, payment_metadata, payment_context,
 incoming_cltv_expiry, phantom_shared_secret, custom_tlvs,
Expand All@@ -5355,8 +5350,8 @@ where
 let _legacy_hop_data = Some(payment_data.clone());
 let onion_fields = RecipientOnionFields { payment_secret: Some(payment_data.payment_secret),
 payment_metadata, custom_tlvs };
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data, payment_context },
 Some(payment_data), phantom_shared_secret, onion_fields)
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data },
 Some(payment_data), payment_context, phantom_shared_secret, onion_fields)
 },
 PendingHTLCRouting::ReceiveKeysend {
 payment_data, payment_preimage, payment_metadata,
Expand All@@ -5368,7 +5363,7 @@ where
 custom_tlvs,
 };
 (incoming_cltv_expiry, OnionPayload::Spontaneous(payment_preimage),
 payment_data, None, onion_fields)
 payment_data, None, None, onion_fields)
 },
 _ => {
 panic!("short_channel_id == 0 should imply any pending_forward entries are of type Receive");
Expand DownExpand Up@@ -5530,7 +5525,7 @@ where
 match payment_secrets.entry(payment_hash) {
 hash_map::Entry::Vacant(_) => {
 match claimable_htlc.onion_payload {
 OnionPayload::Invoice { ref payment_context, .. } => {
 OnionPayload::Invoice { .. } => {
 let payment_data = payment_data.unwrap();
 let (payment_preimage, min_final_cltv_expiry_delta) = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
 Ok(result) => result,
Expand All@@ -5548,9 +5543,9 @@ where
 }
 }
 let purpose = events::PaymentPurpose::from_parts(
 payment_preimage.clone(),
 payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 check_total_value!(purpose);
 },
Expand All@@ -5561,13 +5556,10 @@ where
 }
 },
 hash_map::Entry::Occupied(inbound_payment) => {
 let payment_context = match claimable_htlc.onion_payload {
 OnionPayload::Spontaneous(_) => {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 },
 OnionPayload::Invoice { ref payment_context, .. } => payment_context,
 };
 if let OnionPayload::Spontaneous(_) = claimable_htlc.onion_payload {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 }
 let payment_data = payment_data.unwrap();
 if inbound_payment.get().payment_secret != payment_data.payment_secret {
 log_trace!(self.logger, "Failing new HTLC with payment_hash {} as it didn't match our expected payment secret.", &payment_hash);
Expand All@@ -5580,7 +5572,7 @@ where
 let purpose = events::PaymentPurpose::from_parts(
 inbound_payment.get().payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 let payment_claimable_generated = check_total_value!(purpose);
 if payment_claimable_generated {
Expand DownExpand Up@@ -10815,11 +10807,11 @@ impl_writeable_tlv_based!(HTLCPreviousHopData, {

impl Writeable for ClaimableHTLC {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 let (payment_data, keysend_preimage, payment_context) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context } => {
 (_legacy_hop_data.as_ref(), None, payment_context.as_ref())
 let (payment_data, keysend_preimage) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data } => {
 (_legacy_hop_data.as_ref(), None)
 },
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage), None),
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage)),
 };
 write_tlv_fields!(writer, {
 (0, self.prev_hop, required),
Expand All@@ -10831,7 +10823,6 @@ impl Writeable for ClaimableHTLC {
 (6, self.cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, self.counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 Ok(())
	}
Expand All@@ -10849,7 +10840,6 @@ impl Readable for ClaimableHTLC {
 (6, cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 let payment_data: Option<msgs::FinalOnionHopData> = payment_data_opt;
 let value = value_ser.0.unwrap();
Expand All@@ -10870,7 +10860,7 @@ impl Readable for ClaimableHTLC {
 }
 total_msat = Some(payment_data.as_ref().unwrap().total_msat);
 }
 OnionPayload::Invoice { _legacy_hop_data: payment_data, payment_context }
 OnionPayload::Invoice { _legacy_hop_data: payment_data }
 },
 };
 Ok(Self {
Expand DownExpand Up@@ -12106,7 +12096,7 @@ where
 return Err(DecodeError::InvalidValue);
 }
 let purpose = match &htlcs[0].onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context: _ } => {
 OnionPayload::Invoice { _legacy_hop_data } => {
 if let Some(hop_data) = _legacy_hop_data {
 events::PaymentPurpose::Bolt11InvoicePayment {
 payment_preimage: match pending_inbound_payments.get(&payment_hash) {
Expand Down

7 changes: 0 additions & 7 deletions
lightning/src/ln/offers_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ use crate::blinded_path::{BlindedPath, IntroductionNode};
use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext};
use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
use crate::ln::features::InvoiceRequestFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::msgs::{ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
use crate::offers::invoice::Bolt12Invoice;
Expand DownExpand Up@@ -412,8 +411,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -565,8 +562,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -687,8 +682,6 @@ fn pays_for_offer_without_blinded_paths() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand Down

32 changes: 7 additions & 25 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -877,14 +877,12 @@ impl VerifiedInvoiceRequest {
 let InvoiceRequestContents {
 payer_id,
 inner: InvoiceRequestContentsWithoutPayerId {
 payer: _, offer: _, chain: _, amount_msats, features, quantity, payer_note
 payer: _, offer: _, chain: _, amount_msats: _, features: _, quantity, payer_note
 },
 } = &self.inner.contents;

 InvoiceRequestFields {
 payer_id: *payer_id,
 amount_msats: *amount_msats,
 features: features.clone(),
 quantity: *quantity,
 payer_note_truncated: payer_note.clone()
 .map(|mut s| { s.truncate(PAYER_NOTE_LIMIT); UntrustedString(s) }),
Expand DownExpand Up@@ -1126,15 +1124,6 @@ pub struct InvoiceRequestFields {
	/// A possibly transient pubkey used to sign the invoice request.
	pub payer_id: PublicKey,

	/// The amount to pay in msats (i.e., the minimum lightning-payable unit for [`chain`]), which
	/// must be greater than or equal to [`Offer::amount`], converted if necessary.
	///
	/// [`chain`]: InvoiceRequest::chain
	pub amount_msats: Option<u64>,

	/// Features pertaining to requesting an invoice.
	pub features: InvoiceRequestFeatures,

	/// The quantity of the offer's item conforming to [`Offer::is_valid_quantity`].
	pub quantity: Option<u64>,

Expand All@@ -1150,10 +1139,8 @@ impl Writeable for InvoiceRequestFields {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 write_tlv_fields!(writer, {
 (0, self.payer_id, required),
 (2, self.amount_msats.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, WithoutLength(&self.features), required),
 (6, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (8, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 (2, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 });
 Ok(())
	}
Expand All@@ -1163,15 +1150,13 @@ impl Readable for InvoiceRequestFields {
	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payer_id, required),
 (2, amount_msats, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
 (6, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (8, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 (2, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 });
 let features = features.unwrap_or(InvoiceRequestFeatures::empty());

 Ok(InvoiceRequestFields {
 payer_id: payer_id.0.unwrap(), amount_msats, features, quantity,
 payer_id: payer_id.0.unwrap(),
 quantity,
 payer_note_truncated: payer_note_truncated.map(|s| UntrustedString(s)),
 })
	}
Expand DownExpand Up@@ -2264,7 +2249,6 @@ mod tests {

 let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
 .chain(Network::Testnet).unwrap()
 .amount_msats(1001).unwrap()
 .quantity(1).unwrap()
 .payer_note("0".repeat(PAYER_NOTE_LIMIT * 2))
 .build().unwrap()
Expand All@@ -2277,8 +2261,6 @@ mod tests {
 fields,
 InvoiceRequestFields {
 payer_id: payer_pubkey(),
 amount_msats: Some(1001),
 features: InvoiceRequestFeatures::empty(),
 quantity: Some(1),
 payer_note_truncated: Some(UntrustedString("0".repeat(PAYER_NOTE_LIMIT))),
 }
Expand Down

, '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" + '
Follow-ups to #2970 by jkczyz · Pull Request #3028 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups to #2970#3028

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

from

Apr 29, 2024
 Merged


Follow-ups to #2970
#3028
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d690072

Remove unnecessary PaymentPreimage clone


jkczyz Apr 22, 2024
8e562be

Remove PaymentContext from OnionPayload


jkczyz Apr 26, 2024
7b86442

Remove InvoiceRequestFields::amount_msats


jkczyz Apr 26, 2024
33b6162

Remove InvoiceRequestFields::features


jkczyz Apr 26, 2024

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


46 changes: 18 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,11 +357,6 @@ enum OnionPayload {
 /// This is only here for backwards-compatibility in serialization, in the future it can be
 /// removed, breaking clients running 0.0.106 and earlier.
 _legacy_hop_data: Option<msgs::FinalOnionHopData>,
 /// The context of the payment included by the recipient in a blinded path, or `None` if a
 /// blinded path was not used.
 ///
 /// Used in part to determine the [`events::PaymentPurpose`].
 payment_context: Option<PaymentContext>,
	},
	/// Contains the payer-provided preimage.
	Spontaneous(PaymentPreimage),
Expand DownExpand Up@@ -5346,7 +5341,7 @@ where
 }
 }) => {
 let blinded_failure = routing.blinded_failure();
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret, mut onion_fields) = match routing {
 let (cltv_expiry, onion_payload, payment_data, payment_context, phantom_shared_secret, mut onion_fields) = match routing {
 PendingHTLCRouting::Receive {
 payment_data, payment_metadata, payment_context,
 incoming_cltv_expiry, phantom_shared_secret, custom_tlvs,
Expand All@@ -5355,8 +5350,8 @@ where
 let _legacy_hop_data = Some(payment_data.clone());
 let onion_fields = RecipientOnionFields { payment_secret: Some(payment_data.payment_secret),
 payment_metadata, custom_tlvs };
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data, payment_context },
 Some(payment_data), phantom_shared_secret, onion_fields)
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data },
 Some(payment_data), payment_context, phantom_shared_secret, onion_fields)
 },
 PendingHTLCRouting::ReceiveKeysend {
 payment_data, payment_preimage, payment_metadata,
Expand All@@ -5368,7 +5363,7 @@ where
 custom_tlvs,
 };
 (incoming_cltv_expiry, OnionPayload::Spontaneous(payment_preimage),
 payment_data, None, onion_fields)
 payment_data, None, None, onion_fields)
 },
 _ => {
 panic!("short_channel_id == 0 should imply any pending_forward entries are of type Receive");
Expand DownExpand Up@@ -5530,7 +5525,7 @@ where
 match payment_secrets.entry(payment_hash) {
 hash_map::Entry::Vacant(_) => {
 match claimable_htlc.onion_payload {
 OnionPayload::Invoice { ref payment_context, .. } => {
 OnionPayload::Invoice { .. } => {
 let payment_data = payment_data.unwrap();
 let (payment_preimage, min_final_cltv_expiry_delta) = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
 Ok(result) => result,
Expand All@@ -5548,9 +5543,9 @@ where
 }
 }
 let purpose = events::PaymentPurpose::from_parts(
 payment_preimage.clone(),
 payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 check_total_value!(purpose);
 },
Expand All@@ -5561,13 +5556,10 @@ where
 }
 },
 hash_map::Entry::Occupied(inbound_payment) => {
 let payment_context = match claimable_htlc.onion_payload {
 OnionPayload::Spontaneous(_) => {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 },
 OnionPayload::Invoice { ref payment_context, .. } => payment_context,
 };
 if let OnionPayload::Spontaneous(_) = claimable_htlc.onion_payload {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 }
 let payment_data = payment_data.unwrap();
 if inbound_payment.get().payment_secret != payment_data.payment_secret {
 log_trace!(self.logger, "Failing new HTLC with payment_hash {} as it didn't match our expected payment secret.", &payment_hash);
Expand All@@ -5580,7 +5572,7 @@ where
 let purpose = events::PaymentPurpose::from_parts(
 inbound_payment.get().payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 let payment_claimable_generated = check_total_value!(purpose);
 if payment_claimable_generated {
Expand DownExpand Up@@ -10815,11 +10807,11 @@ impl_writeable_tlv_based!(HTLCPreviousHopData, {

impl Writeable for ClaimableHTLC {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 let (payment_data, keysend_preimage, payment_context) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context } => {
 (_legacy_hop_data.as_ref(), None, payment_context.as_ref())
 let (payment_data, keysend_preimage) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data } => {
 (_legacy_hop_data.as_ref(), None)
 },
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage), None),
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage)),
 };
 write_tlv_fields!(writer, {
 (0, self.prev_hop, required),
Expand All@@ -10831,7 +10823,6 @@ impl Writeable for ClaimableHTLC {
 (6, self.cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, self.counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 Ok(())
	}
Expand All@@ -10849,7 +10840,6 @@ impl Readable for ClaimableHTLC {
 (6, cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 let payment_data: Option<msgs::FinalOnionHopData> = payment_data_opt;
 let value = value_ser.0.unwrap();
Expand All@@ -10870,7 +10860,7 @@ impl Readable for ClaimableHTLC {
 }
 total_msat = Some(payment_data.as_ref().unwrap().total_msat);
 }
 OnionPayload::Invoice { _legacy_hop_data: payment_data, payment_context }
 OnionPayload::Invoice { _legacy_hop_data: payment_data }
 },
 };
 Ok(Self {
Expand DownExpand Up@@ -12106,7 +12096,7 @@ where
 return Err(DecodeError::InvalidValue);
 }
 let purpose = match &htlcs[0].onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context: _ } => {
 OnionPayload::Invoice { _legacy_hop_data } => {
 if let Some(hop_data) = _legacy_hop_data {
 events::PaymentPurpose::Bolt11InvoicePayment {
 payment_preimage: match pending_inbound_payments.get(&payment_hash) {
Expand Down

7 changes: 0 additions & 7 deletions
lightning/src/ln/offers_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ use crate::blinded_path::{BlindedPath, IntroductionNode};
use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext};
use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
use crate::ln::features::InvoiceRequestFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::msgs::{ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
use crate::offers::invoice::Bolt12Invoice;
Expand DownExpand Up@@ -412,8 +411,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -565,8 +562,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -687,8 +682,6 @@ fn pays_for_offer_without_blinded_paths() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand Down

32 changes: 7 additions & 25 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -877,14 +877,12 @@ impl VerifiedInvoiceRequest {
 let InvoiceRequestContents {
 payer_id,
 inner: InvoiceRequestContentsWithoutPayerId {
 payer: _, offer: _, chain: _, amount_msats, features, quantity, payer_note
 payer: _, offer: _, chain: _, amount_msats: _, features: _, quantity, payer_note
 },
 } = &self.inner.contents;

 InvoiceRequestFields {
 payer_id: *payer_id,
 amount_msats: *amount_msats,
 features: features.clone(),
 quantity: *quantity,
 payer_note_truncated: payer_note.clone()
 .map(|mut s| { s.truncate(PAYER_NOTE_LIMIT); UntrustedString(s) }),
Expand DownExpand Up@@ -1126,15 +1124,6 @@ pub struct InvoiceRequestFields {
	/// A possibly transient pubkey used to sign the invoice request.
	pub payer_id: PublicKey,

	/// The amount to pay in msats (i.e., the minimum lightning-payable unit for [`chain`]), which
	/// must be greater than or equal to [`Offer::amount`], converted if necessary.
	///
	/// [`chain`]: InvoiceRequest::chain
	pub amount_msats: Option<u64>,

	/// Features pertaining to requesting an invoice.
	pub features: InvoiceRequestFeatures,

	/// The quantity of the offer's item conforming to [`Offer::is_valid_quantity`].
	pub quantity: Option<u64>,

Expand All@@ -1150,10 +1139,8 @@ impl Writeable for InvoiceRequestFields {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 write_tlv_fields!(writer, {
 (0, self.payer_id, required),
 (2, self.amount_msats.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, WithoutLength(&self.features), required),
 (6, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (8, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 (2, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 });
 Ok(())
	}
Expand All@@ -1163,15 +1150,13 @@ impl Readable for InvoiceRequestFields {
	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payer_id, required),
 (2, amount_msats, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
 (6, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (8, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 (2, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 });
 let features = features.unwrap_or(InvoiceRequestFeatures::empty());

 Ok(InvoiceRequestFields {
 payer_id: payer_id.0.unwrap(), amount_msats, features, quantity,
 payer_id: payer_id.0.unwrap(),
 quantity,
 payer_note_truncated: payer_note_truncated.map(|s| UntrustedString(s)),
 })
	}
Expand DownExpand Up@@ -2264,7 +2249,6 @@ mod tests {

 let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
 .chain(Network::Testnet).unwrap()
 .amount_msats(1001).unwrap()
 .quantity(1).unwrap()
 .payer_note("0".repeat(PAYER_NOTE_LIMIT * 2))
 .build().unwrap()
Expand All@@ -2277,8 +2261,6 @@ mod tests {
 fields,
 InvoiceRequestFields {
 payer_id: payer_pubkey(),
 amount_msats: Some(1001),
 features: InvoiceRequestFeatures::empty(),
 quantity: Some(1),
 payer_note_truncated: Some(UntrustedString("0".repeat(PAYER_NOTE_LIMIT))),
 }
Expand Down

, '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('^' + ".*" + '
Follow-ups to #2970 by jkczyz · Pull Request #3028 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups to #2970#3028

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

from

Apr 29, 2024
 Merged


Follow-ups to #2970
#3028
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d690072

Remove unnecessary PaymentPreimage clone


jkczyz Apr 22, 2024
8e562be

Remove PaymentContext from OnionPayload


jkczyz Apr 26, 2024
7b86442

Remove InvoiceRequestFields::amount_msats


jkczyz Apr 26, 2024
33b6162

Remove InvoiceRequestFields::features


jkczyz Apr 26, 2024

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


46 changes: 18 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,11 +357,6 @@ enum OnionPayload {
 /// This is only here for backwards-compatibility in serialization, in the future it can be
 /// removed, breaking clients running 0.0.106 and earlier.
 _legacy_hop_data: Option<msgs::FinalOnionHopData>,
 /// The context of the payment included by the recipient in a blinded path, or `None` if a
 /// blinded path was not used.
 ///
 /// Used in part to determine the [`events::PaymentPurpose`].
 payment_context: Option<PaymentContext>,
	},
	/// Contains the payer-provided preimage.
	Spontaneous(PaymentPreimage),
Expand DownExpand Up@@ -5346,7 +5341,7 @@ where
 }
 }) => {
 let blinded_failure = routing.blinded_failure();
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret, mut onion_fields) = match routing {
 let (cltv_expiry, onion_payload, payment_data, payment_context, phantom_shared_secret, mut onion_fields) = match routing {
 PendingHTLCRouting::Receive {
 payment_data, payment_metadata, payment_context,
 incoming_cltv_expiry, phantom_shared_secret, custom_tlvs,
Expand All@@ -5355,8 +5350,8 @@ where
 let _legacy_hop_data = Some(payment_data.clone());
 let onion_fields = RecipientOnionFields { payment_secret: Some(payment_data.payment_secret),
 payment_metadata, custom_tlvs };
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data, payment_context },
 Some(payment_data), phantom_shared_secret, onion_fields)
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data },
 Some(payment_data), payment_context, phantom_shared_secret, onion_fields)
 },
 PendingHTLCRouting::ReceiveKeysend {
 payment_data, payment_preimage, payment_metadata,
Expand All@@ -5368,7 +5363,7 @@ where
 custom_tlvs,
 };
 (incoming_cltv_expiry, OnionPayload::Spontaneous(payment_preimage),
 payment_data, None, onion_fields)
 payment_data, None, None, onion_fields)
 },
 _ => {
 panic!("short_channel_id == 0 should imply any pending_forward entries are of type Receive");
Expand DownExpand Up@@ -5530,7 +5525,7 @@ where
 match payment_secrets.entry(payment_hash) {
 hash_map::Entry::Vacant(_) => {
 match claimable_htlc.onion_payload {
 OnionPayload::Invoice { ref payment_context, .. } => {
 OnionPayload::Invoice { .. } => {
 let payment_data = payment_data.unwrap();
 let (payment_preimage, min_final_cltv_expiry_delta) = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
 Ok(result) => result,
Expand All@@ -5548,9 +5543,9 @@ where
 }
 }
 let purpose = events::PaymentPurpose::from_parts(
 payment_preimage.clone(),
 payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 check_total_value!(purpose);
 },
Expand All@@ -5561,13 +5556,10 @@ where
 }
 },
 hash_map::Entry::Occupied(inbound_payment) => {
 let payment_context = match claimable_htlc.onion_payload {
 OnionPayload::Spontaneous(_) => {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 },
 OnionPayload::Invoice { ref payment_context, .. } => payment_context,
 };
 if let OnionPayload::Spontaneous(_) = claimable_htlc.onion_payload {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 }
 let payment_data = payment_data.unwrap();
 if inbound_payment.get().payment_secret != payment_data.payment_secret {
 log_trace!(self.logger, "Failing new HTLC with payment_hash {} as it didn't match our expected payment secret.", &payment_hash);
Expand All@@ -5580,7 +5572,7 @@ where
 let purpose = events::PaymentPurpose::from_parts(
 inbound_payment.get().payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 let payment_claimable_generated = check_total_value!(purpose);
 if payment_claimable_generated {
Expand DownExpand Up@@ -10815,11 +10807,11 @@ impl_writeable_tlv_based!(HTLCPreviousHopData, {

impl Writeable for ClaimableHTLC {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 let (payment_data, keysend_preimage, payment_context) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context } => {
 (_legacy_hop_data.as_ref(), None, payment_context.as_ref())
 let (payment_data, keysend_preimage) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data } => {
 (_legacy_hop_data.as_ref(), None)
 },
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage), None),
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage)),
 };
 write_tlv_fields!(writer, {
 (0, self.prev_hop, required),
Expand All@@ -10831,7 +10823,6 @@ impl Writeable for ClaimableHTLC {
 (6, self.cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, self.counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 Ok(())
	}
Expand All@@ -10849,7 +10840,6 @@ impl Readable for ClaimableHTLC {
 (6, cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 let payment_data: Option<msgs::FinalOnionHopData> = payment_data_opt;
 let value = value_ser.0.unwrap();
Expand All@@ -10870,7 +10860,7 @@ impl Readable for ClaimableHTLC {
 }
 total_msat = Some(payment_data.as_ref().unwrap().total_msat);
 }
 OnionPayload::Invoice { _legacy_hop_data: payment_data, payment_context }
 OnionPayload::Invoice { _legacy_hop_data: payment_data }
 },
 };
 Ok(Self {
Expand DownExpand Up@@ -12106,7 +12096,7 @@ where
 return Err(DecodeError::InvalidValue);
 }
 let purpose = match &htlcs[0].onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context: _ } => {
 OnionPayload::Invoice { _legacy_hop_data } => {
 if let Some(hop_data) = _legacy_hop_data {
 events::PaymentPurpose::Bolt11InvoicePayment {
 payment_preimage: match pending_inbound_payments.get(&payment_hash) {
Expand Down

7 changes: 0 additions & 7 deletions
lightning/src/ln/offers_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ use crate::blinded_path::{BlindedPath, IntroductionNode};
use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext};
use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
use crate::ln::features::InvoiceRequestFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::msgs::{ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
use crate::offers::invoice::Bolt12Invoice;
Expand DownExpand Up@@ -412,8 +411,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -565,8 +562,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -687,8 +682,6 @@ fn pays_for_offer_without_blinded_paths() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand Down

32 changes: 7 additions & 25 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -877,14 +877,12 @@ impl VerifiedInvoiceRequest {
 let InvoiceRequestContents {
 payer_id,
 inner: InvoiceRequestContentsWithoutPayerId {
 payer: _, offer: _, chain: _, amount_msats, features, quantity, payer_note
 payer: _, offer: _, chain: _, amount_msats: _, features: _, quantity, payer_note
 },
 } = &self.inner.contents;

 InvoiceRequestFields {
 payer_id: *payer_id,
 amount_msats: *amount_msats,
 features: features.clone(),
 quantity: *quantity,
 payer_note_truncated: payer_note.clone()
 .map(|mut s| { s.truncate(PAYER_NOTE_LIMIT); UntrustedString(s) }),
Expand DownExpand Up@@ -1126,15 +1124,6 @@ pub struct InvoiceRequestFields {
	/// A possibly transient pubkey used to sign the invoice request.
	pub payer_id: PublicKey,

	/// The amount to pay in msats (i.e., the minimum lightning-payable unit for [`chain`]), which
	/// must be greater than or equal to [`Offer::amount`], converted if necessary.
	///
	/// [`chain`]: InvoiceRequest::chain
	pub amount_msats: Option<u64>,

	/// Features pertaining to requesting an invoice.
	pub features: InvoiceRequestFeatures,

	/// The quantity of the offer's item conforming to [`Offer::is_valid_quantity`].
	pub quantity: Option<u64>,

Expand All@@ -1150,10 +1139,8 @@ impl Writeable for InvoiceRequestFields {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 write_tlv_fields!(writer, {
 (0, self.payer_id, required),
 (2, self.amount_msats.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, WithoutLength(&self.features), required),
 (6, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (8, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 (2, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 });
 Ok(())
	}
Expand All@@ -1163,15 +1150,13 @@ impl Readable for InvoiceRequestFields {
	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payer_id, required),
 (2, amount_msats, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
 (6, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (8, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 (2, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 });
 let features = features.unwrap_or(InvoiceRequestFeatures::empty());

 Ok(InvoiceRequestFields {
 payer_id: payer_id.0.unwrap(), amount_msats, features, quantity,
 payer_id: payer_id.0.unwrap(),
 quantity,
 payer_note_truncated: payer_note_truncated.map(|s| UntrustedString(s)),
 })
	}
Expand DownExpand Up@@ -2264,7 +2249,6 @@ mod tests {

 let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
 .chain(Network::Testnet).unwrap()
 .amount_msats(1001).unwrap()
 .quantity(1).unwrap()
 .payer_note("0".repeat(PAYER_NOTE_LIMIT * 2))
 .build().unwrap()
Expand All@@ -2277,8 +2261,6 @@ mod tests {
 fields,
 InvoiceRequestFields {
 payer_id: payer_pubkey(),
 amount_msats: Some(1001),
 features: InvoiceRequestFeatures::empty(),
 quantity: Some(1),
 payer_note_truncated: Some(UntrustedString("0".repeat(PAYER_NOTE_LIMIT))),
 }
Expand Down

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

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

from

Apr 29, 2024
 Merged


Follow-ups to #2970
#3028
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d690072

Remove unnecessary PaymentPreimage clone


jkczyz Apr 22, 2024
8e562be

Remove PaymentContext from OnionPayload


jkczyz Apr 26, 2024
7b86442

Remove InvoiceRequestFields::amount_msats


jkczyz Apr 26, 2024
33b6162

Remove InvoiceRequestFields::features


jkczyz Apr 26, 2024

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


46 changes: 18 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,11 +357,6 @@ enum OnionPayload {
 /// This is only here for backwards-compatibility in serialization, in the future it can be
 /// removed, breaking clients running 0.0.106 and earlier.
 _legacy_hop_data: Option<msgs::FinalOnionHopData>,
 /// The context of the payment included by the recipient in a blinded path, or `None` if a
 /// blinded path was not used.
 ///
 /// Used in part to determine the [`events::PaymentPurpose`].
 payment_context: Option<PaymentContext>,
	},
	/// Contains the payer-provided preimage.
	Spontaneous(PaymentPreimage),
Expand DownExpand Up@@ -5346,7 +5341,7 @@ where
 }
 }) => {
 let blinded_failure = routing.blinded_failure();
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret, mut onion_fields) = match routing {
 let (cltv_expiry, onion_payload, payment_data, payment_context, phantom_shared_secret, mut onion_fields) = match routing {
 PendingHTLCRouting::Receive {
 payment_data, payment_metadata, payment_context,
 incoming_cltv_expiry, phantom_shared_secret, custom_tlvs,
Expand All@@ -5355,8 +5350,8 @@ where
 let _legacy_hop_data = Some(payment_data.clone());
 let onion_fields = RecipientOnionFields { payment_secret: Some(payment_data.payment_secret),
 payment_metadata, custom_tlvs };
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data, payment_context },
 Some(payment_data), phantom_shared_secret, onion_fields)
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data },
 Some(payment_data), payment_context, phantom_shared_secret, onion_fields)
 },
 PendingHTLCRouting::ReceiveKeysend {
 payment_data, payment_preimage, payment_metadata,
Expand All@@ -5368,7 +5363,7 @@ where
 custom_tlvs,
 };
 (incoming_cltv_expiry, OnionPayload::Spontaneous(payment_preimage),
 payment_data, None, onion_fields)
 payment_data, None, None, onion_fields)
 },
 _ => {
 panic!("short_channel_id == 0 should imply any pending_forward entries are of type Receive");
Expand DownExpand Up@@ -5530,7 +5525,7 @@ where
 match payment_secrets.entry(payment_hash) {
 hash_map::Entry::Vacant(_) => {
 match claimable_htlc.onion_payload {
 OnionPayload::Invoice { ref payment_context, .. } => {
 OnionPayload::Invoice { .. } => {
 let payment_data = payment_data.unwrap();
 let (payment_preimage, min_final_cltv_expiry_delta) = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
 Ok(result) => result,
Expand All@@ -5548,9 +5543,9 @@ where
 }
 }
 let purpose = events::PaymentPurpose::from_parts(
 payment_preimage.clone(),
 payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 check_total_value!(purpose);
 },
Expand All@@ -5561,13 +5556,10 @@ where
 }
 },
 hash_map::Entry::Occupied(inbound_payment) => {
 let payment_context = match claimable_htlc.onion_payload {
 OnionPayload::Spontaneous(_) => {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 },
 OnionPayload::Invoice { ref payment_context, .. } => payment_context,
 };
 if let OnionPayload::Spontaneous(_) = claimable_htlc.onion_payload {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 }
 let payment_data = payment_data.unwrap();
 if inbound_payment.get().payment_secret != payment_data.payment_secret {
 log_trace!(self.logger, "Failing new HTLC with payment_hash {} as it didn't match our expected payment secret.", &payment_hash);
Expand All@@ -5580,7 +5572,7 @@ where
 let purpose = events::PaymentPurpose::from_parts(
 inbound_payment.get().payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 let payment_claimable_generated = check_total_value!(purpose);
 if payment_claimable_generated {
Expand DownExpand Up@@ -10815,11 +10807,11 @@ impl_writeable_tlv_based!(HTLCPreviousHopData, {

impl Writeable for ClaimableHTLC {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 let (payment_data, keysend_preimage, payment_context) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context } => {
 (_legacy_hop_data.as_ref(), None, payment_context.as_ref())
 let (payment_data, keysend_preimage) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data } => {
 (_legacy_hop_data.as_ref(), None)
 },
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage), None),
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage)),
 };
 write_tlv_fields!(writer, {
 (0, self.prev_hop, required),
Expand All@@ -10831,7 +10823,6 @@ impl Writeable for ClaimableHTLC {
 (6, self.cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, self.counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 Ok(())
	}
Expand All@@ -10849,7 +10840,6 @@ impl Readable for ClaimableHTLC {
 (6, cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 let payment_data: Option<msgs::FinalOnionHopData> = payment_data_opt;
 let value = value_ser.0.unwrap();
Expand All@@ -10870,7 +10860,7 @@ impl Readable for ClaimableHTLC {
 }
 total_msat = Some(payment_data.as_ref().unwrap().total_msat);
 }
 OnionPayload::Invoice { _legacy_hop_data: payment_data, payment_context }
 OnionPayload::Invoice { _legacy_hop_data: payment_data }
 },
 };
 Ok(Self {
Expand DownExpand Up@@ -12106,7 +12096,7 @@ where
 return Err(DecodeError::InvalidValue);
 }
 let purpose = match &htlcs[0].onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context: _ } => {
 OnionPayload::Invoice { _legacy_hop_data } => {
 if let Some(hop_data) = _legacy_hop_data {
 events::PaymentPurpose::Bolt11InvoicePayment {
 payment_preimage: match pending_inbound_payments.get(&payment_hash) {
Expand Down

7 changes: 0 additions & 7 deletions
lightning/src/ln/offers_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ use crate::blinded_path::{BlindedPath, IntroductionNode};
use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext};
use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
use crate::ln::features::InvoiceRequestFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::msgs::{ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
use crate::offers::invoice::Bolt12Invoice;
Expand DownExpand Up@@ -412,8 +411,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -565,8 +562,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -687,8 +682,6 @@ fn pays_for_offer_without_blinded_paths() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand Down

32 changes: 7 additions & 25 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -877,14 +877,12 @@ impl VerifiedInvoiceRequest {
 let InvoiceRequestContents {
 payer_id,
 inner: InvoiceRequestContentsWithoutPayerId {
 payer: _, offer: _, chain: _, amount_msats, features, quantity, payer_note
 payer: _, offer: _, chain: _, amount_msats: _, features: _, quantity, payer_note
 },
 } = &self.inner.contents;

 InvoiceRequestFields {
 payer_id: *payer_id,
 amount_msats: *amount_msats,
 features: features.clone(),
 quantity: *quantity,
 payer_note_truncated: payer_note.clone()
 .map(|mut s| { s.truncate(PAYER_NOTE_LIMIT); UntrustedString(s) }),
Expand DownExpand Up@@ -1126,15 +1124,6 @@ pub struct InvoiceRequestFields {
	/// A possibly transient pubkey used to sign the invoice request.
	pub payer_id: PublicKey,

	/// The amount to pay in msats (i.e., the minimum lightning-payable unit for [`chain`]), which
	/// must be greater than or equal to [`Offer::amount`], converted if necessary.
	///
	/// [`chain`]: InvoiceRequest::chain
	pub amount_msats: Option<u64>,

	/// Features pertaining to requesting an invoice.
	pub features: InvoiceRequestFeatures,

	/// The quantity of the offer's item conforming to [`Offer::is_valid_quantity`].
	pub quantity: Option<u64>,

Expand All@@ -1150,10 +1139,8 @@ impl Writeable for InvoiceRequestFields {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 write_tlv_fields!(writer, {
 (0, self.payer_id, required),
 (2, self.amount_msats.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, WithoutLength(&self.features), required),
 (6, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (8, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 (2, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 });
 Ok(())
	}
Expand All@@ -1163,15 +1150,13 @@ impl Readable for InvoiceRequestFields {
	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payer_id, required),
 (2, amount_msats, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
 (6, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (8, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 (2, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 });
 let features = features.unwrap_or(InvoiceRequestFeatures::empty());

 Ok(InvoiceRequestFields {
 payer_id: payer_id.0.unwrap(), amount_msats, features, quantity,
 payer_id: payer_id.0.unwrap(),
 quantity,
 payer_note_truncated: payer_note_truncated.map(|s| UntrustedString(s)),
 })
	}
Expand DownExpand Up@@ -2264,7 +2249,6 @@ mod tests {

 let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
 .chain(Network::Testnet).unwrap()
 .amount_msats(1001).unwrap()
 .quantity(1).unwrap()
 .payer_note("0".repeat(PAYER_NOTE_LIMIT * 2))
 .build().unwrap()
Expand All@@ -2277,8 +2261,6 @@ mod tests {
 fields,
 InvoiceRequestFields {
 payer_id: payer_pubkey(),
 amount_msats: Some(1001),
 features: InvoiceRequestFeatures::empty(),
 quantity: Some(1),
 payer_note_truncated: Some(UntrustedString("0".repeat(PAYER_NOTE_LIMIT))),
 }
Expand Down

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

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

from

Apr 29, 2024
 Merged


Follow-ups to #2970
#3028
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d690072

Remove unnecessary PaymentPreimage clone


jkczyz Apr 22, 2024
8e562be

Remove PaymentContext from OnionPayload


jkczyz Apr 26, 2024
7b86442

Remove InvoiceRequestFields::amount_msats


jkczyz Apr 26, 2024
33b6162

Remove InvoiceRequestFields::features


jkczyz Apr 26, 2024

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


46 changes: 18 additions & 28 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,11 +357,6 @@ enum OnionPayload {
 /// This is only here for backwards-compatibility in serialization, in the future it can be
 /// removed, breaking clients running 0.0.106 and earlier.
 _legacy_hop_data: Option<msgs::FinalOnionHopData>,
 /// The context of the payment included by the recipient in a blinded path, or `None` if a
 /// blinded path was not used.
 ///
 /// Used in part to determine the [`events::PaymentPurpose`].
 payment_context: Option<PaymentContext>,
	},
	/// Contains the payer-provided preimage.
	Spontaneous(PaymentPreimage),
Expand DownExpand Up@@ -5346,7 +5341,7 @@ where
 }
 }) => {
 let blinded_failure = routing.blinded_failure();
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret, mut onion_fields) = match routing {
 let (cltv_expiry, onion_payload, payment_data, payment_context, phantom_shared_secret, mut onion_fields) = match routing {
 PendingHTLCRouting::Receive {
 payment_data, payment_metadata, payment_context,
 incoming_cltv_expiry, phantom_shared_secret, custom_tlvs,
Expand All@@ -5355,8 +5350,8 @@ where
 let _legacy_hop_data = Some(payment_data.clone());
 let onion_fields = RecipientOnionFields { payment_secret: Some(payment_data.payment_secret),
 payment_metadata, custom_tlvs };
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data, payment_context },
 Some(payment_data), phantom_shared_secret, onion_fields)
 (incoming_cltv_expiry, OnionPayload::Invoice { _legacy_hop_data },
 Some(payment_data), payment_context, phantom_shared_secret, onion_fields)
 },
 PendingHTLCRouting::ReceiveKeysend {
 payment_data, payment_preimage, payment_metadata,
Expand All@@ -5368,7 +5363,7 @@ where
 custom_tlvs,
 };
 (incoming_cltv_expiry, OnionPayload::Spontaneous(payment_preimage),
 payment_data, None, onion_fields)
 payment_data, None, None, onion_fields)
 },
 _ => {
 panic!("short_channel_id == 0 should imply any pending_forward entries are of type Receive");
Expand DownExpand Up@@ -5530,7 +5525,7 @@ where
 match payment_secrets.entry(payment_hash) {
 hash_map::Entry::Vacant(_) => {
 match claimable_htlc.onion_payload {
 OnionPayload::Invoice { ref payment_context, .. } => {
 OnionPayload::Invoice { .. } => {
 let payment_data = payment_data.unwrap();
 let (payment_preimage, min_final_cltv_expiry_delta) = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
 Ok(result) => result,
Expand All@@ -5548,9 +5543,9 @@ where
 }
 }
 let purpose = events::PaymentPurpose::from_parts(
 payment_preimage.clone(),
 payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 check_total_value!(purpose);
 },
Expand All@@ -5561,13 +5556,10 @@ where
 }
 },
 hash_map::Entry::Occupied(inbound_payment) => {
 let payment_context = match claimable_htlc.onion_payload {
 OnionPayload::Spontaneous(_) => {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 },
 OnionPayload::Invoice { ref payment_context, .. } => payment_context,
 };
 if let OnionPayload::Spontaneous(_) = claimable_htlc.onion_payload {
 log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} because we already have an inbound payment with the same payment hash", &payment_hash);
 fail_htlc!(claimable_htlc, payment_hash);
 }
 let payment_data = payment_data.unwrap();
 if inbound_payment.get().payment_secret != payment_data.payment_secret {
 log_trace!(self.logger, "Failing new HTLC with payment_hash {} as it didn't match our expected payment secret.", &payment_hash);
Expand All@@ -5580,7 +5572,7 @@ where
 let purpose = events::PaymentPurpose::from_parts(
 inbound_payment.get().payment_preimage,
 payment_data.payment_secret,
 payment_context.clone(),
 payment_context,
 );
 let payment_claimable_generated = check_total_value!(purpose);
 if payment_claimable_generated {
Expand DownExpand Up@@ -10815,11 +10807,11 @@ impl_writeable_tlv_based!(HTLCPreviousHopData, {

impl Writeable for ClaimableHTLC {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 let (payment_data, keysend_preimage, payment_context) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context } => {
 (_legacy_hop_data.as_ref(), None, payment_context.as_ref())
 let (payment_data, keysend_preimage) = match &self.onion_payload {
 OnionPayload::Invoice { _legacy_hop_data } => {
 (_legacy_hop_data.as_ref(), None)
 },
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage), None),
 OnionPayload::Spontaneous(preimage) => (None, Some(preimage)),
 };
 write_tlv_fields!(writer, {
 (0, self.prev_hop, required),
Expand All@@ -10831,7 +10823,6 @@ impl Writeable for ClaimableHTLC {
 (6, self.cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, self.counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 Ok(())
	}
Expand All@@ -10849,7 +10840,6 @@ impl Readable for ClaimableHTLC {
 (6, cltv_expiry, required),
 (8, keysend_preimage, option),
 (10, counterparty_skimmed_fee_msat, option),
 (11, payment_context, option),
 });
 let payment_data: Option<msgs::FinalOnionHopData> = payment_data_opt;
 let value = value_ser.0.unwrap();
Expand All@@ -10870,7 +10860,7 @@ impl Readable for ClaimableHTLC {
 }
 total_msat = Some(payment_data.as_ref().unwrap().total_msat);
 }
 OnionPayload::Invoice { _legacy_hop_data: payment_data, payment_context }
 OnionPayload::Invoice { _legacy_hop_data: payment_data }
 },
 };
 Ok(Self {
Expand DownExpand Up@@ -12106,7 +12096,7 @@ where
 return Err(DecodeError::InvalidValue);
 }
 let purpose = match &htlcs[0].onion_payload {
 OnionPayload::Invoice { _legacy_hop_data, payment_context: _ } => {
 OnionPayload::Invoice { _legacy_hop_data } => {
 if let Some(hop_data) = _legacy_hop_data {
 events::PaymentPurpose::Bolt11InvoicePayment {
 payment_preimage: match pending_inbound_payments.get(&payment_hash) {
Expand Down

7 changes: 0 additions & 7 deletions
lightning/src/ln/offers_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ use crate::blinded_path::{BlindedPath, IntroductionNode};
use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext};
use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
use crate::ln::features::InvoiceRequestFeatures;
use crate::ln::functional_test_utils::*;
use crate::ln::msgs::{ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
use crate::offers::invoice::Bolt12Invoice;
Expand DownExpand Up@@ -412,8 +411,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -565,8 +562,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand DownExpand Up@@ -687,8 +682,6 @@ fn pays_for_offer_without_blinded_paths() {
 offer_id: offer.id(),
 invoice_request: InvoiceRequestFields {
 payer_id: invoice_request.payer_id(),
 amount_msats: None,
 features: InvoiceRequestFeatures::empty(),
 quantity: None,
 payer_note_truncated: None,
 },
Expand Down

32 changes: 7 additions & 25 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -877,14 +877,12 @@ impl VerifiedInvoiceRequest {
 let InvoiceRequestContents {
 payer_id,
 inner: InvoiceRequestContentsWithoutPayerId {
 payer: _, offer: _, chain: _, amount_msats, features, quantity, payer_note
 payer: _, offer: _, chain: _, amount_msats: _, features: _, quantity, payer_note
 },
 } = &self.inner.contents;

 InvoiceRequestFields {
 payer_id: *payer_id,
 amount_msats: *amount_msats,
 features: features.clone(),
 quantity: *quantity,
 payer_note_truncated: payer_note.clone()
 .map(|mut s| { s.truncate(PAYER_NOTE_LIMIT); UntrustedString(s) }),
Expand DownExpand Up@@ -1126,15 +1124,6 @@ pub struct InvoiceRequestFields {
	/// A possibly transient pubkey used to sign the invoice request.
	pub payer_id: PublicKey,

	/// The amount to pay in msats (i.e., the minimum lightning-payable unit for [`chain`]), which
	/// must be greater than or equal to [`Offer::amount`], converted if necessary.
	///
	/// [`chain`]: InvoiceRequest::chain
	pub amount_msats: Option<u64>,

	/// Features pertaining to requesting an invoice.
	pub features: InvoiceRequestFeatures,

	/// The quantity of the offer's item conforming to [`Offer::is_valid_quantity`].
	pub quantity: Option<u64>,

Expand All@@ -1150,10 +1139,8 @@ impl Writeable for InvoiceRequestFields {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 write_tlv_fields!(writer, {
 (0, self.payer_id, required),
 (2, self.amount_msats.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, WithoutLength(&self.features), required),
 (6, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (8, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 (2, self.quantity.map(|v| HighZeroBytesDroppedBigSize(v)), option),
 (4, self.payer_note_truncated.as_ref().map(|s| WithoutLength(&s.0)), option),
 });
 Ok(())
	}
Expand All@@ -1163,15 +1150,13 @@ impl Readable for InvoiceRequestFields {
	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payer_id, required),
 (2, amount_msats, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
 (6, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (8, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 (2, quantity, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 (4, payer_note_truncated, (option, encoding: (String, WithoutLength))),
 });
 let features = features.unwrap_or(InvoiceRequestFeatures::empty());

 Ok(InvoiceRequestFields {
 payer_id: payer_id.0.unwrap(), amount_msats, features, quantity,
 payer_id: payer_id.0.unwrap(),
 quantity,
 payer_note_truncated: payer_note_truncated.map(|s| UntrustedString(s)),
 })
	}
Expand DownExpand Up@@ -2264,7 +2249,6 @@ mod tests {

 let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
 .chain(Network::Testnet).unwrap()
 .amount_msats(1001).unwrap()
 .quantity(1).unwrap()
 .payer_note("0".repeat(PAYER_NOTE_LIMIT * 2))
 .build().unwrap()
Expand All@@ -2277,8 +2261,6 @@ mod tests {
 fields,
 InvoiceRequestFields {
 payer_id: payer_pubkey(),
 amount_msats: Some(1001),
 features: InvoiceRequestFeatures::empty(),
 quantity: Some(1),
 payer_note_truncated: Some(UntrustedString("0".repeat(PAYER_NOTE_LIMIT))),
 }
Expand Down