Skip to content

Correct outbound_payment route-fetch calls to pass the hash + ID#2092

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 2 commits into from
Mar 9, 2023
Merged

Correct outbound_payment route-fetch calls to pass the hash + ID #2092

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d6d200
Correct `outbound_payment` route-fetch calls to pass the hash + ID
TheBlueMatt Mar 9, 2023
10e6978
Further simplify the `outbound_payments` failure macro
TheBlueMatt Mar 9, 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
63 changes: 32 additions & 31 deletions lightning/src/ln/outbound_payment.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ pub enum Retry {
///
/// Each attempt may be multiple HTLCs along multiple paths if the router decides to split up a
/// retry, and may retry multiple failed HTLCs at once if they failed around the same time and
/// were retried along a route from a single call to [`Router::find_route`].
/// were retried along a route from a single call to [`Router::find_route_with_id`].
Attempts(usize),
#[cfg(not(feature = "no-std"))]
/// Time elapsed before abandoning retries for a payment. At least one attempt at payment is made;
Expand DownExpand Up@@ -531,9 +531,9 @@ impl OutboundPayments {
let mut retry_id_route_params = None;
for (pmt_id, pmt) in outbounds.iter_mut() {
if pmt.is_auto_retryable_now() {
if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), payment_hash, .. } = pmt {
if pending_amt_msat < total_msat {
retry_id_route_params = Some((*pmt_id, RouteParameters {
retry_id_route_params = Some((*payment_hash, *pmt_id, RouteParameters {
final_value_msat: *total_msat - *pending_amt_msat,
payment_params: params.clone(),
}));
Expand All@@ -543,8 +543,8 @@ impl OutboundPayments {
}
}
core::mem::drop(outbounds);
if let Some((payment_id, route_params)) = retry_id_route_params {
self.retry_payment_internal(payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
if let Some((payment_hash, payment_id, route_params)) = retry_id_route_params {
self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
} else { break }
}

Expand DownExpand Up@@ -597,9 +597,10 @@ impl OutboundPayments {
}
}

let route = router.find_route(
let route = router.find_route_with_id(
&node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
payment_hash, payment_id,
).map_err(|_| RetryableSendFailure::RouteNotFound)?;

let onion_session_privs = self.add_new_pending_payment(payment_hash, *payment_secret,
Expand All@@ -617,10 +618,10 @@ impl OutboundPayments {
}

fn retry_payment_internal<R: Deref, NS: Deref, ES: Deref, IH, SP, L: Deref>(
&self, payment_id: PaymentId, route_params: RouteParameters, router: &R,
first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES, node_signer: &NS,
best_block_height: u32, logger: &L, pending_events: &Mutex<Vec<events::Event>>,
send_payment_along_path: &SP,
&self, payment_hash: PaymentHash, payment_id: PaymentId, route_params: RouteParameters,
router: &R, first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES,
node_signer: &NS, best_block_height: u32, logger: &L,
pending_events: &Mutex<Vec<events::Event>>, send_payment_along_path: &SP,
)
where
R::Target: Router,
Expand All@@ -639,9 +640,10 @@ impl OutboundPayments {
}
}

let route = match router.find_route(
let route = match router.find_route_with_id(
&node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
payment_hash, payment_id,
) {
Ok(route) => route,
Err(e) => {
Expand All@@ -665,32 +667,31 @@ impl OutboundPayments {
}

macro_rules! abandon_with_entry {
($payment_id: expr, $payment_hash: expr, $payment: expr, $pending_events: expr) => {
($payment: expr) => {
if $payment.get_mut().mark_abandoned().is_ok() && $payment.get().remaining_parts() == 0 {
$pending_events.lock().unwrap().push(events::Event::PaymentFailed {
payment_id: $payment_id,
payment_hash: $payment_hash,
pending_events.lock().unwrap().push(events::Event::PaymentFailed {
payment_id,
payment_hash,
});
$payment.remove();
}
}
}
let (total_msat, payment_hash, payment_secret, keysend_preimage) = {
let (total_msat, payment_secret, keysend_preimage) = {
let mut outbounds = self.pending_outbound_payments.lock().unwrap();
match outbounds.entry(payment_id) {
hash_map::Entry::Occupied(mut payment) => {
let res = match payment.get() {
PendingOutboundPayment::Retryable {
total_msat, payment_hash, keysend_preimage, payment_secret, pending_amt_msat, ..
total_msat, keysend_preimage, payment_secret, pending_amt_msat, ..
} => {
let retry_amt_msat: u64 = route.paths.iter().map(|path| path.last().unwrap().fee_msat).sum();
if retry_amt_msat + *pending_amt_msat > *total_msat * (100 + RETRY_OVERFLOW_PERCENTAGE) / 100 {
log_error!(logger, "retry_amt_msat of {} will put pending_amt_msat (currently: {}) more than 10% over total_payment_amt_msat of {}", retry_amt_msat, pending_amt_msat, total_msat);
let payment_hash = *payment_hash;
abandon_with_entry!(payment_id, payment_hash, payment, pending_events);
abandon_with_entry!(payment);
return
}
(*total_msat, *payment_hash, *payment_secret, *keysend_preimage)
(*total_msat, *payment_secret, *keysend_preimage)
},
PendingOutboundPayment::Legacy { .. } => {
log_error!(logger, "Unable to retry payments that were initially sent on LDK versions prior to 0.0.102");
Expand All@@ -707,7 +708,7 @@ impl OutboundPayments {
};
if !payment.get().is_retryable_now() {
log_error!(logger, "Retries exhausted for payment id {}", log_bytes!(payment_id.0));
abandon_with_entry!(payment_id, res.1, payment, pending_events);
abandon_with_entry!(payment);
return
}
payment.get_mut().increment_attempts();
Expand DownExpand Up@@ -749,14 +750,14 @@ impl OutboundPayments {
match err {
PaymentSendFailure::AllFailedResendSafe(errs) => {
Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut route_params, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
self.retry_payment_internal(payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
},
PaymentSendFailure::PartialFailure { failed_paths_retry: Some(mut retry), results, .. } => {
Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut retry, route.paths, results.into_iter(), pending_events);
// Some paths were sent, even if we failed to send the full MPP value our recipient may
// misbehave and claim the funds, at which point we have to consider the payment sent, so
// return `Ok()` here, ignoring any retry errors.
self.retry_payment_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
self.retry_payment_internal(payment_hash, payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
},
PaymentSendFailure::PartialFailure { failed_paths_retry: None, .. } => {
// This may happen if we send a payment and some paths fail, but only due to a temporary
Expand DownExpand Up@@ -1384,9 +1385,9 @@ mod tests {
&Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
Some(expired_route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
outbound_payments.retry_payment_internal(
PaymentId([0; 32]), expired_route_params, &&router, vec![], &|| InFlightHtlcs::new(),
&&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
&|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), expired_route_params, &&router, vec![],
&|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
&pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
let events = pending_events.lock().unwrap();
assert_eq!(events.len(), 1);
if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand DownExpand Up@@ -1428,9 +1429,9 @@ mod tests {
&Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
Some(route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
outbound_payments.retry_payment_internal(
PaymentId([0; 32]), route_params, &&router, vec![], &|| InFlightHtlcs::new(),
&&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
&|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), route_params, &&router, vec![],
&|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
&pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
let events = pending_events.lock().unwrap();
assert_eq!(events.len(), 1);
if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Correct `outbound_payment` route-fetch calls to pass the hash + ID by TheBlueMatt · Pull Request #2092 · lightningdevkit/rust-lightning · GitHub
Skip to content
Correct outbound_payment route-fetch calls to pass the hash + ID#2092

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 2 commits into

from

Mar 9, 2023
 Merged


Correct outbound_payment route-fetch calls to pass the hash + ID
#2092
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6d6d200

Correct `outbound_payment` route-fetch calls to pass the hash + ID


TheBlueMatt Mar 9, 2023
10e6978

Further simplify the `outbound_payments` failure macro


TheBlueMatt Mar 9, 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


63 changes: 32 additions & 31 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ pub enum Retry {
	///
	/// Each attempt may be multiple HTLCs along multiple paths if the router decides to split up a
	/// retry, and may retry multiple failed HTLCs at once if they failed around the same time and
	/// were retried along a route from a single call to [`Router::find_route`].
	/// were retried along a route from a single call to [`Router::find_route_with_id`].
	Attempts(usize),
	#[cfg(not(feature = "no-std"))]
	/// Time elapsed before abandoning retries for a payment. At least one attempt at payment is made;
Expand DownExpand Up@@ -531,9 +531,9 @@ impl OutboundPayments {
 let mut retry_id_route_params = None;
 for (pmt_id, pmt) in outbounds.iter_mut() {
 if pmt.is_auto_retryable_now() {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), payment_hash, .. } = pmt {
 if pending_amt_msat < total_msat {
 retry_id_route_params = Some((*pmt_id, RouteParameters {
 retry_id_route_params = Some((*payment_hash, *pmt_id, RouteParameters {
 final_value_msat: *total_msat - *pending_amt_msat,
 payment_params: params.clone(),
 }));
Expand All@@ -543,8 +543,8 @@ impl OutboundPayments {
 }
 }
 core::mem::drop(outbounds);
 if let Some((payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 if let Some((payment_hash, payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 } else { break }
 }

Expand DownExpand Up@@ -597,9 +597,10 @@ impl OutboundPayments {
 }
 }

 let route = router.find_route(
 let route = router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ).map_err(|_| RetryableSendFailure::RouteNotFound)?;

 let onion_session_privs = self.add_new_pending_payment(payment_hash, *payment_secret,
Expand All@@ -617,10 +618,10 @@ impl OutboundPayments {
	}

	fn retry_payment_internal<R: Deref, NS: Deref, ES: Deref, IH, SP, L: Deref>(
 &self, payment_id: PaymentId, route_params: RouteParameters, router: &R,
 first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES, node_signer: &NS,
best_block_height: u32, logger: &L, pending_events: &Mutex<Vec<events::Event>>,
 send_payment_along_path: &SP,
 &self, payment_hash: PaymentHash, payment_id: PaymentId, route_params: RouteParameters,
router: &R, first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES,
node_signer: &NS, best_block_height: u32, logger: &L,
pending_events: &Mutex<Vec<events::Event>>, send_payment_along_path: &SP,
	)
	where
 R::Target: Router,
Expand All@@ -639,9 +640,10 @@ impl OutboundPayments {
 }
 }

 let route = match router.find_route(
 let route = match router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ) {
 Ok(route) => route,
 Err(e) => {
Expand All@@ -665,32 +667,31 @@ impl OutboundPayments {
 }

 macro_rules! abandon_with_entry {
 ($payment_id: expr, $payment_hash: expr, $payment: expr, $pending_events: expr) => {
 ($payment: expr) => {
 if $payment.get_mut().mark_abandoned().is_ok() && $payment.get().remaining_parts() == 0 {
$pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id: $payment_id,
 payment_hash: $payment_hash,
 pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id,
 payment_hash,
 });
 $payment.remove();
 }
 }
 }
 let (total_msat, payment_hash, payment_secret, keysend_preimage) = {
 let (total_msat, payment_secret, keysend_preimage) = {
 let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 match outbounds.entry(payment_id) {
 hash_map::Entry::Occupied(mut payment) => {
 let res = match payment.get() {
 PendingOutboundPayment::Retryable {
 total_msat, payment_hash, keysend_preimage, payment_secret, pending_amt_msat, ..
 total_msat, keysend_preimage, payment_secret, pending_amt_msat, ..
 } => {
 let retry_amt_msat: u64 = route.paths.iter().map(|path| path.last().unwrap().fee_msat).sum();
 if retry_amt_msat + *pending_amt_msat > *total_msat * (100 + RETRY_OVERFLOW_PERCENTAGE) / 100 {
 log_error!(logger, "retry_amt_msat of {} will put pending_amt_msat (currently: {}) more than 10% over total_payment_amt_msat of {}", retry_amt_msat, pending_amt_msat, total_msat);
 let payment_hash = *payment_hash;
 abandon_with_entry!(payment_id, payment_hash, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 (*total_msat, *payment_hash, *payment_secret, *keysend_preimage)
 (*total_msat, *payment_secret, *keysend_preimage)
 },
 PendingOutboundPayment::Legacy { .. } => {
 log_error!(logger, "Unable to retry payments that were initially sent on LDK versions prior to 0.0.102");
Expand All@@ -707,7 +708,7 @@ impl OutboundPayments {
 };
 if !payment.get().is_retryable_now() {
 log_error!(logger, "Retries exhausted for payment id {}", log_bytes!(payment_id.0));
 abandon_with_entry!(payment_id, res.1, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 payment.get_mut().increment_attempts();
Expand DownExpand Up@@ -749,14 +750,14 @@ impl OutboundPayments {
 match err {
 PaymentSendFailure::AllFailedResendSafe(errs) => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut route_params, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
 self.retry_payment_internal(payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: Some(mut retry), results, .. } => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut retry, route.paths, results.into_iter(), pending_events);
 // Some paths were sent, even if we failed to send the full MPP value our recipient may
 // misbehave and claim the funds, at which point we have to consider the payment sent, so
 // return `Ok()` here, ignoring any retry errors.
 self.retry_payment_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: None, .. } => {
 // This may happen if we send a payment and some paths fail, but only due to a temporary
Expand DownExpand Up@@ -1384,9 +1385,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(expired_route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), expired_route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), expired_route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand DownExpand Up@@ -1428,9 +1429,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Correct `outbound_payment` route-fetch calls to pass the hash + ID by TheBlueMatt · Pull Request #2092 · lightningdevkit/rust-lightning · GitHub
Skip to content
Correct outbound_payment route-fetch calls to pass the hash + ID#2092

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 2 commits into

from

Mar 9, 2023
 Merged


Correct outbound_payment route-fetch calls to pass the hash + ID
#2092
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6d6d200

Correct `outbound_payment` route-fetch calls to pass the hash + ID


TheBlueMatt Mar 9, 2023
10e6978

Further simplify the `outbound_payments` failure macro


TheBlueMatt Mar 9, 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


63 changes: 32 additions & 31 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ pub enum Retry {
	///
	/// Each attempt may be multiple HTLCs along multiple paths if the router decides to split up a
	/// retry, and may retry multiple failed HTLCs at once if they failed around the same time and
	/// were retried along a route from a single call to [`Router::find_route`].
	/// were retried along a route from a single call to [`Router::find_route_with_id`].
	Attempts(usize),
	#[cfg(not(feature = "no-std"))]
	/// Time elapsed before abandoning retries for a payment. At least one attempt at payment is made;
Expand DownExpand Up@@ -531,9 +531,9 @@ impl OutboundPayments {
 let mut retry_id_route_params = None;
 for (pmt_id, pmt) in outbounds.iter_mut() {
 if pmt.is_auto_retryable_now() {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), payment_hash, .. } = pmt {
 if pending_amt_msat < total_msat {
 retry_id_route_params = Some((*pmt_id, RouteParameters {
 retry_id_route_params = Some((*payment_hash, *pmt_id, RouteParameters {
 final_value_msat: *total_msat - *pending_amt_msat,
 payment_params: params.clone(),
 }));
Expand All@@ -543,8 +543,8 @@ impl OutboundPayments {
 }
 }
 core::mem::drop(outbounds);
 if let Some((payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 if let Some((payment_hash, payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 } else { break }
 }

Expand DownExpand Up@@ -597,9 +597,10 @@ impl OutboundPayments {
 }
 }

 let route = router.find_route(
 let route = router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ).map_err(|_| RetryableSendFailure::RouteNotFound)?;

 let onion_session_privs = self.add_new_pending_payment(payment_hash, *payment_secret,
Expand All@@ -617,10 +618,10 @@ impl OutboundPayments {
	}

	fn retry_payment_internal<R: Deref, NS: Deref, ES: Deref, IH, SP, L: Deref>(
 &self, payment_id: PaymentId, route_params: RouteParameters, router: &R,
 first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES, node_signer: &NS,
best_block_height: u32, logger: &L, pending_events: &Mutex<Vec<events::Event>>,
 send_payment_along_path: &SP,
 &self, payment_hash: PaymentHash, payment_id: PaymentId, route_params: RouteParameters,
router: &R, first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES,
node_signer: &NS, best_block_height: u32, logger: &L,
pending_events: &Mutex<Vec<events::Event>>, send_payment_along_path: &SP,
	)
	where
 R::Target: Router,
Expand All@@ -639,9 +640,10 @@ impl OutboundPayments {
 }
 }

 let route = match router.find_route(
 let route = match router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ) {
 Ok(route) => route,
 Err(e) => {
Expand All@@ -665,32 +667,31 @@ impl OutboundPayments {
 }

 macro_rules! abandon_with_entry {
 ($payment_id: expr, $payment_hash: expr, $payment: expr, $pending_events: expr) => {
 ($payment: expr) => {
 if $payment.get_mut().mark_abandoned().is_ok() && $payment.get().remaining_parts() == 0 {
$pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id: $payment_id,
 payment_hash: $payment_hash,
 pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id,
 payment_hash,
 });
 $payment.remove();
 }
 }
 }
 let (total_msat, payment_hash, payment_secret, keysend_preimage) = {
 let (total_msat, payment_secret, keysend_preimage) = {
 let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 match outbounds.entry(payment_id) {
 hash_map::Entry::Occupied(mut payment) => {
 let res = match payment.get() {
 PendingOutboundPayment::Retryable {
 total_msat, payment_hash, keysend_preimage, payment_secret, pending_amt_msat, ..
 total_msat, keysend_preimage, payment_secret, pending_amt_msat, ..
 } => {
 let retry_amt_msat: u64 = route.paths.iter().map(|path| path.last().unwrap().fee_msat).sum();
 if retry_amt_msat + *pending_amt_msat > *total_msat * (100 + RETRY_OVERFLOW_PERCENTAGE) / 100 {
 log_error!(logger, "retry_amt_msat of {} will put pending_amt_msat (currently: {}) more than 10% over total_payment_amt_msat of {}", retry_amt_msat, pending_amt_msat, total_msat);
 let payment_hash = *payment_hash;
 abandon_with_entry!(payment_id, payment_hash, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 (*total_msat, *payment_hash, *payment_secret, *keysend_preimage)
 (*total_msat, *payment_secret, *keysend_preimage)
 },
 PendingOutboundPayment::Legacy { .. } => {
 log_error!(logger, "Unable to retry payments that were initially sent on LDK versions prior to 0.0.102");
Expand All@@ -707,7 +708,7 @@ impl OutboundPayments {
 };
 if !payment.get().is_retryable_now() {
 log_error!(logger, "Retries exhausted for payment id {}", log_bytes!(payment_id.0));
 abandon_with_entry!(payment_id, res.1, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 payment.get_mut().increment_attempts();
Expand DownExpand Up@@ -749,14 +750,14 @@ impl OutboundPayments {
 match err {
 PaymentSendFailure::AllFailedResendSafe(errs) => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut route_params, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
 self.retry_payment_internal(payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: Some(mut retry), results, .. } => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut retry, route.paths, results.into_iter(), pending_events);
 // Some paths were sent, even if we failed to send the full MPP value our recipient may
 // misbehave and claim the funds, at which point we have to consider the payment sent, so
 // return `Ok()` here, ignoring any retry errors.
 self.retry_payment_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: None, .. } => {
 // This may happen if we send a payment and some paths fail, but only due to a temporary
Expand DownExpand Up@@ -1384,9 +1385,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(expired_route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), expired_route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), expired_route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand DownExpand Up@@ -1428,9 +1429,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Correct `outbound_payment` route-fetch calls to pass the hash + ID by TheBlueMatt · Pull Request #2092 · lightningdevkit/rust-lightning · GitHub
Skip to content
Correct outbound_payment route-fetch calls to pass the hash + ID#2092

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 2 commits into

from

Mar 9, 2023
 Merged


Correct outbound_payment route-fetch calls to pass the hash + ID
#2092
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6d6d200

Correct `outbound_payment` route-fetch calls to pass the hash + ID


TheBlueMatt Mar 9, 2023
10e6978

Further simplify the `outbound_payments` failure macro


TheBlueMatt Mar 9, 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


63 changes: 32 additions & 31 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ pub enum Retry {
	///
	/// Each attempt may be multiple HTLCs along multiple paths if the router decides to split up a
	/// retry, and may retry multiple failed HTLCs at once if they failed around the same time and
	/// were retried along a route from a single call to [`Router::find_route`].
	/// were retried along a route from a single call to [`Router::find_route_with_id`].
	Attempts(usize),
	#[cfg(not(feature = "no-std"))]
	/// Time elapsed before abandoning retries for a payment. At least one attempt at payment is made;
Expand DownExpand Up@@ -531,9 +531,9 @@ impl OutboundPayments {
 let mut retry_id_route_params = None;
 for (pmt_id, pmt) in outbounds.iter_mut() {
 if pmt.is_auto_retryable_now() {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), payment_hash, .. } = pmt {
 if pending_amt_msat < total_msat {
 retry_id_route_params = Some((*pmt_id, RouteParameters {
 retry_id_route_params = Some((*payment_hash, *pmt_id, RouteParameters {
 final_value_msat: *total_msat - *pending_amt_msat,
 payment_params: params.clone(),
 }));
Expand All@@ -543,8 +543,8 @@ impl OutboundPayments {
 }
 }
 core::mem::drop(outbounds);
 if let Some((payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 if let Some((payment_hash, payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 } else { break }
 }

Expand DownExpand Up@@ -597,9 +597,10 @@ impl OutboundPayments {
 }
 }

 let route = router.find_route(
 let route = router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ).map_err(|_| RetryableSendFailure::RouteNotFound)?;

 let onion_session_privs = self.add_new_pending_payment(payment_hash, *payment_secret,
Expand All@@ -617,10 +618,10 @@ impl OutboundPayments {
	}

	fn retry_payment_internal<R: Deref, NS: Deref, ES: Deref, IH, SP, L: Deref>(
 &self, payment_id: PaymentId, route_params: RouteParameters, router: &R,
 first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES, node_signer: &NS,
best_block_height: u32, logger: &L, pending_events: &Mutex<Vec<events::Event>>,
 send_payment_along_path: &SP,
 &self, payment_hash: PaymentHash, payment_id: PaymentId, route_params: RouteParameters,
router: &R, first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES,
node_signer: &NS, best_block_height: u32, logger: &L,
pending_events: &Mutex<Vec<events::Event>>, send_payment_along_path: &SP,
	)
	where
 R::Target: Router,
Expand All@@ -639,9 +640,10 @@ impl OutboundPayments {
 }
 }

 let route = match router.find_route(
 let route = match router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ) {
 Ok(route) => route,
 Err(e) => {
Expand All@@ -665,32 +667,31 @@ impl OutboundPayments {
 }

 macro_rules! abandon_with_entry {
 ($payment_id: expr, $payment_hash: expr, $payment: expr, $pending_events: expr) => {
 ($payment: expr) => {
 if $payment.get_mut().mark_abandoned().is_ok() && $payment.get().remaining_parts() == 0 {
$pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id: $payment_id,
 payment_hash: $payment_hash,
 pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id,
 payment_hash,
 });
 $payment.remove();
 }
 }
 }
 let (total_msat, payment_hash, payment_secret, keysend_preimage) = {
 let (total_msat, payment_secret, keysend_preimage) = {
 let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 match outbounds.entry(payment_id) {
 hash_map::Entry::Occupied(mut payment) => {
 let res = match payment.get() {
 PendingOutboundPayment::Retryable {
 total_msat, payment_hash, keysend_preimage, payment_secret, pending_amt_msat, ..
 total_msat, keysend_preimage, payment_secret, pending_amt_msat, ..
 } => {
 let retry_amt_msat: u64 = route.paths.iter().map(|path| path.last().unwrap().fee_msat).sum();
 if retry_amt_msat + *pending_amt_msat > *total_msat * (100 + RETRY_OVERFLOW_PERCENTAGE) / 100 {
 log_error!(logger, "retry_amt_msat of {} will put pending_amt_msat (currently: {}) more than 10% over total_payment_amt_msat of {}", retry_amt_msat, pending_amt_msat, total_msat);
 let payment_hash = *payment_hash;
 abandon_with_entry!(payment_id, payment_hash, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 (*total_msat, *payment_hash, *payment_secret, *keysend_preimage)
 (*total_msat, *payment_secret, *keysend_preimage)
 },
 PendingOutboundPayment::Legacy { .. } => {
 log_error!(logger, "Unable to retry payments that were initially sent on LDK versions prior to 0.0.102");
Expand All@@ -707,7 +708,7 @@ impl OutboundPayments {
 };
 if !payment.get().is_retryable_now() {
 log_error!(logger, "Retries exhausted for payment id {}", log_bytes!(payment_id.0));
 abandon_with_entry!(payment_id, res.1, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 payment.get_mut().increment_attempts();
Expand DownExpand Up@@ -749,14 +750,14 @@ impl OutboundPayments {
 match err {
 PaymentSendFailure::AllFailedResendSafe(errs) => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut route_params, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
 self.retry_payment_internal(payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: Some(mut retry), results, .. } => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut retry, route.paths, results.into_iter(), pending_events);
 // Some paths were sent, even if we failed to send the full MPP value our recipient may
 // misbehave and claim the funds, at which point we have to consider the payment sent, so
 // return `Ok()` here, ignoring any retry errors.
 self.retry_payment_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: None, .. } => {
 // This may happen if we send a payment and some paths fail, but only due to a temporary
Expand DownExpand Up@@ -1384,9 +1385,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(expired_route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), expired_route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), expired_route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand DownExpand Up@@ -1428,9 +1429,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Correct `outbound_payment` route-fetch calls to pass the hash + ID by TheBlueMatt · Pull Request #2092 · lightningdevkit/rust-lightning · GitHub
Skip to content
Correct outbound_payment route-fetch calls to pass the hash + ID#2092

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 2 commits into

from

Mar 9, 2023
 Merged


Correct outbound_payment route-fetch calls to pass the hash + ID
#2092
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6d6d200

Correct `outbound_payment` route-fetch calls to pass the hash + ID


TheBlueMatt Mar 9, 2023
10e6978

Further simplify the `outbound_payments` failure macro


TheBlueMatt Mar 9, 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


63 changes: 32 additions & 31 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ pub enum Retry {
	///
	/// Each attempt may be multiple HTLCs along multiple paths if the router decides to split up a
	/// retry, and may retry multiple failed HTLCs at once if they failed around the same time and
	/// were retried along a route from a single call to [`Router::find_route`].
	/// were retried along a route from a single call to [`Router::find_route_with_id`].
	Attempts(usize),
	#[cfg(not(feature = "no-std"))]
	/// Time elapsed before abandoning retries for a payment. At least one attempt at payment is made;
Expand DownExpand Up@@ -531,9 +531,9 @@ impl OutboundPayments {
 let mut retry_id_route_params = None;
 for (pmt_id, pmt) in outbounds.iter_mut() {
 if pmt.is_auto_retryable_now() {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), payment_hash, .. } = pmt {
 if pending_amt_msat < total_msat {
 retry_id_route_params = Some((*pmt_id, RouteParameters {
 retry_id_route_params = Some((*payment_hash, *pmt_id, RouteParameters {
 final_value_msat: *total_msat - *pending_amt_msat,
 payment_params: params.clone(),
 }));
Expand All@@ -543,8 +543,8 @@ impl OutboundPayments {
 }
 }
 core::mem::drop(outbounds);
 if let Some((payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 if let Some((payment_hash, payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 } else { break }
 }

Expand DownExpand Up@@ -597,9 +597,10 @@ impl OutboundPayments {
 }
 }

 let route = router.find_route(
 let route = router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ).map_err(|_| RetryableSendFailure::RouteNotFound)?;

 let onion_session_privs = self.add_new_pending_payment(payment_hash, *payment_secret,
Expand All@@ -617,10 +618,10 @@ impl OutboundPayments {
	}

	fn retry_payment_internal<R: Deref, NS: Deref, ES: Deref, IH, SP, L: Deref>(
 &self, payment_id: PaymentId, route_params: RouteParameters, router: &R,
 first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES, node_signer: &NS,
best_block_height: u32, logger: &L, pending_events: &Mutex<Vec<events::Event>>,
 send_payment_along_path: &SP,
 &self, payment_hash: PaymentHash, payment_id: PaymentId, route_params: RouteParameters,
router: &R, first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES,
node_signer: &NS, best_block_height: u32, logger: &L,
pending_events: &Mutex<Vec<events::Event>>, send_payment_along_path: &SP,
	)
	where
 R::Target: Router,
Expand All@@ -639,9 +640,10 @@ impl OutboundPayments {
 }
 }

 let route = match router.find_route(
 let route = match router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ) {
 Ok(route) => route,
 Err(e) => {
Expand All@@ -665,32 +667,31 @@ impl OutboundPayments {
 }

 macro_rules! abandon_with_entry {
 ($payment_id: expr, $payment_hash: expr, $payment: expr, $pending_events: expr) => {
 ($payment: expr) => {
 if $payment.get_mut().mark_abandoned().is_ok() && $payment.get().remaining_parts() == 0 {
$pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id: $payment_id,
 payment_hash: $payment_hash,
 pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id,
 payment_hash,
 });
 $payment.remove();
 }
 }
 }
 let (total_msat, payment_hash, payment_secret, keysend_preimage) = {
 let (total_msat, payment_secret, keysend_preimage) = {
 let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 match outbounds.entry(payment_id) {
 hash_map::Entry::Occupied(mut payment) => {
 let res = match payment.get() {
 PendingOutboundPayment::Retryable {
 total_msat, payment_hash, keysend_preimage, payment_secret, pending_amt_msat, ..
 total_msat, keysend_preimage, payment_secret, pending_amt_msat, ..
 } => {
 let retry_amt_msat: u64 = route.paths.iter().map(|path| path.last().unwrap().fee_msat).sum();
 if retry_amt_msat + *pending_amt_msat > *total_msat * (100 + RETRY_OVERFLOW_PERCENTAGE) / 100 {
 log_error!(logger, "retry_amt_msat of {} will put pending_amt_msat (currently: {}) more than 10% over total_payment_amt_msat of {}", retry_amt_msat, pending_amt_msat, total_msat);
 let payment_hash = *payment_hash;
 abandon_with_entry!(payment_id, payment_hash, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 (*total_msat, *payment_hash, *payment_secret, *keysend_preimage)
 (*total_msat, *payment_secret, *keysend_preimage)
 },
 PendingOutboundPayment::Legacy { .. } => {
 log_error!(logger, "Unable to retry payments that were initially sent on LDK versions prior to 0.0.102");
Expand All@@ -707,7 +708,7 @@ impl OutboundPayments {
 };
 if !payment.get().is_retryable_now() {
 log_error!(logger, "Retries exhausted for payment id {}", log_bytes!(payment_id.0));
 abandon_with_entry!(payment_id, res.1, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 payment.get_mut().increment_attempts();
Expand DownExpand Up@@ -749,14 +750,14 @@ impl OutboundPayments {
 match err {
 PaymentSendFailure::AllFailedResendSafe(errs) => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut route_params, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
 self.retry_payment_internal(payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: Some(mut retry), results, .. } => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut retry, route.paths, results.into_iter(), pending_events);
 // Some paths were sent, even if we failed to send the full MPP value our recipient may
 // misbehave and claim the funds, at which point we have to consider the payment sent, so
 // return `Ok()` here, ignoring any retry errors.
 self.retry_payment_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: None, .. } => {
 // This may happen if we send a payment and some paths fail, but only due to a temporary
Expand DownExpand Up@@ -1384,9 +1385,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(expired_route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), expired_route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), expired_route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand DownExpand Up@@ -1428,9 +1429,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Correct `outbound_payment` route-fetch calls to pass the hash + ID by TheBlueMatt · Pull Request #2092 · lightningdevkit/rust-lightning · GitHub
Skip to content
Correct outbound_payment route-fetch calls to pass the hash + ID#2092

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 2 commits into

from

Mar 9, 2023
 Merged


Correct outbound_payment route-fetch calls to pass the hash + ID
#2092
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6d6d200

Correct `outbound_payment` route-fetch calls to pass the hash + ID


TheBlueMatt Mar 9, 2023
10e6978

Further simplify the `outbound_payments` failure macro


TheBlueMatt Mar 9, 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


63 changes: 32 additions & 31 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ pub enum Retry {
	///
	/// Each attempt may be multiple HTLCs along multiple paths if the router decides to split up a
	/// retry, and may retry multiple failed HTLCs at once if they failed around the same time and
	/// were retried along a route from a single call to [`Router::find_route`].
	/// were retried along a route from a single call to [`Router::find_route_with_id`].
	Attempts(usize),
	#[cfg(not(feature = "no-std"))]
	/// Time elapsed before abandoning retries for a payment. At least one attempt at payment is made;
Expand DownExpand Up@@ -531,9 +531,9 @@ impl OutboundPayments {
 let mut retry_id_route_params = None;
 for (pmt_id, pmt) in outbounds.iter_mut() {
 if pmt.is_auto_retryable_now() {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), payment_hash, .. } = pmt {
 if pending_amt_msat < total_msat {
 retry_id_route_params = Some((*pmt_id, RouteParameters {
 retry_id_route_params = Some((*payment_hash, *pmt_id, RouteParameters {
 final_value_msat: *total_msat - *pending_amt_msat,
 payment_params: params.clone(),
 }));
Expand All@@ -543,8 +543,8 @@ impl OutboundPayments {
 }
 }
 core::mem::drop(outbounds);
 if let Some((payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 if let Some((payment_hash, payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 } else { break }
 }

Expand DownExpand Up@@ -597,9 +597,10 @@ impl OutboundPayments {
 }
 }

 let route = router.find_route(
 let route = router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ).map_err(|_| RetryableSendFailure::RouteNotFound)?;

 let onion_session_privs = self.add_new_pending_payment(payment_hash, *payment_secret,
Expand All@@ -617,10 +618,10 @@ impl OutboundPayments {
	}

	fn retry_payment_internal<R: Deref, NS: Deref, ES: Deref, IH, SP, L: Deref>(
 &self, payment_id: PaymentId, route_params: RouteParameters, router: &R,
 first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES, node_signer: &NS,
best_block_height: u32, logger: &L, pending_events: &Mutex<Vec<events::Event>>,
 send_payment_along_path: &SP,
 &self, payment_hash: PaymentHash, payment_id: PaymentId, route_params: RouteParameters,
router: &R, first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES,
node_signer: &NS, best_block_height: u32, logger: &L,
pending_events: &Mutex<Vec<events::Event>>, send_payment_along_path: &SP,
	)
	where
 R::Target: Router,
Expand All@@ -639,9 +640,10 @@ impl OutboundPayments {
 }
 }

 let route = match router.find_route(
 let route = match router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ) {
 Ok(route) => route,
 Err(e) => {
Expand All@@ -665,32 +667,31 @@ impl OutboundPayments {
 }

 macro_rules! abandon_with_entry {
 ($payment_id: expr, $payment_hash: expr, $payment: expr, $pending_events: expr) => {
 ($payment: expr) => {
 if $payment.get_mut().mark_abandoned().is_ok() && $payment.get().remaining_parts() == 0 {
$pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id: $payment_id,
 payment_hash: $payment_hash,
 pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id,
 payment_hash,
 });
 $payment.remove();
 }
 }
 }
 let (total_msat, payment_hash, payment_secret, keysend_preimage) = {
 let (total_msat, payment_secret, keysend_preimage) = {
 let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 match outbounds.entry(payment_id) {
 hash_map::Entry::Occupied(mut payment) => {
 let res = match payment.get() {
 PendingOutboundPayment::Retryable {
 total_msat, payment_hash, keysend_preimage, payment_secret, pending_amt_msat, ..
 total_msat, keysend_preimage, payment_secret, pending_amt_msat, ..
 } => {
 let retry_amt_msat: u64 = route.paths.iter().map(|path| path.last().unwrap().fee_msat).sum();
 if retry_amt_msat + *pending_amt_msat > *total_msat * (100 + RETRY_OVERFLOW_PERCENTAGE) / 100 {
 log_error!(logger, "retry_amt_msat of {} will put pending_amt_msat (currently: {}) more than 10% over total_payment_amt_msat of {}", retry_amt_msat, pending_amt_msat, total_msat);
 let payment_hash = *payment_hash;
 abandon_with_entry!(payment_id, payment_hash, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 (*total_msat, *payment_hash, *payment_secret, *keysend_preimage)
 (*total_msat, *payment_secret, *keysend_preimage)
 },
 PendingOutboundPayment::Legacy { .. } => {
 log_error!(logger, "Unable to retry payments that were initially sent on LDK versions prior to 0.0.102");
Expand All@@ -707,7 +708,7 @@ impl OutboundPayments {
 };
 if !payment.get().is_retryable_now() {
 log_error!(logger, "Retries exhausted for payment id {}", log_bytes!(payment_id.0));
 abandon_with_entry!(payment_id, res.1, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 payment.get_mut().increment_attempts();
Expand DownExpand Up@@ -749,14 +750,14 @@ impl OutboundPayments {
 match err {
 PaymentSendFailure::AllFailedResendSafe(errs) => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut route_params, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
 self.retry_payment_internal(payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: Some(mut retry), results, .. } => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut retry, route.paths, results.into_iter(), pending_events);
 // Some paths were sent, even if we failed to send the full MPP value our recipient may
 // misbehave and claim the funds, at which point we have to consider the payment sent, so
 // return `Ok()` here, ignoring any retry errors.
 self.retry_payment_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: None, .. } => {
 // This may happen if we send a payment and some paths fail, but only due to a temporary
Expand DownExpand Up@@ -1384,9 +1385,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(expired_route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), expired_route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), expired_route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand DownExpand Up@@ -1428,9 +1429,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Correct `outbound_payment` route-fetch calls to pass the hash + ID by TheBlueMatt · Pull Request #2092 · lightningdevkit/rust-lightning · GitHub
Skip to content
Correct outbound_payment route-fetch calls to pass the hash + ID#2092

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 2 commits into

from

Mar 9, 2023
 Merged


Correct outbound_payment route-fetch calls to pass the hash + ID
#2092
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6d6d200

Correct `outbound_payment` route-fetch calls to pass the hash + ID


TheBlueMatt Mar 9, 2023
10e6978

Further simplify the `outbound_payments` failure macro


TheBlueMatt Mar 9, 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


63 changes: 32 additions & 31 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ pub enum Retry {
	///
	/// Each attempt may be multiple HTLCs along multiple paths if the router decides to split up a
	/// retry, and may retry multiple failed HTLCs at once if they failed around the same time and
	/// were retried along a route from a single call to [`Router::find_route`].
	/// were retried along a route from a single call to [`Router::find_route_with_id`].
	Attempts(usize),
	#[cfg(not(feature = "no-std"))]
	/// Time elapsed before abandoning retries for a payment. At least one attempt at payment is made;
Expand DownExpand Up@@ -531,9 +531,9 @@ impl OutboundPayments {
 let mut retry_id_route_params = None;
 for (pmt_id, pmt) in outbounds.iter_mut() {
 if pmt.is_auto_retryable_now() {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), payment_hash, .. } = pmt {
 if pending_amt_msat < total_msat {
 retry_id_route_params = Some((*pmt_id, RouteParameters {
 retry_id_route_params = Some((*payment_hash, *pmt_id, RouteParameters {
 final_value_msat: *total_msat - *pending_amt_msat,
 payment_params: params.clone(),
 }));
Expand All@@ -543,8 +543,8 @@ impl OutboundPayments {
 }
 }
 core::mem::drop(outbounds);
 if let Some((payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 if let Some((payment_hash, payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 } else { break }
 }

Expand DownExpand Up@@ -597,9 +597,10 @@ impl OutboundPayments {
 }
 }

 let route = router.find_route(
 let route = router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ).map_err(|_| RetryableSendFailure::RouteNotFound)?;

 let onion_session_privs = self.add_new_pending_payment(payment_hash, *payment_secret,
Expand All@@ -617,10 +618,10 @@ impl OutboundPayments {
	}

	fn retry_payment_internal<R: Deref, NS: Deref, ES: Deref, IH, SP, L: Deref>(
 &self, payment_id: PaymentId, route_params: RouteParameters, router: &R,
 first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES, node_signer: &NS,
best_block_height: u32, logger: &L, pending_events: &Mutex<Vec<events::Event>>,
 send_payment_along_path: &SP,
 &self, payment_hash: PaymentHash, payment_id: PaymentId, route_params: RouteParameters,
router: &R, first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES,
node_signer: &NS, best_block_height: u32, logger: &L,
pending_events: &Mutex<Vec<events::Event>>, send_payment_along_path: &SP,
	)
	where
 R::Target: Router,
Expand All@@ -639,9 +640,10 @@ impl OutboundPayments {
 }
 }

 let route = match router.find_route(
 let route = match router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ) {
 Ok(route) => route,
 Err(e) => {
Expand All@@ -665,32 +667,31 @@ impl OutboundPayments {
 }

 macro_rules! abandon_with_entry {
 ($payment_id: expr, $payment_hash: expr, $payment: expr, $pending_events: expr) => {
 ($payment: expr) => {
 if $payment.get_mut().mark_abandoned().is_ok() && $payment.get().remaining_parts() == 0 {
$pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id: $payment_id,
 payment_hash: $payment_hash,
 pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id,
 payment_hash,
 });
 $payment.remove();
 }
 }
 }
 let (total_msat, payment_hash, payment_secret, keysend_preimage) = {
 let (total_msat, payment_secret, keysend_preimage) = {
 let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 match outbounds.entry(payment_id) {
 hash_map::Entry::Occupied(mut payment) => {
 let res = match payment.get() {
 PendingOutboundPayment::Retryable {
 total_msat, payment_hash, keysend_preimage, payment_secret, pending_amt_msat, ..
 total_msat, keysend_preimage, payment_secret, pending_amt_msat, ..
 } => {
 let retry_amt_msat: u64 = route.paths.iter().map(|path| path.last().unwrap().fee_msat).sum();
 if retry_amt_msat + *pending_amt_msat > *total_msat * (100 + RETRY_OVERFLOW_PERCENTAGE) / 100 {
 log_error!(logger, "retry_amt_msat of {} will put pending_amt_msat (currently: {}) more than 10% over total_payment_amt_msat of {}", retry_amt_msat, pending_amt_msat, total_msat);
 let payment_hash = *payment_hash;
 abandon_with_entry!(payment_id, payment_hash, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 (*total_msat, *payment_hash, *payment_secret, *keysend_preimage)
 (*total_msat, *payment_secret, *keysend_preimage)
 },
 PendingOutboundPayment::Legacy { .. } => {
 log_error!(logger, "Unable to retry payments that were initially sent on LDK versions prior to 0.0.102");
Expand All@@ -707,7 +708,7 @@ impl OutboundPayments {
 };
 if !payment.get().is_retryable_now() {
 log_error!(logger, "Retries exhausted for payment id {}", log_bytes!(payment_id.0));
 abandon_with_entry!(payment_id, res.1, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 payment.get_mut().increment_attempts();
Expand DownExpand Up@@ -749,14 +750,14 @@ impl OutboundPayments {
 match err {
 PaymentSendFailure::AllFailedResendSafe(errs) => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut route_params, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
 self.retry_payment_internal(payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: Some(mut retry), results, .. } => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut retry, route.paths, results.into_iter(), pending_events);
 // Some paths were sent, even if we failed to send the full MPP value our recipient may
 // misbehave and claim the funds, at which point we have to consider the payment sent, so
 // return `Ok()` here, ignoring any retry errors.
 self.retry_payment_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: None, .. } => {
 // This may happen if we send a payment and some paths fail, but only due to a temporary
Expand DownExpand Up@@ -1384,9 +1385,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(expired_route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), expired_route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), expired_route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand DownExpand Up@@ -1428,9 +1429,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Correct `outbound_payment` route-fetch calls to pass the hash + ID by TheBlueMatt · Pull Request #2092 · lightningdevkit/rust-lightning · GitHub
Skip to content
Correct outbound_payment route-fetch calls to pass the hash + ID#2092

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 2 commits into

from

Mar 9, 2023
 Merged


Correct outbound_payment route-fetch calls to pass the hash + ID
#2092
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6d6d200

Correct `outbound_payment` route-fetch calls to pass the hash + ID


TheBlueMatt Mar 9, 2023
10e6978

Further simplify the `outbound_payments` failure macro


TheBlueMatt Mar 9, 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


63 changes: 32 additions & 31 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ pub enum Retry {
	///
	/// Each attempt may be multiple HTLCs along multiple paths if the router decides to split up a
	/// retry, and may retry multiple failed HTLCs at once if they failed around the same time and
	/// were retried along a route from a single call to [`Router::find_route`].
	/// were retried along a route from a single call to [`Router::find_route_with_id`].
	Attempts(usize),
	#[cfg(not(feature = "no-std"))]
	/// Time elapsed before abandoning retries for a payment. At least one attempt at payment is made;
Expand DownExpand Up@@ -531,9 +531,9 @@ impl OutboundPayments {
 let mut retry_id_route_params = None;
 for (pmt_id, pmt) in outbounds.iter_mut() {
 if pmt.is_auto_retryable_now() {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
 if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), payment_hash, .. } = pmt {
 if pending_amt_msat < total_msat {
 retry_id_route_params = Some((*pmt_id, RouteParameters {
 retry_id_route_params = Some((*payment_hash, *pmt_id, RouteParameters {
 final_value_msat: *total_msat - *pending_amt_msat,
 payment_params: params.clone(),
 }));
Expand All@@ -543,8 +543,8 @@ impl OutboundPayments {
 }
 }
 core::mem::drop(outbounds);
 if let Some((payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 if let Some((payment_hash, payment_id, route_params)) = retry_id_route_params {
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops(), &inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, &send_payment_along_path)
 } else { break }
 }

Expand DownExpand Up@@ -597,9 +597,10 @@ impl OutboundPayments {
 }
 }

 let route = router.find_route(
 let route = router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ).map_err(|_| RetryableSendFailure::RouteNotFound)?;

 let onion_session_privs = self.add_new_pending_payment(payment_hash, *payment_secret,
Expand All@@ -617,10 +618,10 @@ impl OutboundPayments {
	}

	fn retry_payment_internal<R: Deref, NS: Deref, ES: Deref, IH, SP, L: Deref>(
 &self, payment_id: PaymentId, route_params: RouteParameters, router: &R,
 first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES, node_signer: &NS,
best_block_height: u32, logger: &L, pending_events: &Mutex<Vec<events::Event>>,
 send_payment_along_path: &SP,
 &self, payment_hash: PaymentHash, payment_id: PaymentId, route_params: RouteParameters,
router: &R, first_hops: Vec<ChannelDetails>, inflight_htlcs: &IH, entropy_source: &ES,
node_signer: &NS, best_block_height: u32, logger: &L,
pending_events: &Mutex<Vec<events::Event>>, send_payment_along_path: &SP,
	)
	where
 R::Target: Router,
Expand All@@ -639,9 +640,10 @@ impl OutboundPayments {
 }
 }

 let route = match router.find_route(
 let route = match router.find_route_with_id(
 &node_signer.get_node_id(Recipient::Node).unwrap(), &route_params,
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs()
 Some(&first_hops.iter().collect::<Vec<_>>()), &inflight_htlcs(),
 payment_hash, payment_id,
 ) {
 Ok(route) => route,
 Err(e) => {
Expand All@@ -665,32 +667,31 @@ impl OutboundPayments {
 }

 macro_rules! abandon_with_entry {
 ($payment_id: expr, $payment_hash: expr, $payment: expr, $pending_events: expr) => {
 ($payment: expr) => {
 if $payment.get_mut().mark_abandoned().is_ok() && $payment.get().remaining_parts() == 0 {
$pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id: $payment_id,
 payment_hash: $payment_hash,
 pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 payment_id,
 payment_hash,
 });
 $payment.remove();
 }
 }
 }
 let (total_msat, payment_hash, payment_secret, keysend_preimage) = {
 let (total_msat, payment_secret, keysend_preimage) = {
 let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 match outbounds.entry(payment_id) {
 hash_map::Entry::Occupied(mut payment) => {
 let res = match payment.get() {
 PendingOutboundPayment::Retryable {
 total_msat, payment_hash, keysend_preimage, payment_secret, pending_amt_msat, ..
 total_msat, keysend_preimage, payment_secret, pending_amt_msat, ..
 } => {
 let retry_amt_msat: u64 = route.paths.iter().map(|path| path.last().unwrap().fee_msat).sum();
 if retry_amt_msat + *pending_amt_msat > *total_msat * (100 + RETRY_OVERFLOW_PERCENTAGE) / 100 {
 log_error!(logger, "retry_amt_msat of {} will put pending_amt_msat (currently: {}) more than 10% over total_payment_amt_msat of {}", retry_amt_msat, pending_amt_msat, total_msat);
 let payment_hash = *payment_hash;
 abandon_with_entry!(payment_id, payment_hash, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 (*total_msat, *payment_hash, *payment_secret, *keysend_preimage)
 (*total_msat, *payment_secret, *keysend_preimage)
 },
 PendingOutboundPayment::Legacy { .. } => {
 log_error!(logger, "Unable to retry payments that were initially sent on LDK versions prior to 0.0.102");
Expand All@@ -707,7 +708,7 @@ impl OutboundPayments {
 };
 if !payment.get().is_retryable_now() {
 log_error!(logger, "Retries exhausted for payment id {}", log_bytes!(payment_id.0));
 abandon_with_entry!(payment_id, res.1, payment, pending_events);
 abandon_with_entry!(payment);
 return
 }
 payment.get_mut().increment_attempts();
Expand DownExpand Up@@ -749,14 +750,14 @@ impl OutboundPayments {
 match err {
 PaymentSendFailure::AllFailedResendSafe(errs) => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut route_params, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
 self.retry_payment_internal(payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: Some(mut retry), results, .. } => {
 Self::push_path_failed_evs_and_scids(payment_id, payment_hash, &mut retry, route.paths, results.into_iter(), pending_events);
 // Some paths were sent, even if we failed to send the full MPP value our recipient may
 // misbehave and claim the funds, at which point we have to consider the payment sent, so
 // return `Ok()` here, ignoring any retry errors.
 self.retry_payment_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 self.retry_payment_internal(payment_hash, payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 },
 PaymentSendFailure::PartialFailure { failed_paths_retry: None, .. } => {
 // This may happen if we send a payment and some paths fail, but only due to a temporary
Expand DownExpand Up@@ -1384,9 +1385,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(expired_route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), expired_route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), expired_route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand DownExpand Up@@ -1428,9 +1429,9 @@ mod tests {
 &Route { paths: vec![], payment_params: None }, Some(Retry::Attempts(1)),
 Some(route_params.payment_params.clone()), &&keys_manager, 0).unwrap();
 outbound_payments.retry_payment_internal(
 PaymentId([0; 32]), route_params, &&router, vec![], &|| InFlightHtlcs::new(),
 &&keys_manager, &&keys_manager, 0, &&logger, &pending_events,
 &|_, _, _, _, _, _, _, _, _| Ok(()));
PaymentHash([0; 32]), PaymentId([0; 32]), route_params, &&router, vec![],
 &|| InFlightHtlcs::new(), &&keys_manager, &&keys_manager, 0, &&logger,
 &pending_events, &|_, _, _, _, _, _, _, _, _| Ok(()));
 let events = pending_events.lock().unwrap();
 assert_eq!(events.len(), 1);
 if let Event::PaymentFailed { .. } = events[0] { } else { panic!("Unexpected event"); }
Expand Down