]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #3264 from jkczyz/2024-08-remove-user-provided-payer-id
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 12 Nov 2024 20:23:45 +0000 (20:23 +0000)
committerGitHub <noreply@github.com>
Tue, 12 Nov 2024 20:23:45 +0000 (20:23 +0000)
Disallow user-provided `payer_signing_pubkey`

1  2 
lightning/src/ln/blinded_payment_tests.rs
lightning/src/ln/channelmanager.rs
lightning/src/ln/outbound_payment.rs
lightning/src/offers/invoice.rs
lightning/src/offers/invoice_request.rs

Simple merge
Simple merge
index e7e4596901ba0f618939f30cb9e171b635a1f1fa,59100f4cf49318775d94f4f681d4d4426242277c..3539d0f81d1ded777924237a08bfea01309ae609
@@@ -1763,10 -1772,9 +1772,10 @@@ mod tests 
                                        amount: None,
                                        features: None,
                                        quantity: None,
-                                       payer_id: Some(&payer_pubkey()),
+                                       payer_id: Some(&invoice.payer_signing_pubkey()),
                                        payer_note: None,
                                        paths: None,
 +                                      offer_from_hrn: None,
                                },
                                InvoiceTlvStreamRef {
                                        paths: Some(Iterable(payment_paths.iter().map(|path| path.inner_blinded_path()))),
index f7f1c228779fa80b96c3dfb10a9cd6560e03d258,0e6ebb8cc01abfe02ab41464905f87f812c15b66..2594c056f05b7b0c75e55cc02f5aff746ad69e80
@@@ -1511,10 -1387,9 +1417,10 @@@ mod tests 
                                        amount: None,
                                        features: None,
                                        quantity: None,
-                                       payer_id: Some(&payer_pubkey()),
+                                       payer_id: Some(&invoice_request.payer_signing_pubkey()),
                                        payer_note: None,
                                        paths: None,
 +                                      offer_from_hrn: None,
                                },
                                SignatureTlvStreamRef { signature: Some(&invoice_request.signature()) },
                                ExperimentalOfferTlvStreamRef {
                                assert_eq!(
                                        fields,
                                        InvoiceRequestFields {
-                                               payer_signing_pubkey: payer_pubkey(),
+                                               payer_signing_pubkey: invoice_request.payer_signing_pubkey(),
                                                quantity: Some(1),
                                                payer_note_truncated: Some(UntrustedString("0".repeat(PAYER_NOTE_LIMIT))),
 +                                              human_readable_name: None,
                                        }
                                );