Skip to content

ChannelManager Payment Retries #1916

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
merged 12 commits into from
Jan 26, 2023
Merged

ChannelManager Payment Retries #1916

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
948ebc6
Copy PaymentAttempts from invoice module to outbound_payment module
valentinewallace Dec 18, 2022
cbb75e2
Copy Retry from invoice module to outbound_payment module
valentinewallace Dec 18, 2022
ae34533
Parameterize add_new_pending_payment with retry strategy and route pa…
valentinewallace Dec 18, 2022
c0a22f7
Store retry data in PendingOutboundPayment::Retryable
valentinewallace Dec 18, 2022
6351a99
Decode onion fail outside of outbound_payments lock
valentinewallace Jan 24, 2023
686ef08
Generate PendingHTLCsForwardable upon retryable payment
valentinewallace Jan 6, 2023
72a7da8
Remove AllPathsFailed outbounds at send_payment_internal callsites in…
valentinewallace Dec 19, 2022
d776dee
Retry HTLCs in process_pending_htlc_forwards
valentinewallace Jan 7, 2023
acf9292
Support sending payments with a retry strategy in ChannelManager
valentinewallace Dec 19, 2022
2f49c81
Test ChannelManager automatic retries
valentinewallace Dec 19, 2022
ad486a4
Payment retries: copy tests from InvoicePayer
valentinewallace Jan 4, 2023
6d81979
Disambiguate send_payment_internal from pay_internal
valentinewallace Jan 24, 2023
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
11 changes: 6 additions & 5 deletions lightning/src/ln/outbound_payment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,11 @@ impl OutboundPayments {
payment_params: &Option<PaymentParameters>, probing_cookie_secret: [u8; 32],
secp_ctx: &Secp256k1<secp256k1::All>, pending_events: &Mutex<Vec<events::Event>>, logger: &L
) where L::Target: Logger {
#[cfg(test)]
let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_error.decode_onion_failure(secp_ctx, logger, &source);
#[cfg(not(test))]
let (network_update, short_channel_id, payment_retryable, _, _) = onion_error.decode_onion_failure(secp_ctx, logger, &source);

let mut session_priv_bytes = [0; 32];
session_priv_bytes.copy_from_slice(&session_priv[..]);
let mut outbounds = self.pending_outbound_payments.lock().unwrap();
Expand Down Expand Up @@ -811,6 +816,7 @@ impl OutboundPayments {
log_trace!(logger, "Received duplicative fail for HTLC with payment_hash {}", log_bytes!(payment_hash.0));
return
}
core::mem::drop(outbounds);
let mut retry = if let Some(payment_params_data) = payment_params {
let path_last_hop = path.last().expect("Outbound payments must have had a valid path");
Some(RouteParameters {
Expand All @@ -822,11 +828,6 @@ impl OutboundPayments {
log_trace!(logger, "Failing outbound payment HTLC with payment_hash {}", log_bytes!(payment_hash.0));

let path_failure = {
#[cfg(test)]
let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_error.decode_onion_failure(secp_ctx, logger, &source);
#[cfg(not(test))]
let (network_update, short_channel_id, payment_retryable, _, _) = onion_error.decode_onion_failure(secp_ctx, logger, &source);

if payment_is_probe(payment_hash, &payment_id, probing_cookie_secret) {
if !payment_retryable {
events::Event::ProbeSuccessful {
Expand Down