Skip to content

Async send: sender-side #4046

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 14 commits into from
Sep 19, 2025
Merged

Async send: sender-side #4046

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b9f5fd6
Actually remove forward<>intercepted htlcs lock dep
valentinewallace Sep 12, 2025
1c776a9
Add init_features to list_channels filter callback
valentinewallace Aug 21, 2025
94d3167
Persist hold_htlc flags in Channel
valentinewallace Sep 17, 2025
4d9c2ed
Add hold_htlc param to internal Channel APIs
valentinewallace Sep 17, 2025
08c4be6
Extract send_to_static_invoice util
valentinewallace Sep 12, 2025
f988dca
Add hold_htlcs param to pay_route_internal
valentinewallace Aug 21, 2025
38685db
Add config flag for held outbound HTLCs
valentinewallace Sep 16, 2025
feeab19
Add util to gather channels that support htlc_hold
valentinewallace Sep 16, 2025
99b7dba
Set UpdateAddHTLC::hold_htlc for offline payees
valentinewallace Sep 16, 2025
85117be
Support held_htlc_available counterparty reply path
valentinewallace Aug 29, 2025
8a38c88
Send held_htlc_available with counterparty reply path
valentinewallace Aug 29, 2025
0fe202d
Conditionally advertise htlc_hold feature
valentinewallace Sep 5, 2025
577d43d
Tests: take netgraph locks after peer_state
valentinewallace Sep 9, 2025
9e30591
Test async send
valentinewallace Aug 29, 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
14 changes: 9 additions & 5 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8048,7 +8048,7 @@ where
ref onion_routing_packet,
skimmed_fee_msat,
blinding_point,
hold_htlc: _,
hold_htlc,
..
} => {
match self.send_htlc(
Expand All @@ -8060,6 +8060,7 @@ where
false,
skimmed_fee_msat,
blinding_point,
hold_htlc.is_some(),
fee_estimator,
logger,
) {
Expand Down Expand Up @@ -12022,6 +12023,8 @@ where
true,
skimmed_fee_msat,
blinding_point,
// This method is only called for forwarded HTLCs, which are never held at the next hop
Copy link
Copy Markdown
Collaborator

@TheBlueMatt TheBlueMatt Sep 19, 2025

Choose a reason for hiding this comment

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

Note that we'll have to expose it when we do #4071.

false,
fee_estimator,
logger,
)
Expand Down Expand Up @@ -12052,7 +12055,7 @@ where
fn send_htlc<F: Deref, L: Deref>(
&mut self, amount_msat: u64, payment_hash: PaymentHash, cltv_expiry: u32,
source: HTLCSource, onion_routing_packet: msgs::OnionPacket, mut force_holding_cell: bool,
skimmed_fee_msat: Option<u64>, blinding_point: Option<PublicKey>,
skimmed_fee_msat: Option<u64>, blinding_point: Option<PublicKey>, hold_htlc: bool,
fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
) -> Result<bool, (LocalHTLCFailureReason, String)>
where
Expand Down Expand Up @@ -12134,7 +12137,7 @@ where
onion_routing_packet,
skimmed_fee_msat,
blinding_point,
hold_htlc: None,
hold_htlc: hold_htlc.then(|| ()),
});
return Ok(false);
}
Expand All @@ -12156,7 +12159,7 @@ where
blinding_point,
skimmed_fee_msat,
send_timestamp,
hold_htlc: None,
hold_htlc: hold_htlc.then(|| ()),
});
self.context.next_holder_htlc_id += 1;

Expand Down Expand Up @@ -12391,7 +12394,7 @@ where
pub fn send_htlc_and_commit<F: Deref, L: Deref>(
&mut self, amount_msat: u64, payment_hash: PaymentHash, cltv_expiry: u32,
source: HTLCSource, onion_routing_packet: msgs::OnionPacket, skimmed_fee_msat: Option<u64>,
fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
hold_htlc: bool, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &L,
) -> Result<Option<ChannelMonitorUpdate>, ChannelError>
where
F::Target: FeeEstimator,
Expand All @@ -12406,6 +12409,7 @@ where
false,
skimmed_fee_msat,
None,
hold_htlc,
fee_estimator,
logger,
);
Expand Down
1 change: 1 addition & 0 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5098,6 +5098,7 @@ where
htlc_source,
onion_packet,
None,
false,
&self.fee_estimator,
&&logger,
);
Expand Down