Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2249,18 +2249,6 @@ fn build_with_store_internal(

let pathfinding_scores_sync_url = pathfinding_scores_sync_config.map(|c| c.url.clone());

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

let prober = probing_config.map(|probing_cfg| {
let strategy: Arc<dyn ProbingStrategy> = match &probing_cfg.kind {
ProbingStrategyKind::HighDegree { top_node_count } => {
Expand DownExpand Up@@ -2306,6 +2294,18 @@ fn build_with_store_internal(
})
});

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

Ok(Node {
runtime,
stop_sender,
Expand Down
30 changes: 21 additions & 9 deletions src/probing.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,7 @@ impl RandomWalkStrategy {
// Retrieve the direction-specific update via the public ChannelInfo fields.
// as_directed_from already checked both directions are Some, but we break
// defensively rather than unwrap.
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
Expand All@@ -604,15 +604,15 @@ impl RandomWalkStrategy {
None => break,
};

if !update.enabled {
if !channel_update_info.enabled {
break;
}

route_least_htlc_upper_bound =
route_least_htlc_upper_bound.min(update.htlc_maximum_msat);
route_least_htlc_upper_bound.min(channel_update_info.htlc_maximum_msat);

route_greatest_htlc_lower_bound =
route_greatest_htlc_lower_bound.max(update.htlc_minimum_msat);
route_greatest_htlc_lower_bound.max(channel_update_info.htlc_minimum_msat);

let next_pubkey = match PublicKey::try_from(*next_node_id) {
Ok(pk) => pk,
Expand DownExpand Up@@ -682,25 +682,37 @@ impl RandomWalkStrategy {
let (_, next_scid, _) = route[i + 1];
let next_channel = graph.channel(next_scid)?;
let (directed, _) = next_channel.as_directed_from(&node_id)?;
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
} {
Some(u) => u,
None => return None,
};
let fee = update.fees.base_msat as u64
+ (forwarded * update.fees.proportional_millionths as u64 / 1_000_000);
forwarded += fee;
// forwarded is the amount sent over next_channel (before this hop's own fee is
// added on top for the preceding channel), so check it against next_channel's
// own advertised bounds before computing the fee.
if forwarded > channel_update_info.htlc_maximum_msat
|| forwarded < channel_update_info.htlc_minimum_msat
{
return None;
}

// Overflow prevention
let proportional_fee = forwarded
.checked_mul(channel_update_info.fees.proportional_millionths as u64)
.map(|v| v / 1_000_000)?;
let fee = (channel_update_info.fees.base_msat as u64).checked_add(proportional_fee)?;
forwarded = forwarded.checked_add(fee)?;

@tnulltnullJul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Codex:

  • [P2] Check the HTLC bound before adding the current hop’s fee — /home/tnull/worktrees/ldk-node/pr-1004-latest-20260724/src/probing.rs:698

    forwarded initially represents the amount sent through next_channel, including only downstream fees. The code adds the current node’s fee and then compares against that channel’s bounds. That fee is collected on the preceding channel and must not count toward
    next_channel.htlc_maximum_msat.

    For example, if B→C has a 1,000,000-msat maximum and B charges 1,000 msat, delivering exactly 1,000,000 msat over B→C is valid. This code checks 1,001,000 and rejects the path.

    BOLT 7 defines the maximum as what the origin node will send through that channel, while its fee is calculated from amount_to_forward. BOLT 7 channel updates and HTLC fees (https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#htlc-fees)

    The bound check should occur before calculating and adding fee.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

fixed


hops.push(RouteHop {
pubkey,
node_features,
short_channel_id: via_scid,
channel_features,
fee_msat: fee,
cltv_expiry_delta: update.cltv_expiry_delta as u32,
cltv_expiry_delta: channel_update_info.cltv_expiry_delta as u32,
maybe_announced_channel,
});
}
Expand Down
Loading
, '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" + '
Probing backround service follow-up. by randomlogin · Pull Request #1004 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2249,18 +2249,6 @@ fn build_with_store_internal(

let pathfinding_scores_sync_url = pathfinding_scores_sync_config.map(|c| c.url.clone());

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

let prober = probing_config.map(|probing_cfg| {
let strategy: Arc<dyn ProbingStrategy> = match &probing_cfg.kind {
ProbingStrategyKind::HighDegree { top_node_count } => {
Expand DownExpand Up@@ -2306,6 +2294,18 @@ fn build_with_store_internal(
})
});

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

Ok(Node {
runtime,
stop_sender,
Expand Down
30 changes: 21 additions & 9 deletions src/probing.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,7 @@ impl RandomWalkStrategy {
// Retrieve the direction-specific update via the public ChannelInfo fields.
// as_directed_from already checked both directions are Some, but we break
// defensively rather than unwrap.
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
Expand All@@ -604,15 +604,15 @@ impl RandomWalkStrategy {
None => break,
};

if !update.enabled {
if !channel_update_info.enabled {
break;
}

route_least_htlc_upper_bound =
route_least_htlc_upper_bound.min(update.htlc_maximum_msat);
route_least_htlc_upper_bound.min(channel_update_info.htlc_maximum_msat);

route_greatest_htlc_lower_bound =
route_greatest_htlc_lower_bound.max(update.htlc_minimum_msat);
route_greatest_htlc_lower_bound.max(channel_update_info.htlc_minimum_msat);

let next_pubkey = match PublicKey::try_from(*next_node_id) {
Ok(pk) => pk,
Expand DownExpand Up@@ -682,25 +682,37 @@ impl RandomWalkStrategy {
let (_, next_scid, _) = route[i + 1];
let next_channel = graph.channel(next_scid)?;
let (directed, _) = next_channel.as_directed_from(&node_id)?;
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
} {
Some(u) => u,
None => return None,
};
let fee = update.fees.base_msat as u64
+ (forwarded * update.fees.proportional_millionths as u64 / 1_000_000);
forwarded += fee;
// forwarded is the amount sent over next_channel (before this hop's own fee is
// added on top for the preceding channel), so check it against next_channel's
// own advertised bounds before computing the fee.
if forwarded > channel_update_info.htlc_maximum_msat
|| forwarded < channel_update_info.htlc_minimum_msat
{
return None;
}

// Overflow prevention
let proportional_fee = forwarded
.checked_mul(channel_update_info.fees.proportional_millionths as u64)
.map(|v| v / 1_000_000)?;
let fee = (channel_update_info.fees.base_msat as u64).checked_add(proportional_fee)?;
forwarded = forwarded.checked_add(fee)?;

@tnulltnullJul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Codex:

  • [P2] Check the HTLC bound before adding the current hop’s fee — /home/tnull/worktrees/ldk-node/pr-1004-latest-20260724/src/probing.rs:698

    forwarded initially represents the amount sent through next_channel, including only downstream fees. The code adds the current node’s fee and then compares against that channel’s bounds. That fee is collected on the preceding channel and must not count toward
    next_channel.htlc_maximum_msat.

    For example, if B→C has a 1,000,000-msat maximum and B charges 1,000 msat, delivering exactly 1,000,000 msat over B→C is valid. This code checks 1,001,000 and rejects the path.

    BOLT 7 defines the maximum as what the origin node will send through that channel, while its fee is calculated from amount_to_forward. BOLT 7 channel updates and HTLC fees (https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#htlc-fees)

    The bound check should occur before calculating and adding fee.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

fixed


hops.push(RouteHop {
pubkey,
node_features,
short_channel_id: via_scid,
channel_features,
fee_msat: fee,
cltv_expiry_delta: update.cltv_expiry_delta as u32,
cltv_expiry_delta: channel_update_info.cltv_expiry_delta as u32,
maybe_announced_channel,
});
}
Expand Down
Loading
, '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('^' + ".*" + ' Probing backround service follow-up. by randomlogin · Pull Request #1004 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2249,18 +2249,6 @@ fn build_with_store_internal(

let pathfinding_scores_sync_url = pathfinding_scores_sync_config.map(|c| c.url.clone());

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

let prober = probing_config.map(|probing_cfg| {
let strategy: Arc<dyn ProbingStrategy> = match &probing_cfg.kind {
ProbingStrategyKind::HighDegree { top_node_count } => {
Expand DownExpand Up@@ -2306,6 +2294,18 @@ fn build_with_store_internal(
})
});

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

Ok(Node {
runtime,
stop_sender,
Expand Down
30 changes: 21 additions & 9 deletions src/probing.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,7 @@ impl RandomWalkStrategy {
// Retrieve the direction-specific update via the public ChannelInfo fields.
// as_directed_from already checked both directions are Some, but we break
// defensively rather than unwrap.
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
Expand All@@ -604,15 +604,15 @@ impl RandomWalkStrategy {
None => break,
};

if !update.enabled {
if !channel_update_info.enabled {
break;
}

route_least_htlc_upper_bound =
route_least_htlc_upper_bound.min(update.htlc_maximum_msat);
route_least_htlc_upper_bound.min(channel_update_info.htlc_maximum_msat);

route_greatest_htlc_lower_bound =
route_greatest_htlc_lower_bound.max(update.htlc_minimum_msat);
route_greatest_htlc_lower_bound.max(channel_update_info.htlc_minimum_msat);

let next_pubkey = match PublicKey::try_from(*next_node_id) {
Ok(pk) => pk,
Expand DownExpand Up@@ -682,25 +682,37 @@ impl RandomWalkStrategy {
let (_, next_scid, _) = route[i + 1];
let next_channel = graph.channel(next_scid)?;
let (directed, _) = next_channel.as_directed_from(&node_id)?;
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
} {
Some(u) => u,
None => return None,
};
let fee = update.fees.base_msat as u64
+ (forwarded * update.fees.proportional_millionths as u64 / 1_000_000);
forwarded += fee;
// forwarded is the amount sent over next_channel (before this hop's own fee is
// added on top for the preceding channel), so check it against next_channel's
// own advertised bounds before computing the fee.
if forwarded > channel_update_info.htlc_maximum_msat
|| forwarded < channel_update_info.htlc_minimum_msat
{
return None;
}

// Overflow prevention
let proportional_fee = forwarded
.checked_mul(channel_update_info.fees.proportional_millionths as u64)
.map(|v| v / 1_000_000)?;
let fee = (channel_update_info.fees.base_msat as u64).checked_add(proportional_fee)?;
forwarded = forwarded.checked_add(fee)?;

@tnulltnullJul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Codex:

  • [P2] Check the HTLC bound before adding the current hop’s fee — /home/tnull/worktrees/ldk-node/pr-1004-latest-20260724/src/probing.rs:698

    forwarded initially represents the amount sent through next_channel, including only downstream fees. The code adds the current node’s fee and then compares against that channel’s bounds. That fee is collected on the preceding channel and must not count toward
    next_channel.htlc_maximum_msat.

    For example, if B→C has a 1,000,000-msat maximum and B charges 1,000 msat, delivering exactly 1,000,000 msat over B→C is valid. This code checks 1,001,000 and rejects the path.

    BOLT 7 defines the maximum as what the origin node will send through that channel, while its fee is calculated from amount_to_forward. BOLT 7 channel updates and HTLC fees (https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#htlc-fees)

    The bound check should occur before calculating and adding fee.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

fixed


hops.push(RouteHop {
pubkey,
node_features,
short_channel_id: via_scid,
channel_features,
fee_msat: fee,
cltv_expiry_delta: update.cltv_expiry_delta as u32,
cltv_expiry_delta: channel_update_info.cltv_expiry_delta as u32,
maybe_announced_channel,
});
}
Expand Down
Loading
, '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('^' + ".*" + ' Probing backround service follow-up. by randomlogin · Pull Request #1004 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2249,18 +2249,6 @@ fn build_with_store_internal(

let pathfinding_scores_sync_url = pathfinding_scores_sync_config.map(|c| c.url.clone());

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

let prober = probing_config.map(|probing_cfg| {
let strategy: Arc<dyn ProbingStrategy> = match &probing_cfg.kind {
ProbingStrategyKind::HighDegree { top_node_count } => {
Expand DownExpand Up@@ -2306,6 +2294,18 @@ fn build_with_store_internal(
})
});

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

Ok(Node {
runtime,
stop_sender,
Expand Down
30 changes: 21 additions & 9 deletions src/probing.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,7 @@ impl RandomWalkStrategy {
// Retrieve the direction-specific update via the public ChannelInfo fields.
// as_directed_from already checked both directions are Some, but we break
// defensively rather than unwrap.
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
Expand All@@ -604,15 +604,15 @@ impl RandomWalkStrategy {
None => break,
};

if !update.enabled {
if !channel_update_info.enabled {
break;
}

route_least_htlc_upper_bound =
route_least_htlc_upper_bound.min(update.htlc_maximum_msat);
route_least_htlc_upper_bound.min(channel_update_info.htlc_maximum_msat);

route_greatest_htlc_lower_bound =
route_greatest_htlc_lower_bound.max(update.htlc_minimum_msat);
route_greatest_htlc_lower_bound.max(channel_update_info.htlc_minimum_msat);

let next_pubkey = match PublicKey::try_from(*next_node_id) {
Ok(pk) => pk,
Expand DownExpand Up@@ -682,25 +682,37 @@ impl RandomWalkStrategy {
let (_, next_scid, _) = route[i + 1];
let next_channel = graph.channel(next_scid)?;
let (directed, _) = next_channel.as_directed_from(&node_id)?;
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
} {
Some(u) => u,
None => return None,
};
let fee = update.fees.base_msat as u64
+ (forwarded * update.fees.proportional_millionths as u64 / 1_000_000);
forwarded += fee;
// forwarded is the amount sent over next_channel (before this hop's own fee is
// added on top for the preceding channel), so check it against next_channel's
// own advertised bounds before computing the fee.
if forwarded > channel_update_info.htlc_maximum_msat
|| forwarded < channel_update_info.htlc_minimum_msat
{
return None;
}

// Overflow prevention
let proportional_fee = forwarded
.checked_mul(channel_update_info.fees.proportional_millionths as u64)
.map(|v| v / 1_000_000)?;
let fee = (channel_update_info.fees.base_msat as u64).checked_add(proportional_fee)?;
forwarded = forwarded.checked_add(fee)?;

@tnulltnullJul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Codex:

  • [P2] Check the HTLC bound before adding the current hop’s fee — /home/tnull/worktrees/ldk-node/pr-1004-latest-20260724/src/probing.rs:698

    forwarded initially represents the amount sent through next_channel, including only downstream fees. The code adds the current node’s fee and then compares against that channel’s bounds. That fee is collected on the preceding channel and must not count toward
    next_channel.htlc_maximum_msat.

    For example, if B→C has a 1,000,000-msat maximum and B charges 1,000 msat, delivering exactly 1,000,000 msat over B→C is valid. This code checks 1,001,000 and rejects the path.

    BOLT 7 defines the maximum as what the origin node will send through that channel, while its fee is calculated from amount_to_forward. BOLT 7 channel updates and HTLC fees (https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#htlc-fees)

    The bound check should occur before calculating and adding fee.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

fixed


hops.push(RouteHop {
pubkey,
node_features,
short_channel_id: via_scid,
channel_features,
fee_msat: fee,
cltv_expiry_delta: update.cltv_expiry_delta as u32,
cltv_expiry_delta: channel_update_info.cltv_expiry_delta as u32,
maybe_announced_channel,
});
}
Expand Down
Loading
, '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" + ' Probing backround service follow-up. by randomlogin · Pull Request #1004 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2249,18 +2249,6 @@ fn build_with_store_internal(

let pathfinding_scores_sync_url = pathfinding_scores_sync_config.map(|c| c.url.clone());

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

let prober = probing_config.map(|probing_cfg| {
let strategy: Arc<dyn ProbingStrategy> = match &probing_cfg.kind {
ProbingStrategyKind::HighDegree { top_node_count } => {
Expand DownExpand Up@@ -2306,6 +2294,18 @@ fn build_with_store_internal(
})
});

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

Ok(Node {
runtime,
stop_sender,
Expand Down
30 changes: 21 additions & 9 deletions src/probing.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,7 @@ impl RandomWalkStrategy {
// Retrieve the direction-specific update via the public ChannelInfo fields.
// as_directed_from already checked both directions are Some, but we break
// defensively rather than unwrap.
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
Expand All@@ -604,15 +604,15 @@ impl RandomWalkStrategy {
None => break,
};

if !update.enabled {
if !channel_update_info.enabled {
break;
}

route_least_htlc_upper_bound =
route_least_htlc_upper_bound.min(update.htlc_maximum_msat);
route_least_htlc_upper_bound.min(channel_update_info.htlc_maximum_msat);

route_greatest_htlc_lower_bound =
route_greatest_htlc_lower_bound.max(update.htlc_minimum_msat);
route_greatest_htlc_lower_bound.max(channel_update_info.htlc_minimum_msat);

let next_pubkey = match PublicKey::try_from(*next_node_id) {
Ok(pk) => pk,
Expand DownExpand Up@@ -682,25 +682,37 @@ impl RandomWalkStrategy {
let (_, next_scid, _) = route[i + 1];
let next_channel = graph.channel(next_scid)?;
let (directed, _) = next_channel.as_directed_from(&node_id)?;
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
} {
Some(u) => u,
None => return None,
};
let fee = update.fees.base_msat as u64
+ (forwarded * update.fees.proportional_millionths as u64 / 1_000_000);
forwarded += fee;
// forwarded is the amount sent over next_channel (before this hop's own fee is
// added on top for the preceding channel), so check it against next_channel's
// own advertised bounds before computing the fee.
if forwarded > channel_update_info.htlc_maximum_msat
|| forwarded < channel_update_info.htlc_minimum_msat
{
return None;
}

// Overflow prevention
let proportional_fee = forwarded
.checked_mul(channel_update_info.fees.proportional_millionths as u64)
.map(|v| v / 1_000_000)?;
let fee = (channel_update_info.fees.base_msat as u64).checked_add(proportional_fee)?;
forwarded = forwarded.checked_add(fee)?;

@tnulltnullJul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Codex:

  • [P2] Check the HTLC bound before adding the current hop’s fee — /home/tnull/worktrees/ldk-node/pr-1004-latest-20260724/src/probing.rs:698

    forwarded initially represents the amount sent through next_channel, including only downstream fees. The code adds the current node’s fee and then compares against that channel’s bounds. That fee is collected on the preceding channel and must not count toward
    next_channel.htlc_maximum_msat.

    For example, if B→C has a 1,000,000-msat maximum and B charges 1,000 msat, delivering exactly 1,000,000 msat over B→C is valid. This code checks 1,001,000 and rejects the path.

    BOLT 7 defines the maximum as what the origin node will send through that channel, while its fee is calculated from amount_to_forward. BOLT 7 channel updates and HTLC fees (https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#htlc-fees)

    The bound check should occur before calculating and adding fee.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

fixed


hops.push(RouteHop {
pubkey,
node_features,
short_channel_id: via_scid,
channel_features,
fee_msat: fee,
cltv_expiry_delta: update.cltv_expiry_delta as u32,
cltv_expiry_delta: channel_update_info.cltv_expiry_delta as u32,
maybe_announced_channel,
});
}
Expand Down
Loading
, '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('^' + ".*" + ' Probing backround service follow-up. by randomlogin · Pull Request #1004 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2249,18 +2249,6 @@ fn build_with_store_internal(

let pathfinding_scores_sync_url = pathfinding_scores_sync_config.map(|c| c.url.clone());

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

let prober = probing_config.map(|probing_cfg| {
let strategy: Arc<dyn ProbingStrategy> = match &probing_cfg.kind {
ProbingStrategyKind::HighDegree { top_node_count } => {
Expand DownExpand Up@@ -2306,6 +2294,18 @@ fn build_with_store_internal(
})
});

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

Ok(Node {
runtime,
stop_sender,
Expand Down
30 changes: 21 additions & 9 deletions src/probing.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,7 @@ impl RandomWalkStrategy {
// Retrieve the direction-specific update via the public ChannelInfo fields.
// as_directed_from already checked both directions are Some, but we break
// defensively rather than unwrap.
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
Expand All@@ -604,15 +604,15 @@ impl RandomWalkStrategy {
None => break,
};

if !update.enabled {
if !channel_update_info.enabled {
break;
}

route_least_htlc_upper_bound =
route_least_htlc_upper_bound.min(update.htlc_maximum_msat);
route_least_htlc_upper_bound.min(channel_update_info.htlc_maximum_msat);

route_greatest_htlc_lower_bound =
route_greatest_htlc_lower_bound.max(update.htlc_minimum_msat);
route_greatest_htlc_lower_bound.max(channel_update_info.htlc_minimum_msat);

let next_pubkey = match PublicKey::try_from(*next_node_id) {
Ok(pk) => pk,
Expand DownExpand Up@@ -682,25 +682,37 @@ impl RandomWalkStrategy {
let (_, next_scid, _) = route[i + 1];
let next_channel = graph.channel(next_scid)?;
let (directed, _) = next_channel.as_directed_from(&node_id)?;
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
} {
Some(u) => u,
None => return None,
};
let fee = update.fees.base_msat as u64
+ (forwarded * update.fees.proportional_millionths as u64 / 1_000_000);
forwarded += fee;
// forwarded is the amount sent over next_channel (before this hop's own fee is
// added on top for the preceding channel), so check it against next_channel's
// own advertised bounds before computing the fee.
if forwarded > channel_update_info.htlc_maximum_msat
|| forwarded < channel_update_info.htlc_minimum_msat
{
return None;
}

// Overflow prevention
let proportional_fee = forwarded
.checked_mul(channel_update_info.fees.proportional_millionths as u64)
.map(|v| v / 1_000_000)?;
let fee = (channel_update_info.fees.base_msat as u64).checked_add(proportional_fee)?;
forwarded = forwarded.checked_add(fee)?;

@tnulltnullJul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Codex:

  • [P2] Check the HTLC bound before adding the current hop’s fee — /home/tnull/worktrees/ldk-node/pr-1004-latest-20260724/src/probing.rs:698

    forwarded initially represents the amount sent through next_channel, including only downstream fees. The code adds the current node’s fee and then compares against that channel’s bounds. That fee is collected on the preceding channel and must not count toward
    next_channel.htlc_maximum_msat.

    For example, if B→C has a 1,000,000-msat maximum and B charges 1,000 msat, delivering exactly 1,000,000 msat over B→C is valid. This code checks 1,001,000 and rejects the path.

    BOLT 7 defines the maximum as what the origin node will send through that channel, while its fee is calculated from amount_to_forward. BOLT 7 channel updates and HTLC fees (https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#htlc-fees)

    The bound check should occur before calculating and adding fee.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

fixed


hops.push(RouteHop {
pubkey,
node_features,
short_channel_id: via_scid,
channel_features,
fee_msat: fee,
cltv_expiry_delta: update.cltv_expiry_delta as u32,
cltv_expiry_delta: channel_update_info.cltv_expiry_delta as u32,
maybe_announced_channel,
});
}
Expand Down
Loading
, '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('^' + ".*" + ' Probing backround service follow-up. by randomlogin · Pull Request #1004 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2249,18 +2249,6 @@ fn build_with_store_internal(

let pathfinding_scores_sync_url = pathfinding_scores_sync_config.map(|c| c.url.clone());

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

let prober = probing_config.map(|probing_cfg| {
let strategy: Arc<dyn ProbingStrategy> = match &probing_cfg.kind {
ProbingStrategyKind::HighDegree { top_node_count } => {
Expand DownExpand Up@@ -2306,6 +2294,18 @@ fn build_with_store_internal(
})
});

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

Ok(Node {
runtime,
stop_sender,
Expand Down
30 changes: 21 additions & 9 deletions src/probing.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,7 @@ impl RandomWalkStrategy {
// Retrieve the direction-specific update via the public ChannelInfo fields.
// as_directed_from already checked both directions are Some, but we break
// defensively rather than unwrap.
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
Expand All@@ -604,15 +604,15 @@ impl RandomWalkStrategy {
None => break,
};

if !update.enabled {
if !channel_update_info.enabled {
break;
}

route_least_htlc_upper_bound =
route_least_htlc_upper_bound.min(update.htlc_maximum_msat);
route_least_htlc_upper_bound.min(channel_update_info.htlc_maximum_msat);

route_greatest_htlc_lower_bound =
route_greatest_htlc_lower_bound.max(update.htlc_minimum_msat);
route_greatest_htlc_lower_bound.max(channel_update_info.htlc_minimum_msat);

let next_pubkey = match PublicKey::try_from(*next_node_id) {
Ok(pk) => pk,
Expand DownExpand Up@@ -682,25 +682,37 @@ impl RandomWalkStrategy {
let (_, next_scid, _) = route[i + 1];
let next_channel = graph.channel(next_scid)?;
let (directed, _) = next_channel.as_directed_from(&node_id)?;
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
} {
Some(u) => u,
None => return None,
};
let fee = update.fees.base_msat as u64
+ (forwarded * update.fees.proportional_millionths as u64 / 1_000_000);
forwarded += fee;
// forwarded is the amount sent over next_channel (before this hop's own fee is
// added on top for the preceding channel), so check it against next_channel's
// own advertised bounds before computing the fee.
if forwarded > channel_update_info.htlc_maximum_msat
|| forwarded < channel_update_info.htlc_minimum_msat
{
return None;
}

// Overflow prevention
let proportional_fee = forwarded
.checked_mul(channel_update_info.fees.proportional_millionths as u64)
.map(|v| v / 1_000_000)?;
let fee = (channel_update_info.fees.base_msat as u64).checked_add(proportional_fee)?;
forwarded = forwarded.checked_add(fee)?;

@tnulltnullJul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Codex:

  • [P2] Check the HTLC bound before adding the current hop’s fee — /home/tnull/worktrees/ldk-node/pr-1004-latest-20260724/src/probing.rs:698

    forwarded initially represents the amount sent through next_channel, including only downstream fees. The code adds the current node’s fee and then compares against that channel’s bounds. That fee is collected on the preceding channel and must not count toward
    next_channel.htlc_maximum_msat.

    For example, if B→C has a 1,000,000-msat maximum and B charges 1,000 msat, delivering exactly 1,000,000 msat over B→C is valid. This code checks 1,001,000 and rejects the path.

    BOLT 7 defines the maximum as what the origin node will send through that channel, while its fee is calculated from amount_to_forward. BOLT 7 channel updates and HTLC fees (https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#htlc-fees)

    The bound check should occur before calculating and adding fee.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

fixed


hops.push(RouteHop {
pubkey,
node_features,
short_channel_id: via_scid,
channel_features,
fee_msat: fee,
cltv_expiry_delta: update.cltv_expiry_delta as u32,
cltv_expiry_delta: channel_update_info.cltv_expiry_delta as u32,
maybe_announced_channel,
});
}
Expand Down
Loading
, '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); } })(); })(); Probing backround service follow-up. by randomlogin · Pull Request #1004 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/builder.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2249,18 +2249,6 @@ fn build_with_store_internal(

let pathfinding_scores_sync_url = pathfinding_scores_sync_config.map(|c| c.url.clone());

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

let prober = probing_config.map(|probing_cfg| {
let strategy: Arc<dyn ProbingStrategy> = match &probing_cfg.kind {
ProbingStrategyKind::HighDegree { top_node_count } => {
Expand DownExpand Up@@ -2306,6 +2294,18 @@ fn build_with_store_internal(
})
});

#[cfg(cycle_tests)]
let mut _leak_checker = crate::LeakChecker(Vec::new());
#[cfg(cycle_tests)]
{
use std::any::Any;
use std::sync::Weak;

_leak_checker.0.push(Arc::downgrade(&channel_manager) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&network_graph) as Weak<dyn Any + Send + Sync>);
_leak_checker.0.push(Arc::downgrade(&wallet) as Weak<dyn Any + Send + Sync>);
}

Ok(Node {
runtime,
stop_sender,
Expand Down
30 changes: 21 additions & 9 deletions src/probing.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,7 @@ impl RandomWalkStrategy {
// Retrieve the direction-specific update via the public ChannelInfo fields.
// as_directed_from already checked both directions are Some, but we break
// defensively rather than unwrap.
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
Expand All@@ -604,15 +604,15 @@ impl RandomWalkStrategy {
None => break,
};

if !update.enabled {
if !channel_update_info.enabled {
break;
}

route_least_htlc_upper_bound =
route_least_htlc_upper_bound.min(update.htlc_maximum_msat);
route_least_htlc_upper_bound.min(channel_update_info.htlc_maximum_msat);

route_greatest_htlc_lower_bound =
route_greatest_htlc_lower_bound.max(update.htlc_minimum_msat);
route_greatest_htlc_lower_bound.max(channel_update_info.htlc_minimum_msat);

let next_pubkey = match PublicKey::try_from(*next_node_id) {
Ok(pk) => pk,
Expand DownExpand Up@@ -682,25 +682,37 @@ impl RandomWalkStrategy {
let (_, next_scid, _) = route[i + 1];
let next_channel = graph.channel(next_scid)?;
let (directed, _) = next_channel.as_directed_from(&node_id)?;
let update = match if directed.source() == &next_channel.node_one {
let channel_update_info = match if directed.source() == &next_channel.node_one {
next_channel.one_to_two.as_ref()
} else {
next_channel.two_to_one.as_ref()
} {
Some(u) => u,
None => return None,
};
let fee = update.fees.base_msat as u64
+ (forwarded * update.fees.proportional_millionths as u64 / 1_000_000);
forwarded += fee;
// forwarded is the amount sent over next_channel (before this hop's own fee is
// added on top for the preceding channel), so check it against next_channel's
// own advertised bounds before computing the fee.
if forwarded > channel_update_info.htlc_maximum_msat
|| forwarded < channel_update_info.htlc_minimum_msat
{
return None;
}

// Overflow prevention
let proportional_fee = forwarded
.checked_mul(channel_update_info.fees.proportional_millionths as u64)
.map(|v| v / 1_000_000)?;
let fee = (channel_update_info.fees.base_msat as u64).checked_add(proportional_fee)?;
forwarded = forwarded.checked_add(fee)?;

@tnulltnullJul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Codex:

  • [P2] Check the HTLC bound before adding the current hop’s fee — /home/tnull/worktrees/ldk-node/pr-1004-latest-20260724/src/probing.rs:698

    forwarded initially represents the amount sent through next_channel, including only downstream fees. The code adds the current node’s fee and then compares against that channel’s bounds. That fee is collected on the preceding channel and must not count toward
    next_channel.htlc_maximum_msat.

    For example, if B→C has a 1,000,000-msat maximum and B charges 1,000 msat, delivering exactly 1,000,000 msat over B→C is valid. This code checks 1,001,000 and rejects the path.

    BOLT 7 defines the maximum as what the origin node will send through that channel, while its fee is calculated from amount_to_forward. BOLT 7 channel updates and HTLC fees (https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#htlc-fees)

    The bound check should occur before calculating and adding fee.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

fixed


hops.push(RouteHop {
pubkey,
node_features,
short_channel_id: via_scid,
channel_features,
fee_msat: fee,
cltv_expiry_delta: update.cltv_expiry_delta as u32,
cltv_expiry_delta: channel_update_info.cltv_expiry_delta as u32,
maybe_announced_channel,
});
}
Expand Down
Loading