Add fees value for recent payment details - #4674

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details
Jun 15, 2026
Merged

Add fees value for recent payment details#4674
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details

Conversation

@randomlogin

Copy link
Copy Markdown
Contributor

Previously it was not possible to obtain fees of pending/fulfilled payments.
Also we can add and populate the fee field for RecentPaymentDetails::Abandoned, but I doubt that it is useful, as the payment was not made.

I ran cargo fmt, so unrelated parts of code were changed.

Removed unnecessary clarification "in msat" for total_msat field.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 10, 2026

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@ldk-claude-review-bot

ldk-claude-review-bot commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

I re-examined the full data flow and all construction/match sites:

  • mark_fulfilled (outbound_payment.rs:304) and claim_htlc (2275) both derive the fee from get_pending_fee_msat() on the still-Retryable/Abandoned payment, with nothing mutating state between the PaymentSent push and mark_fulfilled at 2285 — so Fulfilled.fee_paid_msat and PaymentSent.fee_paid_msat are guaranteed identical. mark_fulfilled has only one caller.
  • get_pending_fee_msat now also covers the Fulfilled arm so the value survives MPP second-path/onchain re-claims and abandon→succeed transitions.
  • TLV (7, fee_paid_msat, option) for Fulfilled does not collide (existing: 0,1,3,5).
  • Version wording "prior to 0.3.0" matches the current crate version (0.3.0+git).
  • All other RecentPaymentDetails::{Pending,Fulfilled} sites (e.g. payment_tests.rs:1788, offers_tests.rs expect_recent_payment!) use .. or pattern-only matching, so no compile breakage.

No issues found.

Comment threadlightning/src/ln/channelmanager.rs Outdated
bool,
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
)
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These should go away if you format with 1.75

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

Comment threadlightning/src/ln/channelmanager.rs Outdated
/// Total routing fees paid for this payment, as also reported via the `fee_paid_msat`
/// field of [`Event::PaymentSent`].
///
/// `None` for payments fulfilled before this field was introduced.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should note the specific version

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.

added specific version (0.3.0)

@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

Introduce fields `pending_fee_msat` for `RecentPaymentDetails::Pending`
and `fee_paid_msat` for `RecentPaymentDetails::Fulfilled`.
@randomlogin
randomloginforce-pushed the expose-fees-in-payment-details branch from 95ece4a to af19ed5CompareJune 10, 2026 21:51
@wpaulino

Copy link
Copy Markdown
Contributor

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

I mean at this point, no, ideally not, but its trivial and @tnull wants it for lightningdevkit/ldk-node#815 so I figure we can.

total_msat: u64,
/// Total routing fees of the HTLCs currently in-flight for this payment.
///
/// `None` for payments serialized by LDK versions prior to 0.0.103.

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.

Ha, we don't support upgrading from 0.0.103 at this point, I don't think we need to even document this.

@TheBlueMatt
TheBlueMatt merged commit bfaedff into lightningdevkit:mainJun 15, 2026
1 check passed
@randomlogin
randomlogin deleted the expose-fees-in-payment-details branch June 22, 2026 13:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@randomlogin@ldk-reviews-bot@ldk-claude-review-bot@wpaulino@TheBlueMatt@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Add fees value for recent payment details - #4674

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details
Jun 15, 2026
Merged

Add fees value for recent payment details#4674
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details

Conversation

@randomlogin

Copy link
Copy Markdown
Contributor

Previously it was not possible to obtain fees of pending/fulfilled payments.
Also we can add and populate the fee field for RecentPaymentDetails::Abandoned, but I doubt that it is useful, as the payment was not made.

I ran cargo fmt, so unrelated parts of code were changed.

Removed unnecessary clarification "in msat" for total_msat field.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 10, 2026

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@ldk-claude-review-bot

ldk-claude-review-bot commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

I re-examined the full data flow and all construction/match sites:

  • mark_fulfilled (outbound_payment.rs:304) and claim_htlc (2275) both derive the fee from get_pending_fee_msat() on the still-Retryable/Abandoned payment, with nothing mutating state between the PaymentSent push and mark_fulfilled at 2285 — so Fulfilled.fee_paid_msat and PaymentSent.fee_paid_msat are guaranteed identical. mark_fulfilled has only one caller.
  • get_pending_fee_msat now also covers the Fulfilled arm so the value survives MPP second-path/onchain re-claims and abandon→succeed transitions.
  • TLV (7, fee_paid_msat, option) for Fulfilled does not collide (existing: 0,1,3,5).
  • Version wording "prior to 0.3.0" matches the current crate version (0.3.0+git).
  • All other RecentPaymentDetails::{Pending,Fulfilled} sites (e.g. payment_tests.rs:1788, offers_tests.rs expect_recent_payment!) use .. or pattern-only matching, so no compile breakage.

No issues found.

Comment threadlightning/src/ln/channelmanager.rs Outdated
bool,
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
)
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These should go away if you format with 1.75

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

Comment threadlightning/src/ln/channelmanager.rs Outdated
/// Total routing fees paid for this payment, as also reported via the `fee_paid_msat`
/// field of [`Event::PaymentSent`].
///
/// `None` for payments fulfilled before this field was introduced.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should note the specific version

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.

added specific version (0.3.0)

@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

Introduce fields `pending_fee_msat` for `RecentPaymentDetails::Pending`
and `fee_paid_msat` for `RecentPaymentDetails::Fulfilled`.
@randomlogin
randomloginforce-pushed the expose-fees-in-payment-details branch from 95ece4a to af19ed5CompareJune 10, 2026 21:51
@wpaulino

Copy link
Copy Markdown
Contributor

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

I mean at this point, no, ideally not, but its trivial and @tnull wants it for lightningdevkit/ldk-node#815 so I figure we can.

total_msat: u64,
/// Total routing fees of the HTLCs currently in-flight for this payment.
///
/// `None` for payments serialized by LDK versions prior to 0.0.103.

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.

Ha, we don't support upgrading from 0.0.103 at this point, I don't think we need to even document this.

@TheBlueMatt
TheBlueMatt merged commit bfaedff into lightningdevkit:mainJun 15, 2026
1 check passed
@randomlogin
randomlogin deleted the expose-fees-in-payment-details branch June 22, 2026 13:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@randomlogin@ldk-reviews-bot@ldk-claude-review-bot@wpaulino@TheBlueMatt@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add fees value for recent payment details - #4674

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details
Jun 15, 2026
Merged

Add fees value for recent payment details#4674
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details

Conversation

@randomlogin

Copy link
Copy Markdown
Contributor

Previously it was not possible to obtain fees of pending/fulfilled payments.
Also we can add and populate the fee field for RecentPaymentDetails::Abandoned, but I doubt that it is useful, as the payment was not made.

I ran cargo fmt, so unrelated parts of code were changed.

Removed unnecessary clarification "in msat" for total_msat field.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 10, 2026

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@ldk-claude-review-bot

ldk-claude-review-bot commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

I re-examined the full data flow and all construction/match sites:

  • mark_fulfilled (outbound_payment.rs:304) and claim_htlc (2275) both derive the fee from get_pending_fee_msat() on the still-Retryable/Abandoned payment, with nothing mutating state between the PaymentSent push and mark_fulfilled at 2285 — so Fulfilled.fee_paid_msat and PaymentSent.fee_paid_msat are guaranteed identical. mark_fulfilled has only one caller.
  • get_pending_fee_msat now also covers the Fulfilled arm so the value survives MPP second-path/onchain re-claims and abandon→succeed transitions.
  • TLV (7, fee_paid_msat, option) for Fulfilled does not collide (existing: 0,1,3,5).
  • Version wording "prior to 0.3.0" matches the current crate version (0.3.0+git).
  • All other RecentPaymentDetails::{Pending,Fulfilled} sites (e.g. payment_tests.rs:1788, offers_tests.rs expect_recent_payment!) use .. or pattern-only matching, so no compile breakage.

No issues found.

Comment threadlightning/src/ln/channelmanager.rs Outdated
bool,
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
)
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These should go away if you format with 1.75

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

Comment threadlightning/src/ln/channelmanager.rs Outdated
/// Total routing fees paid for this payment, as also reported via the `fee_paid_msat`
/// field of [`Event::PaymentSent`].
///
/// `None` for payments fulfilled before this field was introduced.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should note the specific version

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.

added specific version (0.3.0)

@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

Introduce fields `pending_fee_msat` for `RecentPaymentDetails::Pending`
and `fee_paid_msat` for `RecentPaymentDetails::Fulfilled`.
@randomlogin
randomloginforce-pushed the expose-fees-in-payment-details branch from 95ece4a to af19ed5CompareJune 10, 2026 21:51
@wpaulino

Copy link
Copy Markdown
Contributor

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

I mean at this point, no, ideally not, but its trivial and @tnull wants it for lightningdevkit/ldk-node#815 so I figure we can.

total_msat: u64,
/// Total routing fees of the HTLCs currently in-flight for this payment.
///
/// `None` for payments serialized by LDK versions prior to 0.0.103.

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.

Ha, we don't support upgrading from 0.0.103 at this point, I don't think we need to even document this.

@TheBlueMatt
TheBlueMatt merged commit bfaedff into lightningdevkit:mainJun 15, 2026
1 check passed
@randomlogin
randomlogin deleted the expose-fees-in-payment-details branch June 22, 2026 13:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

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

Add fees value for recent payment details - #4674

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details
Jun 15, 2026
Merged

Add fees value for recent payment details#4674
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details

Conversation

@randomlogin

Copy link
Copy Markdown
Contributor

Previously it was not possible to obtain fees of pending/fulfilled payments.
Also we can add and populate the fee field for RecentPaymentDetails::Abandoned, but I doubt that it is useful, as the payment was not made.

I ran cargo fmt, so unrelated parts of code were changed.

Removed unnecessary clarification "in msat" for total_msat field.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 10, 2026

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@ldk-claude-review-bot

ldk-claude-review-bot commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

I re-examined the full data flow and all construction/match sites:

  • mark_fulfilled (outbound_payment.rs:304) and claim_htlc (2275) both derive the fee from get_pending_fee_msat() on the still-Retryable/Abandoned payment, with nothing mutating state between the PaymentSent push and mark_fulfilled at 2285 — so Fulfilled.fee_paid_msat and PaymentSent.fee_paid_msat are guaranteed identical. mark_fulfilled has only one caller.
  • get_pending_fee_msat now also covers the Fulfilled arm so the value survives MPP second-path/onchain re-claims and abandon→succeed transitions.
  • TLV (7, fee_paid_msat, option) for Fulfilled does not collide (existing: 0,1,3,5).
  • Version wording "prior to 0.3.0" matches the current crate version (0.3.0+git).
  • All other RecentPaymentDetails::{Pending,Fulfilled} sites (e.g. payment_tests.rs:1788, offers_tests.rs expect_recent_payment!) use .. or pattern-only matching, so no compile breakage.

No issues found.

Comment threadlightning/src/ln/channelmanager.rs Outdated
bool,
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
)
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These should go away if you format with 1.75

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

Comment threadlightning/src/ln/channelmanager.rs Outdated
/// Total routing fees paid for this payment, as also reported via the `fee_paid_msat`
/// field of [`Event::PaymentSent`].
///
/// `None` for payments fulfilled before this field was introduced.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should note the specific version

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.

added specific version (0.3.0)

@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

Introduce fields `pending_fee_msat` for `RecentPaymentDetails::Pending`
and `fee_paid_msat` for `RecentPaymentDetails::Fulfilled`.
@randomlogin
randomloginforce-pushed the expose-fees-in-payment-details branch from 95ece4a to af19ed5CompareJune 10, 2026 21:51
@wpaulino

Copy link
Copy Markdown
Contributor

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

I mean at this point, no, ideally not, but its trivial and @tnull wants it for lightningdevkit/ldk-node#815 so I figure we can.

total_msat: u64,
/// Total routing fees of the HTLCs currently in-flight for this payment.
///
/// `None` for payments serialized by LDK versions prior to 0.0.103.

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.

Ha, we don't support upgrading from 0.0.103 at this point, I don't think we need to even document this.

@TheBlueMatt
TheBlueMatt merged commit bfaedff into lightningdevkit:mainJun 15, 2026
1 check passed
@randomlogin
randomlogin deleted the expose-fees-in-payment-details branch June 22, 2026 13:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@randomlogin@ldk-reviews-bot@ldk-claude-review-bot@wpaulino@TheBlueMatt@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Add fees value for recent payment details - #4674

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details
Jun 15, 2026
Merged

Add fees value for recent payment details#4674
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details

Conversation

@randomlogin

Copy link
Copy Markdown
Contributor

Previously it was not possible to obtain fees of pending/fulfilled payments.
Also we can add and populate the fee field for RecentPaymentDetails::Abandoned, but I doubt that it is useful, as the payment was not made.

I ran cargo fmt, so unrelated parts of code were changed.

Removed unnecessary clarification "in msat" for total_msat field.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 10, 2026

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@ldk-claude-review-bot

ldk-claude-review-bot commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

I re-examined the full data flow and all construction/match sites:

  • mark_fulfilled (outbound_payment.rs:304) and claim_htlc (2275) both derive the fee from get_pending_fee_msat() on the still-Retryable/Abandoned payment, with nothing mutating state between the PaymentSent push and mark_fulfilled at 2285 — so Fulfilled.fee_paid_msat and PaymentSent.fee_paid_msat are guaranteed identical. mark_fulfilled has only one caller.
  • get_pending_fee_msat now also covers the Fulfilled arm so the value survives MPP second-path/onchain re-claims and abandon→succeed transitions.
  • TLV (7, fee_paid_msat, option) for Fulfilled does not collide (existing: 0,1,3,5).
  • Version wording "prior to 0.3.0" matches the current crate version (0.3.0+git).
  • All other RecentPaymentDetails::{Pending,Fulfilled} sites (e.g. payment_tests.rs:1788, offers_tests.rs expect_recent_payment!) use .. or pattern-only matching, so no compile breakage.

No issues found.

Comment threadlightning/src/ln/channelmanager.rs Outdated
bool,
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
)
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These should go away if you format with 1.75

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

Comment threadlightning/src/ln/channelmanager.rs Outdated
/// Total routing fees paid for this payment, as also reported via the `fee_paid_msat`
/// field of [`Event::PaymentSent`].
///
/// `None` for payments fulfilled before this field was introduced.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should note the specific version

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.

added specific version (0.3.0)

@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

Introduce fields `pending_fee_msat` for `RecentPaymentDetails::Pending`
and `fee_paid_msat` for `RecentPaymentDetails::Fulfilled`.
@randomlogin
randomloginforce-pushed the expose-fees-in-payment-details branch from 95ece4a to af19ed5CompareJune 10, 2026 21:51
@wpaulino

Copy link
Copy Markdown
Contributor

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

I mean at this point, no, ideally not, but its trivial and @tnull wants it for lightningdevkit/ldk-node#815 so I figure we can.

total_msat: u64,
/// Total routing fees of the HTLCs currently in-flight for this payment.
///
/// `None` for payments serialized by LDK versions prior to 0.0.103.

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.

Ha, we don't support upgrading from 0.0.103 at this point, I don't think we need to even document this.

@TheBlueMatt
TheBlueMatt merged commit bfaedff into lightningdevkit:mainJun 15, 2026
1 check passed
@randomlogin
randomlogin deleted the expose-fees-in-payment-details branch June 22, 2026 13:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@randomlogin@ldk-reviews-bot@ldk-claude-review-bot@wpaulino@TheBlueMatt@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add fees value for recent payment details - #4674

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details
Jun 15, 2026
Merged

Add fees value for recent payment details#4674
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details

Conversation

@randomlogin

Copy link
Copy Markdown
Contributor

Previously it was not possible to obtain fees of pending/fulfilled payments.
Also we can add and populate the fee field for RecentPaymentDetails::Abandoned, but I doubt that it is useful, as the payment was not made.

I ran cargo fmt, so unrelated parts of code were changed.

Removed unnecessary clarification "in msat" for total_msat field.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 10, 2026

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@ldk-claude-review-bot

ldk-claude-review-bot commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

I re-examined the full data flow and all construction/match sites:

  • mark_fulfilled (outbound_payment.rs:304) and claim_htlc (2275) both derive the fee from get_pending_fee_msat() on the still-Retryable/Abandoned payment, with nothing mutating state between the PaymentSent push and mark_fulfilled at 2285 — so Fulfilled.fee_paid_msat and PaymentSent.fee_paid_msat are guaranteed identical. mark_fulfilled has only one caller.
  • get_pending_fee_msat now also covers the Fulfilled arm so the value survives MPP second-path/onchain re-claims and abandon→succeed transitions.
  • TLV (7, fee_paid_msat, option) for Fulfilled does not collide (existing: 0,1,3,5).
  • Version wording "prior to 0.3.0" matches the current crate version (0.3.0+git).
  • All other RecentPaymentDetails::{Pending,Fulfilled} sites (e.g. payment_tests.rs:1788, offers_tests.rs expect_recent_payment!) use .. or pattern-only matching, so no compile breakage.

No issues found.

Comment threadlightning/src/ln/channelmanager.rs Outdated
bool,
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
)
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These should go away if you format with 1.75

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

Comment threadlightning/src/ln/channelmanager.rs Outdated
/// Total routing fees paid for this payment, as also reported via the `fee_paid_msat`
/// field of [`Event::PaymentSent`].
///
/// `None` for payments fulfilled before this field was introduced.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should note the specific version

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.

added specific version (0.3.0)

@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

Introduce fields `pending_fee_msat` for `RecentPaymentDetails::Pending`
and `fee_paid_msat` for `RecentPaymentDetails::Fulfilled`.
@randomlogin
randomloginforce-pushed the expose-fees-in-payment-details branch from 95ece4a to af19ed5CompareJune 10, 2026 21:51
@wpaulino

Copy link
Copy Markdown
Contributor

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

I mean at this point, no, ideally not, but its trivial and @tnull wants it for lightningdevkit/ldk-node#815 so I figure we can.

total_msat: u64,
/// Total routing fees of the HTLCs currently in-flight for this payment.
///
/// `None` for payments serialized by LDK versions prior to 0.0.103.

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.

Ha, we don't support upgrading from 0.0.103 at this point, I don't think we need to even document this.

@TheBlueMatt
TheBlueMatt merged commit bfaedff into lightningdevkit:mainJun 15, 2026
1 check passed
@randomlogin
randomlogin deleted the expose-fees-in-payment-details branch June 22, 2026 13:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@randomlogin@ldk-reviews-bot@ldk-claude-review-bot@wpaulino@TheBlueMatt@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add fees value for recent payment details - #4674

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details
Jun 15, 2026
Merged

Add fees value for recent payment details#4674
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details

Conversation

@randomlogin

Copy link
Copy Markdown
Contributor

Previously it was not possible to obtain fees of pending/fulfilled payments.
Also we can add and populate the fee field for RecentPaymentDetails::Abandoned, but I doubt that it is useful, as the payment was not made.

I ran cargo fmt, so unrelated parts of code were changed.

Removed unnecessary clarification "in msat" for total_msat field.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 10, 2026

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@ldk-claude-review-bot

ldk-claude-review-bot commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

I re-examined the full data flow and all construction/match sites:

  • mark_fulfilled (outbound_payment.rs:304) and claim_htlc (2275) both derive the fee from get_pending_fee_msat() on the still-Retryable/Abandoned payment, with nothing mutating state between the PaymentSent push and mark_fulfilled at 2285 — so Fulfilled.fee_paid_msat and PaymentSent.fee_paid_msat are guaranteed identical. mark_fulfilled has only one caller.
  • get_pending_fee_msat now also covers the Fulfilled arm so the value survives MPP second-path/onchain re-claims and abandon→succeed transitions.
  • TLV (7, fee_paid_msat, option) for Fulfilled does not collide (existing: 0,1,3,5).
  • Version wording "prior to 0.3.0" matches the current crate version (0.3.0+git).
  • All other RecentPaymentDetails::{Pending,Fulfilled} sites (e.g. payment_tests.rs:1788, offers_tests.rs expect_recent_payment!) use .. or pattern-only matching, so no compile breakage.

No issues found.

Comment threadlightning/src/ln/channelmanager.rs Outdated
bool,
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
)
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These should go away if you format with 1.75

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

Comment threadlightning/src/ln/channelmanager.rs Outdated
/// Total routing fees paid for this payment, as also reported via the `fee_paid_msat`
/// field of [`Event::PaymentSent`].
///
/// `None` for payments fulfilled before this field was introduced.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should note the specific version

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.

added specific version (0.3.0)

@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

Introduce fields `pending_fee_msat` for `RecentPaymentDetails::Pending`
and `fee_paid_msat` for `RecentPaymentDetails::Fulfilled`.
@randomlogin
randomloginforce-pushed the expose-fees-in-payment-details branch from 95ece4a to af19ed5CompareJune 10, 2026 21:51
@wpaulino

Copy link
Copy Markdown
Contributor

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

I mean at this point, no, ideally not, but its trivial and @tnull wants it for lightningdevkit/ldk-node#815 so I figure we can.

total_msat: u64,
/// Total routing fees of the HTLCs currently in-flight for this payment.
///
/// `None` for payments serialized by LDK versions prior to 0.0.103.

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.

Ha, we don't support upgrading from 0.0.103 at this point, I don't think we need to even document this.

@TheBlueMatt
TheBlueMatt merged commit bfaedff into lightningdevkit:mainJun 15, 2026
1 check passed
@randomlogin
randomlogin deleted the expose-fees-in-payment-details branch June 22, 2026 13:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

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

Add fees value for recent payment details - #4674

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details
Jun 15, 2026
Merged

Add fees value for recent payment details#4674
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
randomlogin:expose-fees-in-payment-details

Conversation

@randomlogin

Copy link
Copy Markdown
Contributor

Previously it was not possible to obtain fees of pending/fulfilled payments.
Also we can add and populate the fee field for RecentPaymentDetails::Abandoned, but I doubt that it is useful, as the payment was not made.

I ran cargo fmt, so unrelated parts of code were changed.

Removed unnecessary clarification "in msat" for total_msat field.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 10, 2026

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@ldk-claude-review-bot

ldk-claude-review-bot commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

I re-examined the full data flow and all construction/match sites:

  • mark_fulfilled (outbound_payment.rs:304) and claim_htlc (2275) both derive the fee from get_pending_fee_msat() on the still-Retryable/Abandoned payment, with nothing mutating state between the PaymentSent push and mark_fulfilled at 2285 — so Fulfilled.fee_paid_msat and PaymentSent.fee_paid_msat are guaranteed identical. mark_fulfilled has only one caller.
  • get_pending_fee_msat now also covers the Fulfilled arm so the value survives MPP second-path/onchain re-claims and abandon→succeed transitions.
  • TLV (7, fee_paid_msat, option) for Fulfilled does not collide (existing: 0,1,3,5).
  • Version wording "prior to 0.3.0" matches the current crate version (0.3.0+git).
  • All other RecentPaymentDetails::{Pending,Fulfilled} sites (e.g. payment_tests.rs:1788, offers_tests.rs expect_recent_payment!) use .. or pattern-only matching, so no compile breakage.

No issues found.

Comment threadlightning/src/ln/channelmanager.rs Outdated
bool,
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
)
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These should go away if you format with 1.75

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

Comment threadlightning/src/ln/channelmanager.rs Outdated
/// Total routing fees paid for this payment, as also reported via the `fee_paid_msat`
/// field of [`Event::PaymentSent`].
///
/// `None` for payments fulfilled before this field was introduced.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should note the specific version

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.

added specific version (0.3.0)

@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

Introduce fields `pending_fee_msat` for `RecentPaymentDetails::Pending`
and `fee_paid_msat` for `RecentPaymentDetails::Fulfilled`.
@randomlogin
randomloginforce-pushed the expose-fees-in-payment-details branch from 95ece4a to af19ed5CompareJune 10, 2026 21:51
@wpaulino

Copy link
Copy Markdown
Contributor

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

@TheBlueMatt not sure if you want this backported, it's just adding a new field.

I mean at this point, no, ideally not, but its trivial and @tnull wants it for lightningdevkit/ldk-node#815 so I figure we can.

total_msat: u64,
/// Total routing fees of the HTLCs currently in-flight for this payment.
///
/// `None` for payments serialized by LDK versions prior to 0.0.103.

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.

Ha, we don't support upgrading from 0.0.103 at this point, I don't think we need to even document this.

@TheBlueMatt
TheBlueMatt merged commit bfaedff into lightningdevkit:mainJun 15, 2026
1 check passed
@randomlogin
randomlogin deleted the expose-fees-in-payment-details branch June 22, 2026 13:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@randomlogin@ldk-reviews-bot@ldk-claude-review-bot@wpaulino@TheBlueMatt@tnull