Follow-ups to #3139 #3202
Merged
Follow-ups to #3139 #3202
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jkczyz
force-pushed
the
2024-07-blinded-path-auth-follow-up
branch
from
457047b
to
9f4ae79
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3202 +/- ##
==========================================
- Coverage 89.75% 89.74% -0.02%
==========================================
Files 122 122
Lines 101791 101862 +71
Branches 101791 101862 +71
==========================================
+ Hits 91366 91413 +47
- Misses 7744 7758 +14
- Partials 2681 2691 +10 ☔ View full report in Codecov by Sentry. |
jkczyz
force-pushed
the
2024-07-blinded-path-auth-follow-up
branch
from
9f4ae79
to
9b18b7e
Compare
jkczyz
force-pushed
the
2024-07-blinded-path-auth-follow-up
branch
from
9b18b7e
to
4248827
Compare
Use a Result return type instead of a bool when verifying a Bolt12Invoice. This way ignoring the result will produce a compiler warning.
In an upcoming commit, the iv_bytes used in MetadataMaterial will vary depending on when whether a blinded path is included in the corresponding message. Delay adding into MetadataMaterial::hmac as otherwise the HmacEngine would need to be re-initialized using an ExpandedKey, which won't be readily available.
Best practice is to use different IV bytes for different contexts. Update Offer and Refund metadata computation to use different IV bytes when the metadata is included in a blinded path. For invoice requests, the metatdata will always be in the blinded path, so it remains the same.
When creating a Bolt12Invoice in fuzz tests, use BlindedPath::new_for_payment instead of BlindedPath::new_for_message. This way PaymentContext is used instead of MessageContext, as is more realistic though should not affect the test. This allows us to remove OffersContext::Unknown.
By including the payment hash from the invoice in an onion message's reply path, it can be used when logging errors as additional context.
Instead of using OffersContext::Unknown for the Bolt12Invoice reply path use OffersContext::InboundPayment to include the payment hash. OffersContext::Unknown will be removed in another commit.
Now that ChannelManager uses a known OffersContext when creating blinded paths, OffersContext::Unknown is no longer needed. Remove it and update OffersMessageHandler to us an Option, which is more idiomatic for signifying whether a message was delivered with or without an OffersContext.
jkczyz
force-pushed
the
2024-07-blinded-path-auth-follow-up
branch
from
4248827
to
8834336
Compare
|
Rebased since the follow-on PR needs some changes from main. |
TheBlueMatt
approved these changes
Aug 5, 2024
There was a problem hiding this comment.
LGTM, only diff sinec @valentinewallace's LGTM is a squash, looks like:
$ git range-diff 825bda03c9354d79e1095501e22c24f13be4c7c6...9b18b7e26b902d67716f2904f3245c7b91e8c08f 50d21b7c08bb600127223d86d391943dbafdacf9...88343366ca04085904ee0ac41d5a10a86d933a35
1: c1f62e598 = 1: 353b45f70 Bolt12Invoice::is_for_refund_without_paths tests
2: c2ca3ba61 = 2: 4a69f58ff Result from Bolt12Invoice::verify_using_payer_data
3: 6eee053c6 = 3: 8849efe0d Delay adding iv_bytes to MetadataMaterial::hmac
4: 1cb22c38a = 4: 293543b7c Use different iv_bytes for blinded path metadata
5: 535fa4741 ! 5: 3e832cbb7 Use BlindedPath::new_for_payment in fuzz tests
@@ fuzz/src/invoice_request_deser.rs
use bitcoin::secp256k1::{self, Keypair, Parity, PublicKey, Secp256k1, SecretKey};
use core::convert::TryFrom;
-use lightning::blinded_path::message::{ForwardNode, MessageContext, OffersContext};
-+use lightning::blinded_path::payment::{Bolt12OfferContext, ForwardNode, ForwardTlvs, PaymentConstraints, PaymentContext, PaymentRelay, ReceiveTlvs};
++use lightning::blinded_path::payment::{
++ Bolt12OfferContext, ForwardNode, ForwardTlvs, PaymentConstraints, PaymentContext, PaymentRelay,
++ ReceiveTlvs,
++};
use lightning::blinded_path::BlindedPath;
+use lightning::ln::channelmanager::MIN_FINAL_CLTV_EXPIRY_DELTA;
use lightning::ln::features::BlindedHopFeatures;
@@ fuzz/src/invoice_request_deser.rs: fn build_response<T: secp256k1::Signing + sec
+ invoice_request: InvoiceRequestFields {
+ payer_id: invoice_request.payer_id(),
+ quantity: invoice_request.quantity(),
-+ payer_note_truncated: invoice_request.payer_note().map(|s| UntrustedString(s.to_string())),
++ payer_note_truncated: invoice_request
++ .payer_note()
++ .map(|s| UntrustedString(s.to_string())),
+ },
+ });
+ let payee_tlvs = ReceiveTlvs {
@@ fuzz/src/invoice_request_deser.rs: fn build_response<T: secp256k1::Signing + sec
- fee_proportional_millionths: 1_000,
- cltv_expiry_delta: 42,
- htlc_minimum_msat: 100,
+- htlc_maximum_msat: 1_000_000_000_000,
+ payment_context,
+ };
-+ let intermediate_nodes = [
-+ ForwardNode {
-+ tlvs: ForwardTlvs {
-+ short_channel_id: 43,
-+ payment_relay: PaymentRelay {
-+ cltv_expiry_delta: 40,
-+ fee_proportional_millionths: 1_000,
-+ fee_base_msat: 1,
-+ },
-+ payment_constraints: PaymentConstraints {
-+ max_cltv_expiry: payee_tlvs.payment_constraints.max_cltv_expiry + 40,
-+ htlc_minimum_msat: 100,
-+ },
-+ features: BlindedHopFeatures::empty(),
++ let intermediate_nodes = [ForwardNode {
++ tlvs: ForwardTlvs {
++ short_channel_id: 43,
++ payment_relay: PaymentRelay {
++ cltv_expiry_delta: 40,
++ fee_proportional_millionths: 1_000,
++ fee_base_msat: 1,
+ },
-+ node_id: pubkey(43),
- htlc_maximum_msat: 1_000_000_000_000,
-- features: BlindedHopFeatures::empty(),
++ payment_constraints: PaymentConstraints {
++ max_cltv_expiry: payee_tlvs.payment_constraints.max_cltv_expiry + 40,
++ htlc_minimum_msat: 100,
++ },
+ features: BlindedHopFeatures::empty(),
},
- ];
+- ];
++ node_id: pubkey(43),
++ htlc_maximum_msat: 1_000_000_000_000,
++ }];
+ let payment_path = BlindedPath::new_for_payment(
-+ &intermediate_nodes, pubkey(42), payee_tlvs, u64::MAX, MIN_FINAL_CLTV_EXPIRY_DELTA,
-+ &entropy_source, secp_ctx,
-+ ).unwrap();
++ &intermediate_nodes,
++ pubkey(42),
++ payee_tlvs,
++ u64::MAX,
++ MIN_FINAL_CLTV_EXPIRY_DELTA,
++ &entropy_source,
++ secp_ctx,
++ )
++ .unwrap();
- let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
let payment_hash = PaymentHash([42; 32]);
@@ fuzz/src/refund_deser.rs
use bitcoin::secp256k1::{self, Keypair, PublicKey, Secp256k1, SecretKey};
use core::convert::TryFrom;
-use lightning::blinded_path::message::{ForwardNode, MessageContext, OffersContext};
-+use lightning::blinded_path::payment::{Bolt12RefundContext, ForwardNode, ForwardTlvs, PaymentConstraints, PaymentContext, PaymentRelay, ReceiveTlvs};
++use lightning::blinded_path::payment::{
++ Bolt12RefundContext, ForwardNode, ForwardTlvs, PaymentConstraints, PaymentContext,
++ PaymentRelay, ReceiveTlvs,
++};
use lightning::blinded_path::BlindedPath;
+use lightning::ln::channelmanager::MIN_FINAL_CLTV_EXPIRY_DELTA;
use lightning::ln::features::BlindedHopFeatures;
@@ fuzz/src/refund_deser.rs: fn build_response<T: secp256k1::Signing + secp256k1::V
- fee_proportional_millionths: 1_000,
- cltv_expiry_delta: 42,
- htlc_minimum_msat: 100,
+- htlc_maximum_msat: 1_000_000_000_000,
+ payment_context,
+ };
-+ let intermediate_nodes = [
-+ ForwardNode {
-+ tlvs: ForwardTlvs {
-+ short_channel_id: 43,
-+ payment_relay: PaymentRelay {
-+ cltv_expiry_delta: 40,
-+ fee_proportional_millionths: 1_000,
-+ fee_base_msat: 1,
-+ },
-+ payment_constraints: PaymentConstraints {
-+ max_cltv_expiry: payee_tlvs.payment_constraints.max_cltv_expiry + 40,
-+ htlc_minimum_msat: 100,
-+ },
-+ features: BlindedHopFeatures::empty(),
++ let intermediate_nodes = [ForwardNode {
++ tlvs: ForwardTlvs {
++ short_channel_id: 43,
++ payment_relay: PaymentRelay {
++ cltv_expiry_delta: 40,
++ fee_proportional_millionths: 1_000,
++ fee_base_msat: 1,
+ },
-+ node_id: pubkey(43),
- htlc_maximum_msat: 1_000_000_000_000,
-- features: BlindedHopFeatures::empty(),
++ payment_constraints: PaymentConstraints {
++ max_cltv_expiry: payee_tlvs.payment_constraints.max_cltv_expiry + 40,
++ htlc_minimum_msat: 100,
++ },
+ features: BlindedHopFeatures::empty(),
},
- ];
+- ];
++ node_id: pubkey(43),
++ htlc_maximum_msat: 1_000_000_000_000,
++ }];
+ let payment_path = BlindedPath::new_for_payment(
-+ &intermediate_nodes, pubkey(42), payee_tlvs, u64::MAX, MIN_FINAL_CLTV_EXPIRY_DELTA,
-+ &entropy_source, secp_ctx,
-+ ).unwrap();
++ &intermediate_nodes,
++ pubkey(42),
++ payee_tlvs,
++ u64::MAX,
++ MIN_FINAL_CLTV_EXPIRY_DELTA,
++ &entropy_source,
++ secp_ctx,
++ )
++ .unwrap();
- let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
let payment_hash = PaymentHash([42; 32]);
6: fd060fbd6 < -: --------- f - rustfmt
7: 4b30d1420 = 6: 2fc0c1b85 Include payment hash when logging InvoiceError
8: 8fc2aceff = 7: a5382ddcd Include payment hash when logging invoice handling
9: 34b2be75b = 8: d2c22d58c Include payment hash in Bolt12Invoice reply path
10: 9b18b7e26 = 9: 88343366c Replace use of OffersContext::Unknown with None
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses remaining comments and oversights from #3139
Bolt12Invoice::is_for_refund_without_pathsResultforBolt12Invoice::verify_using_payer_dataOffersContext::InboundPaymentand removeOffersContext::Unknown