Skip to content
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

Handle receiving payments via Trampoline #3670

Merged
merged 9 commits into from
Mar 28, 2025
+651 −150
Merged

Handle receiving payments via Trampoline #3670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4741892
Remove Trampoline config flag
arik-so Mar 26, 2025
0c82cc2
Make Trampoline inbound MPP data optional
arik-so Mar 17, 2025
a293d21
Fix blinded Trampoline TLV IDs
arik-so Mar 17, 2025
313f344
De-macro `return_malformed_err`
arik-so Mar 26, 2025
23b4c80
Propagate Trampoline blinding errors
arik-so Mar 26, 2025
dc14f26
Implement `Writeable` for `TrampolineForwardTlvs`
arik-so Mar 17, 2025
35ff142
Handle Trampoline receives
arik-so Mar 17, 2025
a6f4c7f
Test unblinded Trampoline receives
arik-so Mar 25, 2025
3970f1d
Test rejection of Trampoline forwards
arik-so Mar 26, 2025
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
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ check-cfg = [
"cfg(ldk_bench)",
"cfg(ldk_test_vectors)",
"cfg(taproot)",
"cfg(trampoline)",
"cfg(require_route_graph_test)",
"cfg(splicing)",
"cfg(async_payments)",
Expand Down
2 changes: 0 additions & 2 deletions ci/ci-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=trampoline" cargo test --verbose --color always -p lightning
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not following the commit message here in 908c6bf since we don't support trampoline forwarding yet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, it ensures that receiving forwarding onions results in a rejection, but not a panic or some undefined behavior. I'll rephrase.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok Joost explained that we test that we don't support forwarding basically

[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=lsps1_service" cargo test --verbose --color always -p lightning-liquidity
22 changes: 18 additions & 4 deletions lightning/src/blinded_path/payment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,6 @@ pub struct ForwardTlvs {
}

/// Data to construct a [`BlindedHop`] for forwarding a Trampoline payment.
#[cfg(trampoline)]
#[derive(Clone, Debug)]
pub struct TrampolineForwardTlvs {
/// The node id to which the trampoline node must find a route.
Expand Down Expand Up @@ -371,7 +370,6 @@ pub(crate) enum BlindedPaymentTlvs {
/// Data to construct a [`BlindedHop`] for sending a Trampoline payment over.
///
/// [`BlindedHop`]: crate::blinded_path::BlindedHop
#[cfg(trampoline)]
pub(crate) enum BlindedTrampolineTlvs {
/// This blinded payment data is for a forwarding node.
Forward(TrampolineForwardTlvs),
Expand Down Expand Up @@ -514,6 +512,23 @@ impl Writeable for ForwardTlvs {
}
}

impl Writeable for TrampolineForwardTlvs {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add to commit msg why we need to serialize blinded trampoline fwds in the future and not yet now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I adjusted the message.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I meant explain why this code is needed now, besides unit tests? I got that it encodes tlv data.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's only for the unit test, maybe squash with the test? Or just leave as is, non blocking.

fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
let features_opt = if self.features == BlindedHopFeatures::empty() {
None
} else {
Some(WithoutLength(&self.features))
};
encode_tlv_stream!(w, {
(4, self.next_trampoline, required),
(10, self.payment_relay, required),
(12, self.payment_constraints, required),
(14, features_opt, option)
});
Ok(())
}
}

impl Writeable for ReceiveTlvs {
fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
encode_tlv_stream!(w, {
Expand Down Expand Up @@ -591,14 +606,13 @@ impl Readable for BlindedPaymentTlvs {
}
}

#[cfg(trampoline)]
impl Readable for BlindedTrampolineTlvs {
fn read<R: io::Read>(r: &mut R) -> Result<Self, DecodeError> {
_init_and_read_tlv_stream!(r, {
(4, next_trampoline, option),
(8, next_blinding_override, option),
(10, payment_relay, option),
(12, payment_constraints, required),
(14, next_trampoline, option),
(14, features, (option, encoding: (BlindedHopFeatures, WithoutLength))),
(65536, payment_secret, option),
(65537, payment_context, option),
Expand Down
Loading
Loading