Skip to content

Log additional details when ignoring first hops #2771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Log additional details when ignoring first hops #2771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 43 additions & 6 deletions lightning/src/routing/router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1795,12 +1795,12 @@ where L::Target: Logger {
let payment_failed_on_this_channel = scid_opt.map_or(false,
|scid| payment_params.previously_failed_channels.contains(&scid));

let should_log_candidate = match $candidate {
CandidateRouteHop::FirstHop { .. } => true,
CandidateRouteHop::PrivateHop { .. } => true,
CandidateRouteHop::Blinded { .. } => true,
CandidateRouteHop::OneHopBlinded { .. } => true,
_ => false,
let (should_log_candidate, first_hop_details) = match $candidate {
CandidateRouteHop::FirstHop { details } => (true, Some(details)),
CandidateRouteHop::PrivateHop { .. } => (true, None),
CandidateRouteHop::Blinded { .. } => (true, None),
CandidateRouteHop::OneHopBlinded { .. } => (true, None),
_ => (false, None),
};

// If HTLC minimum is larger than the amount we're going to transfer, we shouldn't
Expand All @@ -1810,6 +1810,13 @@ where L::Target: Logger {
if !contributes_sufficient_value {
if should_log_candidate {
log_trace!(logger, "Ignoring {} due to insufficient value contribution.", LoggedCandidateHop(&$candidate));

if let Some(details) = first_hop_details {
log_trace!(logger,
"First hop candidate next_outbound_htlc_limit_msat: {}",
details.next_outbound_htlc_limit_msat,
);
}
}
num_ignored_value_contribution += 1;
} else if exceeds_max_path_length {
Expand All @@ -1820,6 +1827,14 @@ where L::Target: Logger {
} else if exceeds_cltv_delta_limit {
if should_log_candidate {
log_trace!(logger, "Ignoring {} due to exceeding CLTV delta limit.", LoggedCandidateHop(&$candidate));

if let Some(_) = first_hop_details {
log_trace!(logger,
"First hop candidate cltv_expiry_delta: {}. Limit: {}",
hop_total_cltv_delta,
max_total_cltv_expiry_delta,
);
}
}
num_ignored_cltv_delta_limit += 1;
} else if payment_failed_on_this_channel {
Expand All @@ -1832,6 +1847,13 @@ where L::Target: Logger {
log_trace!(logger,
"Ignoring {} to avoid overpaying to meet htlc_minimum_msat limit.",
LoggedCandidateHop(&$candidate));

if let Some(details) = first_hop_details {
log_trace!(logger,
"First hop candidate next_outbound_htlc_minimum_msat: {}",
details.next_outbound_htlc_minimum_msat,
);
}
}
num_ignored_avoid_overpayment += 1;
hit_minimum_limit = true;
Expand Down Expand Up @@ -1893,6 +1915,14 @@ where L::Target: Logger {
if total_fee_msat > max_total_routing_fee_msat {
if should_log_candidate {
log_trace!(logger, "Ignoring {} due to exceeding max total routing fee limit.", LoggedCandidateHop(&$candidate));

if let Some(_) = first_hop_details {
log_trace!(logger,
"First hop candidate routing fee: {}. Limit: {}",
total_fee_msat,
max_total_routing_fee_msat,
);
}
}
num_ignored_total_fee_limit += 1;
} else {
Expand Down Expand Up @@ -1988,6 +2018,13 @@ where L::Target: Logger {
log_trace!(logger,
"Ignoring {} due to its htlc_minimum_msat limit.",
LoggedCandidateHop(&$candidate));

if let Some(details) = first_hop_details {
log_trace!(logger,
"First hop candidate next_outbound_htlc_minimum_msat: {}",
details.next_outbound_htlc_minimum_msat,
);
}
}
num_ignored_htlc_minimum_msat_limit += 1;
}
Expand Down