Skip to content

Router: Ensure used liquidity is always limited by hop's htlc_max#3553

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

Closed
tnull wants to merge 1 commit into from
Closed

Router: Ensure used liquidity is always limited by hop's htlc_max#3553

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
56 changes: 35 additions & 21 deletions lightning/src/routing/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2367,7 +2367,7 @@ where L::Target: Logger {
.map_or(0, |used_liquidity_msat| {
available_value_contribution_msat = available_value_contribution_msat
.saturating_sub(*used_liquidity_msat);
*used_liquidity_msat
(*used_liquidity_msat)
});

// Verify the liquidity offered by this channel complies to the minimal contribution.
Expand DownExpand Up@@ -2809,6 +2809,7 @@ where L::Target: Logger {
introduction_node_id_cache.len(),
"introduction_node_id_cache was built by iterating the blinded_route_hints, so they should be the same len"
);
let mut value_contributions = Vec::with_capacity(payment_params.payee.blinded_route_hints().len());
for (hint_idx, hint) in payment_params.payee.blinded_route_hints().iter().enumerate() {
// Only add the hops in this route to our candidate set if either
// we have a direct channel to the first hop or the first hop is
Expand All@@ -2823,29 +2824,39 @@ where L::Target: Logger {
} else {
CandidateRouteHop::Blinded(BlindedPathCandidate { source_node_counter, source_node_id, hint, hint_idx })
};
let mut path_contribution_msat = path_value_msat;
if let Some(hop_used_msat) = add_entry!(&candidate,
0, path_contribution_msat, 0, 0_u64, 0, 0)
0, path_value_msat, 0, 0_u64, 0, 0)
{
path_contribution_msat = hop_used_msat;
value_contributions.push((hint_idx, hop_used_msat));
} else { continue }
if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
sort_first_hop_channels(
first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
);
for details in first_channels {
let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
details, payer_node_id: &our_node_id, payer_node_counter,
target_node_counter: *peer_node_counter,
});
let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
Some(fee) => fee,
None => continue
};
let path_min = candidate.htlc_minimum_msat().saturating_add(
compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
0_u64, candidate.cltv_expiry_delta(), 0);
}
for (hint_idx, path_contribution_msat) in value_contributions {
// Only add the hops in this route to our candidate set if either
// we have a direct channel to the first hop or the first hop is
// in the regular network graph.
let source_node_opt = introduction_node_id_cache[hint_idx];
let (source_node_id, source_node_counter) = if let Some(v) = source_node_opt { v } else { continue };
if our_node_id == *source_node_id { continue }
if let Some(hop_candidate) = dist[source_node_counter as usize].as_ref() {
let candidate = hop_candidate.candidate.clone();
if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
sort_first_hop_channels(
first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
);
for details in first_channels {
let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
details, payer_node_id: &our_node_id, payer_node_counter,
target_node_counter: *peer_node_counter,
});
let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
Some(fee) => fee,
None => continue
};
let path_min = candidate.htlc_minimum_msat().saturating_add(
compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
0_u64, candidate.cltv_expiry_delta(), 0);
}
}
}
}
Expand DownExpand Up@@ -3114,17 +3125,20 @@ where L::Target: Logger {
let mut prevented_redundant_path_selection = false;
for (hop, _) in payment_path.hops.iter() {
let spent_on_hop_msat = value_contribution_msat + hop.next_hops_fee_msat;
println!("SPENT: {} = VALUE {} + NEXT_FEE {}", spent_on_hop_msat, value_contribution_msat, hop.next_hops_fee_msat);
let used_liquidity_msat = used_liquidities
.entry(hop.candidate.id())
.and_modify(|used_liquidity_msat| *used_liquidity_msat += spent_on_hop_msat)
.or_insert(spent_on_hop_msat);
let hop_capacity = hop.candidate.effective_capacity();
println!("CAP: {}, USED: {}", spent_on_hop_msat, used_liquidity_msat);
let hop_max_msat = max_htlc_from_capacity(hop_capacity, channel_saturation_pow_half);
if *used_liquidity_msat == hop_max_msat {
// If this path used all of this channel's available liquidity, we know
// this path will not be selected again in the next loop iteration.
prevented_redundant_path_selection = true;
}
println!("USED: {}, hop_max_msat: {}", used_liquidity_msat, hop_max_msat);
debug_assert!(*used_liquidity_msat <= hop_max_msat);
}
if !prevented_redundant_path_selection {
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" + '
Router: Ensure used liquidity is always limited by hop's `htlc_max` by tnull · Pull Request #3553 · lightningdevkit/rust-lightning · GitHub
Skip to content
Router: Ensure used liquidity is always limited by hop's htlc_max#3553

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

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Router: Ensure used liquidity is always limited by hop's htlc_max#3553
 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


56 changes: 35 additions & 21 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2367,7 +2367,7 @@ where L::Target: Logger {
 .map_or(0, |used_liquidity_msat| {
 available_value_contribution_msat = available_value_contribution_msat
 .saturating_sub(*used_liquidity_msat);
 *used_liquidity_msat
(*used_liquidity_msat)
 });

 // Verify the liquidity offered by this channel complies to the minimal contribution.
Expand DownExpand Up@@ -2809,6 +2809,7 @@ where L::Target: Logger {
 introduction_node_id_cache.len(),
 "introduction_node_id_cache was built by iterating the blinded_route_hints, so they should be the same len"
 );
 let mut value_contributions = Vec::with_capacity(payment_params.payee.blinded_route_hints().len());
 for (hint_idx, hint) in payment_params.payee.blinded_route_hints().iter().enumerate() {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
Expand All@@ -2823,29 +2824,39 @@ where L::Target: Logger {
 } else {
 CandidateRouteHop::Blinded(BlindedPathCandidate { source_node_counter, source_node_id, hint, hint_idx })
 };
 let mut path_contribution_msat = path_value_msat;
 if let Some(hop_used_msat) = add_entry!(&candidate,
 0, path_contribution_msat, 0, 0_u64, 0, 0)
 0, path_value_msat, 0, 0_u64, 0, 0)
 {
path_contribution_msat = hop_used_msat;
value_contributions.push((hint_idx, hop_used_msat));
 } else { continue }
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 for (hint_idx, path_contribution_msat) in value_contributions {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
 // in the regular network graph.
 let source_node_opt = introduction_node_id_cache[hint_idx];
 let (source_node_id, source_node_counter) = if let Some(v) = source_node_opt { v } else { continue };
 if our_node_id == *source_node_id { continue }
 if let Some(hop_candidate) = dist[source_node_counter as usize].as_ref() {
 let candidate = hop_candidate.candidate.clone();
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 }
 }
 }
Expand DownExpand Up@@ -3114,17 +3125,20 @@ where L::Target: Logger {
 let mut prevented_redundant_path_selection = false;
 for (hop, _) in payment_path.hops.iter() {
 let spent_on_hop_msat = value_contribution_msat + hop.next_hops_fee_msat;
 println!("SPENT: {} = VALUE {} + NEXT_FEE {}", spent_on_hop_msat, value_contribution_msat, hop.next_hops_fee_msat);
 let used_liquidity_msat = used_liquidities
 .entry(hop.candidate.id())
 .and_modify(|used_liquidity_msat| *used_liquidity_msat += spent_on_hop_msat)
 .or_insert(spent_on_hop_msat);
 let hop_capacity = hop.candidate.effective_capacity();
 println!("CAP: {}, USED: {}", spent_on_hop_msat, used_liquidity_msat);
 let hop_max_msat = max_htlc_from_capacity(hop_capacity, channel_saturation_pow_half);
 if *used_liquidity_msat == hop_max_msat {
 // If this path used all of this channel's available liquidity, we know
 // this path will not be selected again in the next loop iteration.
 prevented_redundant_path_selection = true;
 }
 println!("USED: {}, hop_max_msat: {}", used_liquidity_msat, hop_max_msat);
 debug_assert!(*used_liquidity_msat <= hop_max_msat);
 }
 if !prevented_redundant_path_selection {
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('^' + ".*" + '
Router: Ensure used liquidity is always limited by hop's `htlc_max` by tnull · Pull Request #3553 · lightningdevkit/rust-lightning · GitHub
Skip to content
Router: Ensure used liquidity is always limited by hop's htlc_max#3553

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

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Router: Ensure used liquidity is always limited by hop's htlc_max#3553
 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


56 changes: 35 additions & 21 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2367,7 +2367,7 @@ where L::Target: Logger {
 .map_or(0, |used_liquidity_msat| {
 available_value_contribution_msat = available_value_contribution_msat
 .saturating_sub(*used_liquidity_msat);
 *used_liquidity_msat
(*used_liquidity_msat)
 });

 // Verify the liquidity offered by this channel complies to the minimal contribution.
Expand DownExpand Up@@ -2809,6 +2809,7 @@ where L::Target: Logger {
 introduction_node_id_cache.len(),
 "introduction_node_id_cache was built by iterating the blinded_route_hints, so they should be the same len"
 );
 let mut value_contributions = Vec::with_capacity(payment_params.payee.blinded_route_hints().len());
 for (hint_idx, hint) in payment_params.payee.blinded_route_hints().iter().enumerate() {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
Expand All@@ -2823,29 +2824,39 @@ where L::Target: Logger {
 } else {
 CandidateRouteHop::Blinded(BlindedPathCandidate { source_node_counter, source_node_id, hint, hint_idx })
 };
 let mut path_contribution_msat = path_value_msat;
 if let Some(hop_used_msat) = add_entry!(&candidate,
 0, path_contribution_msat, 0, 0_u64, 0, 0)
 0, path_value_msat, 0, 0_u64, 0, 0)
 {
path_contribution_msat = hop_used_msat;
value_contributions.push((hint_idx, hop_used_msat));
 } else { continue }
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 for (hint_idx, path_contribution_msat) in value_contributions {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
 // in the regular network graph.
 let source_node_opt = introduction_node_id_cache[hint_idx];
 let (source_node_id, source_node_counter) = if let Some(v) = source_node_opt { v } else { continue };
 if our_node_id == *source_node_id { continue }
 if let Some(hop_candidate) = dist[source_node_counter as usize].as_ref() {
 let candidate = hop_candidate.candidate.clone();
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 }
 }
 }
Expand DownExpand Up@@ -3114,17 +3125,20 @@ where L::Target: Logger {
 let mut prevented_redundant_path_selection = false;
 for (hop, _) in payment_path.hops.iter() {
 let spent_on_hop_msat = value_contribution_msat + hop.next_hops_fee_msat;
 println!("SPENT: {} = VALUE {} + NEXT_FEE {}", spent_on_hop_msat, value_contribution_msat, hop.next_hops_fee_msat);
 let used_liquidity_msat = used_liquidities
 .entry(hop.candidate.id())
 .and_modify(|used_liquidity_msat| *used_liquidity_msat += spent_on_hop_msat)
 .or_insert(spent_on_hop_msat);
 let hop_capacity = hop.candidate.effective_capacity();
 println!("CAP: {}, USED: {}", spent_on_hop_msat, used_liquidity_msat);
 let hop_max_msat = max_htlc_from_capacity(hop_capacity, channel_saturation_pow_half);
 if *used_liquidity_msat == hop_max_msat {
 // If this path used all of this channel's available liquidity, we know
 // this path will not be selected again in the next loop iteration.
 prevented_redundant_path_selection = true;
 }
 println!("USED: {}, hop_max_msat: {}", used_liquidity_msat, hop_max_msat);
 debug_assert!(*used_liquidity_msat <= hop_max_msat);
 }
 if !prevented_redundant_path_selection {
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('^' + ".*" + '
Router: Ensure used liquidity is always limited by hop's `htlc_max` by tnull · Pull Request #3553 · lightningdevkit/rust-lightning · GitHub
Skip to content
Router: Ensure used liquidity is always limited by hop's htlc_max#3553

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

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Router: Ensure used liquidity is always limited by hop's htlc_max#3553
 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


56 changes: 35 additions & 21 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2367,7 +2367,7 @@ where L::Target: Logger {
 .map_or(0, |used_liquidity_msat| {
 available_value_contribution_msat = available_value_contribution_msat
 .saturating_sub(*used_liquidity_msat);
 *used_liquidity_msat
(*used_liquidity_msat)
 });

 // Verify the liquidity offered by this channel complies to the minimal contribution.
Expand DownExpand Up@@ -2809,6 +2809,7 @@ where L::Target: Logger {
 introduction_node_id_cache.len(),
 "introduction_node_id_cache was built by iterating the blinded_route_hints, so they should be the same len"
 );
 let mut value_contributions = Vec::with_capacity(payment_params.payee.blinded_route_hints().len());
 for (hint_idx, hint) in payment_params.payee.blinded_route_hints().iter().enumerate() {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
Expand All@@ -2823,29 +2824,39 @@ where L::Target: Logger {
 } else {
 CandidateRouteHop::Blinded(BlindedPathCandidate { source_node_counter, source_node_id, hint, hint_idx })
 };
 let mut path_contribution_msat = path_value_msat;
 if let Some(hop_used_msat) = add_entry!(&candidate,
 0, path_contribution_msat, 0, 0_u64, 0, 0)
 0, path_value_msat, 0, 0_u64, 0, 0)
 {
path_contribution_msat = hop_used_msat;
value_contributions.push((hint_idx, hop_used_msat));
 } else { continue }
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 for (hint_idx, path_contribution_msat) in value_contributions {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
 // in the regular network graph.
 let source_node_opt = introduction_node_id_cache[hint_idx];
 let (source_node_id, source_node_counter) = if let Some(v) = source_node_opt { v } else { continue };
 if our_node_id == *source_node_id { continue }
 if let Some(hop_candidate) = dist[source_node_counter as usize].as_ref() {
 let candidate = hop_candidate.candidate.clone();
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 }
 }
 }
Expand DownExpand Up@@ -3114,17 +3125,20 @@ where L::Target: Logger {
 let mut prevented_redundant_path_selection = false;
 for (hop, _) in payment_path.hops.iter() {
 let spent_on_hop_msat = value_contribution_msat + hop.next_hops_fee_msat;
 println!("SPENT: {} = VALUE {} + NEXT_FEE {}", spent_on_hop_msat, value_contribution_msat, hop.next_hops_fee_msat);
 let used_liquidity_msat = used_liquidities
 .entry(hop.candidate.id())
 .and_modify(|used_liquidity_msat| *used_liquidity_msat += spent_on_hop_msat)
 .or_insert(spent_on_hop_msat);
 let hop_capacity = hop.candidate.effective_capacity();
 println!("CAP: {}, USED: {}", spent_on_hop_msat, used_liquidity_msat);
 let hop_max_msat = max_htlc_from_capacity(hop_capacity, channel_saturation_pow_half);
 if *used_liquidity_msat == hop_max_msat {
 // If this path used all of this channel's available liquidity, we know
 // this path will not be selected again in the next loop iteration.
 prevented_redundant_path_selection = true;
 }
 println!("USED: {}, hop_max_msat: {}", used_liquidity_msat, hop_max_msat);
 debug_assert!(*used_liquidity_msat <= hop_max_msat);
 }
 if !prevented_redundant_path_selection {
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" + '
Router: Ensure used liquidity is always limited by hop's `htlc_max` by tnull · Pull Request #3553 · lightningdevkit/rust-lightning · GitHub
Skip to content
Router: Ensure used liquidity is always limited by hop's htlc_max#3553

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

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Router: Ensure used liquidity is always limited by hop's htlc_max#3553
 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


56 changes: 35 additions & 21 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2367,7 +2367,7 @@ where L::Target: Logger {
 .map_or(0, |used_liquidity_msat| {
 available_value_contribution_msat = available_value_contribution_msat
 .saturating_sub(*used_liquidity_msat);
 *used_liquidity_msat
(*used_liquidity_msat)
 });

 // Verify the liquidity offered by this channel complies to the minimal contribution.
Expand DownExpand Up@@ -2809,6 +2809,7 @@ where L::Target: Logger {
 introduction_node_id_cache.len(),
 "introduction_node_id_cache was built by iterating the blinded_route_hints, so they should be the same len"
 );
 let mut value_contributions = Vec::with_capacity(payment_params.payee.blinded_route_hints().len());
 for (hint_idx, hint) in payment_params.payee.blinded_route_hints().iter().enumerate() {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
Expand All@@ -2823,29 +2824,39 @@ where L::Target: Logger {
 } else {
 CandidateRouteHop::Blinded(BlindedPathCandidate { source_node_counter, source_node_id, hint, hint_idx })
 };
 let mut path_contribution_msat = path_value_msat;
 if let Some(hop_used_msat) = add_entry!(&candidate,
 0, path_contribution_msat, 0, 0_u64, 0, 0)
 0, path_value_msat, 0, 0_u64, 0, 0)
 {
path_contribution_msat = hop_used_msat;
value_contributions.push((hint_idx, hop_used_msat));
 } else { continue }
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 for (hint_idx, path_contribution_msat) in value_contributions {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
 // in the regular network graph.
 let source_node_opt = introduction_node_id_cache[hint_idx];
 let (source_node_id, source_node_counter) = if let Some(v) = source_node_opt { v } else { continue };
 if our_node_id == *source_node_id { continue }
 if let Some(hop_candidate) = dist[source_node_counter as usize].as_ref() {
 let candidate = hop_candidate.candidate.clone();
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 }
 }
 }
Expand DownExpand Up@@ -3114,17 +3125,20 @@ where L::Target: Logger {
 let mut prevented_redundant_path_selection = false;
 for (hop, _) in payment_path.hops.iter() {
 let spent_on_hop_msat = value_contribution_msat + hop.next_hops_fee_msat;
 println!("SPENT: {} = VALUE {} + NEXT_FEE {}", spent_on_hop_msat, value_contribution_msat, hop.next_hops_fee_msat);
 let used_liquidity_msat = used_liquidities
 .entry(hop.candidate.id())
 .and_modify(|used_liquidity_msat| *used_liquidity_msat += spent_on_hop_msat)
 .or_insert(spent_on_hop_msat);
 let hop_capacity = hop.candidate.effective_capacity();
 println!("CAP: {}, USED: {}", spent_on_hop_msat, used_liquidity_msat);
 let hop_max_msat = max_htlc_from_capacity(hop_capacity, channel_saturation_pow_half);
 if *used_liquidity_msat == hop_max_msat {
 // If this path used all of this channel's available liquidity, we know
 // this path will not be selected again in the next loop iteration.
 prevented_redundant_path_selection = true;
 }
 println!("USED: {}, hop_max_msat: {}", used_liquidity_msat, hop_max_msat);
 debug_assert!(*used_liquidity_msat <= hop_max_msat);
 }
 if !prevented_redundant_path_selection {
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('^' + ".*" + '
Router: Ensure used liquidity is always limited by hop's `htlc_max` by tnull · Pull Request #3553 · lightningdevkit/rust-lightning · GitHub
Skip to content
Router: Ensure used liquidity is always limited by hop's htlc_max#3553

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

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Router: Ensure used liquidity is always limited by hop's htlc_max#3553
 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


56 changes: 35 additions & 21 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2367,7 +2367,7 @@ where L::Target: Logger {
 .map_or(0, |used_liquidity_msat| {
 available_value_contribution_msat = available_value_contribution_msat
 .saturating_sub(*used_liquidity_msat);
 *used_liquidity_msat
(*used_liquidity_msat)
 });

 // Verify the liquidity offered by this channel complies to the minimal contribution.
Expand DownExpand Up@@ -2809,6 +2809,7 @@ where L::Target: Logger {
 introduction_node_id_cache.len(),
 "introduction_node_id_cache was built by iterating the blinded_route_hints, so they should be the same len"
 );
 let mut value_contributions = Vec::with_capacity(payment_params.payee.blinded_route_hints().len());
 for (hint_idx, hint) in payment_params.payee.blinded_route_hints().iter().enumerate() {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
Expand All@@ -2823,29 +2824,39 @@ where L::Target: Logger {
 } else {
 CandidateRouteHop::Blinded(BlindedPathCandidate { source_node_counter, source_node_id, hint, hint_idx })
 };
 let mut path_contribution_msat = path_value_msat;
 if let Some(hop_used_msat) = add_entry!(&candidate,
 0, path_contribution_msat, 0, 0_u64, 0, 0)
 0, path_value_msat, 0, 0_u64, 0, 0)
 {
path_contribution_msat = hop_used_msat;
value_contributions.push((hint_idx, hop_used_msat));
 } else { continue }
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 for (hint_idx, path_contribution_msat) in value_contributions {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
 // in the regular network graph.
 let source_node_opt = introduction_node_id_cache[hint_idx];
 let (source_node_id, source_node_counter) = if let Some(v) = source_node_opt { v } else { continue };
 if our_node_id == *source_node_id { continue }
 if let Some(hop_candidate) = dist[source_node_counter as usize].as_ref() {
 let candidate = hop_candidate.candidate.clone();
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 }
 }
 }
Expand DownExpand Up@@ -3114,17 +3125,20 @@ where L::Target: Logger {
 let mut prevented_redundant_path_selection = false;
 for (hop, _) in payment_path.hops.iter() {
 let spent_on_hop_msat = value_contribution_msat + hop.next_hops_fee_msat;
 println!("SPENT: {} = VALUE {} + NEXT_FEE {}", spent_on_hop_msat, value_contribution_msat, hop.next_hops_fee_msat);
 let used_liquidity_msat = used_liquidities
 .entry(hop.candidate.id())
 .and_modify(|used_liquidity_msat| *used_liquidity_msat += spent_on_hop_msat)
 .or_insert(spent_on_hop_msat);
 let hop_capacity = hop.candidate.effective_capacity();
 println!("CAP: {}, USED: {}", spent_on_hop_msat, used_liquidity_msat);
 let hop_max_msat = max_htlc_from_capacity(hop_capacity, channel_saturation_pow_half);
 if *used_liquidity_msat == hop_max_msat {
 // If this path used all of this channel's available liquidity, we know
 // this path will not be selected again in the next loop iteration.
 prevented_redundant_path_selection = true;
 }
 println!("USED: {}, hop_max_msat: {}", used_liquidity_msat, hop_max_msat);
 debug_assert!(*used_liquidity_msat <= hop_max_msat);
 }
 if !prevented_redundant_path_selection {
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('^' + ".*" + '
Router: Ensure used liquidity is always limited by hop's `htlc_max` by tnull · Pull Request #3553 · lightningdevkit/rust-lightning · GitHub
Skip to content
Router: Ensure used liquidity is always limited by hop's htlc_max#3553

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

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Router: Ensure used liquidity is always limited by hop's htlc_max#3553
 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


56 changes: 35 additions & 21 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2367,7 +2367,7 @@ where L::Target: Logger {
 .map_or(0, |used_liquidity_msat| {
 available_value_contribution_msat = available_value_contribution_msat
 .saturating_sub(*used_liquidity_msat);
 *used_liquidity_msat
(*used_liquidity_msat)
 });

 // Verify the liquidity offered by this channel complies to the minimal contribution.
Expand DownExpand Up@@ -2809,6 +2809,7 @@ where L::Target: Logger {
 introduction_node_id_cache.len(),
 "introduction_node_id_cache was built by iterating the blinded_route_hints, so they should be the same len"
 );
 let mut value_contributions = Vec::with_capacity(payment_params.payee.blinded_route_hints().len());
 for (hint_idx, hint) in payment_params.payee.blinded_route_hints().iter().enumerate() {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
Expand All@@ -2823,29 +2824,39 @@ where L::Target: Logger {
 } else {
 CandidateRouteHop::Blinded(BlindedPathCandidate { source_node_counter, source_node_id, hint, hint_idx })
 };
 let mut path_contribution_msat = path_value_msat;
 if let Some(hop_used_msat) = add_entry!(&candidate,
 0, path_contribution_msat, 0, 0_u64, 0, 0)
 0, path_value_msat, 0, 0_u64, 0, 0)
 {
path_contribution_msat = hop_used_msat;
value_contributions.push((hint_idx, hop_used_msat));
 } else { continue }
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 for (hint_idx, path_contribution_msat) in value_contributions {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
 // in the regular network graph.
 let source_node_opt = introduction_node_id_cache[hint_idx];
 let (source_node_id, source_node_counter) = if let Some(v) = source_node_opt { v } else { continue };
 if our_node_id == *source_node_id { continue }
 if let Some(hop_candidate) = dist[source_node_counter as usize].as_ref() {
 let candidate = hop_candidate.candidate.clone();
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 }
 }
 }
Expand DownExpand Up@@ -3114,17 +3125,20 @@ where L::Target: Logger {
 let mut prevented_redundant_path_selection = false;
 for (hop, _) in payment_path.hops.iter() {
 let spent_on_hop_msat = value_contribution_msat + hop.next_hops_fee_msat;
 println!("SPENT: {} = VALUE {} + NEXT_FEE {}", spent_on_hop_msat, value_contribution_msat, hop.next_hops_fee_msat);
 let used_liquidity_msat = used_liquidities
 .entry(hop.candidate.id())
 .and_modify(|used_liquidity_msat| *used_liquidity_msat += spent_on_hop_msat)
 .or_insert(spent_on_hop_msat);
 let hop_capacity = hop.candidate.effective_capacity();
 println!("CAP: {}, USED: {}", spent_on_hop_msat, used_liquidity_msat);
 let hop_max_msat = max_htlc_from_capacity(hop_capacity, channel_saturation_pow_half);
 if *used_liquidity_msat == hop_max_msat {
 // If this path used all of this channel's available liquidity, we know
 // this path will not be selected again in the next loop iteration.
 prevented_redundant_path_selection = true;
 }
 println!("USED: {}, hop_max_msat: {}", used_liquidity_msat, hop_max_msat);
 debug_assert!(*used_liquidity_msat <= hop_max_msat);
 }
 if !prevented_redundant_path_selection {
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); }
})();
})();
Router: Ensure used liquidity is always limited by hop's `htlc_max` by tnull · Pull Request #3553 · lightningdevkit/rust-lightning · GitHub
Skip to content
Router: Ensure used liquidity is always limited by hop's htlc_max#3553

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

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Router: Ensure used liquidity is always limited by hop's htlc_max#3553
 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


56 changes: 35 additions & 21 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2367,7 +2367,7 @@ where L::Target: Logger {
 .map_or(0, |used_liquidity_msat| {
 available_value_contribution_msat = available_value_contribution_msat
 .saturating_sub(*used_liquidity_msat);
 *used_liquidity_msat
(*used_liquidity_msat)
 });

 // Verify the liquidity offered by this channel complies to the minimal contribution.
Expand DownExpand Up@@ -2809,6 +2809,7 @@ where L::Target: Logger {
 introduction_node_id_cache.len(),
 "introduction_node_id_cache was built by iterating the blinded_route_hints, so they should be the same len"
 );
 let mut value_contributions = Vec::with_capacity(payment_params.payee.blinded_route_hints().len());
 for (hint_idx, hint) in payment_params.payee.blinded_route_hints().iter().enumerate() {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
Expand All@@ -2823,29 +2824,39 @@ where L::Target: Logger {
 } else {
 CandidateRouteHop::Blinded(BlindedPathCandidate { source_node_counter, source_node_id, hint, hint_idx })
 };
 let mut path_contribution_msat = path_value_msat;
 if let Some(hop_used_msat) = add_entry!(&candidate,
 0, path_contribution_msat, 0, 0_u64, 0, 0)
 0, path_value_msat, 0, 0_u64, 0, 0)
 {
path_contribution_msat = hop_used_msat;
value_contributions.push((hint_idx, hop_used_msat));
 } else { continue }
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 for (hint_idx, path_contribution_msat) in value_contributions {
 // Only add the hops in this route to our candidate set if either
 // we have a direct channel to the first hop or the first hop is
 // in the regular network graph.
 let source_node_opt = introduction_node_id_cache[hint_idx];
 let (source_node_id, source_node_counter) = if let Some(v) = source_node_opt { v } else { continue };
 if our_node_id == *source_node_id { continue }
 if let Some(hop_candidate) = dist[source_node_counter as usize].as_ref() {
 let candidate = hop_candidate.candidate.clone();
 if let Some((first_channels, peer_node_counter)) = first_hop_targets.get_mut(source_node_id) {
 sort_first_hop_channels(
 first_channels, &used_liquidities, recommended_value_msat, our_node_pubkey
 );
 for details in first_channels {
 let first_hop_candidate = CandidateRouteHop::FirstHop(FirstHopCandidate {
 details, payer_node_id: &our_node_id, payer_node_counter,
 target_node_counter: *peer_node_counter,
 });
 let blinded_path_fee = match compute_fees(path_contribution_msat, candidate.fees()) {
 Some(fee) => fee,
 None => continue
 };
 let path_min = candidate.htlc_minimum_msat().saturating_add(
 compute_fees_saturating(candidate.htlc_minimum_msat(), candidate.fees()));
 add_entry!(&first_hop_candidate, blinded_path_fee, path_contribution_msat, path_min,
 0_u64, candidate.cltv_expiry_delta(), 0);
 }
 }
 }
 }
Expand DownExpand Up@@ -3114,17 +3125,20 @@ where L::Target: Logger {
 let mut prevented_redundant_path_selection = false;
 for (hop, _) in payment_path.hops.iter() {
 let spent_on_hop_msat = value_contribution_msat + hop.next_hops_fee_msat;
 println!("SPENT: {} = VALUE {} + NEXT_FEE {}", spent_on_hop_msat, value_contribution_msat, hop.next_hops_fee_msat);
 let used_liquidity_msat = used_liquidities
 .entry(hop.candidate.id())
 .and_modify(|used_liquidity_msat| *used_liquidity_msat += spent_on_hop_msat)
 .or_insert(spent_on_hop_msat);
 let hop_capacity = hop.candidate.effective_capacity();
 println!("CAP: {}, USED: {}", spent_on_hop_msat, used_liquidity_msat);
 let hop_max_msat = max_htlc_from_capacity(hop_capacity, channel_saturation_pow_half);
 if *used_liquidity_msat == hop_max_msat {
 // If this path used all of this channel's available liquidity, we know
 // this path will not be selected again in the next loop iteration.
 prevented_redundant_path_selection = true;
 }
 println!("USED: {}, hop_max_msat: {}", used_liquidity_msat, hop_max_msat);
 debug_assert!(*used_liquidity_msat <= hop_max_msat);
 }
 if !prevented_redundant_path_selection {
Expand Down