Skip to content

(1/3) Minor error code fixes - #3699

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor
Apr 4, 2025
Merged

(1/3) Minor error code fixes#3699
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor

Conversation

@carlaKC

Copy link
Copy Markdown
Contributor

This PR pulls a few trivial commits out of #3601 which deal with error code handling unrelated to the larger refactor.

Opening this up in a separate PR because it makes a change to one of the trampoline error codes that is a little spec-ambiguous, originally pointed out here.

This failure code isn't used anywhere in the codebase and is not defined
in BOLT 04.
@ldk-reviews-bot

ldk-reviews-bot commented Apr 2, 2025

Copy link
Copy Markdown

I've assigned @valentinewallace 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.

@carlaKCcarlaKC changed the title Minor error code fixes(1/3) Minor error code fixesApr 2, 2025
@codecov

codecovBot commented Apr 2, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 89.15%. Comparing base (dd4b580) to head (87a5756).
Report is 2 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/onion_utils.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3699 +/- ##
==========================================
- Coverage 89.17% 89.15% -0.02% 
==========================================
Files 155 155 Lines 121023 121023 Branches 121023 121023 ==========================================
- Hits 107926 107904 -22 - Misses 10447 10461 +14 - Partials 2650 2658 +8 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment threadlightning/src/ln/blinded_payment_tests.rs

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great clean up :) I left a comment, otherwise LGTM

@carlaKC

Copy link
Copy Markdown
ContributorAuthor

Pushed fixup for incorrect code for invalid_onion_version that @valentinewallace caught 🙏

@valentinewallacevalentinewallace left a comment

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.

Feel free to squash!

if hop_data.intro_node_blinding_point.is_some() {
return Err(OnionDecodeErr::Relay {
err_msg: "Non-final intro node Trampoline onion data provided to us as last hop",
err_code: INVALID_ONION_BLINDING,

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.

Nice catch here!

Realm is no longer specified in BOLT04, use the specified version
error instead.
As is, we're returning an `invalid_onion_blinding` error with no
associated data, because the calling code does not attach any data
when we have a `OnionDecodeErr::Relay` error. This is arguably not
the correct error code anyway, as described below, so this commit
updates it to `invalid_onion_payload` which does not require additional
error data.
In this case, we have received a trampoline payload which we believe
should contain details of the next trampoline hop. This information
is missing, so we've received an invalid payload. When a blinding point
point is present in the payload, we're also the introduction node.
BOLT04 indicates that if this `current_path_key` is present and we are
the final hop we should return a regular error (rather than using
`invalid_onion_blinding` when you're the the final hop). Before this
commit, this code was considering our node to be non-final and returning
an error accordingly.
Our role as the final hop is ambiguous here - we are the final hop in
the sphinx packet, but the trampoline packet implies that there should
be more hops to come. Given that the trampoline packet is invalid, we
defer to our position in the sphinx packet and send back an invalid
payload error instead.
Although the specification allows an all-zero sha256_of_onion for
invalid_onion_blinding errors, it still requires that the value is set.

@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.

Thanks

@TheBlueMatt
TheBlueMatt merged commit 8ee85bf into lightningdevkit:mainApr 4, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@carlaKC@ldk-reviews-bot@TheBlueMatt@valentinewallace@vincenzopalazzo
, '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" + '
(1/3) Minor error code fixes by carlaKC · Pull Request #3699 · lightningdevkit/rust-lightning · GitHub
Skip to content

(1/3) Minor error code fixes - #3699

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor
Apr 4, 2025
Merged

(1/3) Minor error code fixes#3699
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor

Conversation

@carlaKC

Copy link
Copy Markdown
Contributor

This PR pulls a few trivial commits out of #3601 which deal with error code handling unrelated to the larger refactor.

Opening this up in a separate PR because it makes a change to one of the trampoline error codes that is a little spec-ambiguous, originally pointed out here.

This failure code isn't used anywhere in the codebase and is not defined
in BOLT 04.
@ldk-reviews-bot

ldk-reviews-bot commented Apr 2, 2025

Copy link
Copy Markdown

I've assigned @valentinewallace 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.

@carlaKCcarlaKC changed the title Minor error code fixes(1/3) Minor error code fixesApr 2, 2025
@codecov

codecovBot commented Apr 2, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 89.15%. Comparing base (dd4b580) to head (87a5756).
Report is 2 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/onion_utils.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3699 +/- ##
==========================================
- Coverage 89.17% 89.15% -0.02% 
==========================================
Files 155 155 Lines 121023 121023 Branches 121023 121023 ==========================================
- Hits 107926 107904 -22 - Misses 10447 10461 +14 - Partials 2650 2658 +8 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment threadlightning/src/ln/blinded_payment_tests.rs

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great clean up :) I left a comment, otherwise LGTM

@carlaKC

Copy link
Copy Markdown
ContributorAuthor

Pushed fixup for incorrect code for invalid_onion_version that @valentinewallace caught 🙏

@valentinewallacevalentinewallace left a comment

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.

Feel free to squash!

if hop_data.intro_node_blinding_point.is_some() {
return Err(OnionDecodeErr::Relay {
err_msg: "Non-final intro node Trampoline onion data provided to us as last hop",
err_code: INVALID_ONION_BLINDING,

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.

Nice catch here!

Realm is no longer specified in BOLT04, use the specified version
error instead.
As is, we're returning an `invalid_onion_blinding` error with no
associated data, because the calling code does not attach any data
when we have a `OnionDecodeErr::Relay` error. This is arguably not
the correct error code anyway, as described below, so this commit
updates it to `invalid_onion_payload` which does not require additional
error data.
In this case, we have received a trampoline payload which we believe
should contain details of the next trampoline hop. This information
is missing, so we've received an invalid payload. When a blinding point
point is present in the payload, we're also the introduction node.
BOLT04 indicates that if this `current_path_key` is present and we are
the final hop we should return a regular error (rather than using
`invalid_onion_blinding` when you're the the final hop). Before this
commit, this code was considering our node to be non-final and returning
an error accordingly.
Our role as the final hop is ambiguous here - we are the final hop in
the sphinx packet, but the trampoline packet implies that there should
be more hops to come. Given that the trampoline packet is invalid, we
defer to our position in the sphinx packet and send back an invalid
payload error instead.
Although the specification allows an all-zero sha256_of_onion for
invalid_onion_blinding errors, it still requires that the value is set.

@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.

Thanks

@TheBlueMatt
TheBlueMatt merged commit 8ee85bf into lightningdevkit:mainApr 4, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@carlaKC@ldk-reviews-bot@TheBlueMatt@valentinewallace@vincenzopalazzo
, '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('^' + ".*" + ' (1/3) Minor error code fixes by carlaKC · Pull Request #3699 · lightningdevkit/rust-lightning · GitHub
Skip to content

(1/3) Minor error code fixes - #3699

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor
Apr 4, 2025
Merged

(1/3) Minor error code fixes#3699
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor

Conversation

@carlaKC

Copy link
Copy Markdown
Contributor

This PR pulls a few trivial commits out of #3601 which deal with error code handling unrelated to the larger refactor.

Opening this up in a separate PR because it makes a change to one of the trampoline error codes that is a little spec-ambiguous, originally pointed out here.

This failure code isn't used anywhere in the codebase and is not defined
in BOLT 04.
@ldk-reviews-bot

ldk-reviews-bot commented Apr 2, 2025

Copy link
Copy Markdown

I've assigned @valentinewallace 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.

@carlaKCcarlaKC changed the title Minor error code fixes(1/3) Minor error code fixesApr 2, 2025
@codecov

codecovBot commented Apr 2, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 89.15%. Comparing base (dd4b580) to head (87a5756).
Report is 2 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/onion_utils.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3699 +/- ##
==========================================
- Coverage 89.17% 89.15% -0.02% 
==========================================
Files 155 155 Lines 121023 121023 Branches 121023 121023 ==========================================
- Hits 107926 107904 -22 - Misses 10447 10461 +14 - Partials 2650 2658 +8 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment threadlightning/src/ln/blinded_payment_tests.rs

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great clean up :) I left a comment, otherwise LGTM

@carlaKC

Copy link
Copy Markdown
ContributorAuthor

Pushed fixup for incorrect code for invalid_onion_version that @valentinewallace caught 🙏

@valentinewallacevalentinewallace left a comment

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.

Feel free to squash!

if hop_data.intro_node_blinding_point.is_some() {
return Err(OnionDecodeErr::Relay {
err_msg: "Non-final intro node Trampoline onion data provided to us as last hop",
err_code: INVALID_ONION_BLINDING,

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.

Nice catch here!

Realm is no longer specified in BOLT04, use the specified version
error instead.
As is, we're returning an `invalid_onion_blinding` error with no
associated data, because the calling code does not attach any data
when we have a `OnionDecodeErr::Relay` error. This is arguably not
the correct error code anyway, as described below, so this commit
updates it to `invalid_onion_payload` which does not require additional
error data.
In this case, we have received a trampoline payload which we believe
should contain details of the next trampoline hop. This information
is missing, so we've received an invalid payload. When a blinding point
point is present in the payload, we're also the introduction node.
BOLT04 indicates that if this `current_path_key` is present and we are
the final hop we should return a regular error (rather than using
`invalid_onion_blinding` when you're the the final hop). Before this
commit, this code was considering our node to be non-final and returning
an error accordingly.
Our role as the final hop is ambiguous here - we are the final hop in
the sphinx packet, but the trampoline packet implies that there should
be more hops to come. Given that the trampoline packet is invalid, we
defer to our position in the sphinx packet and send back an invalid
payload error instead.
Although the specification allows an all-zero sha256_of_onion for
invalid_onion_blinding errors, it still requires that the value is set.

@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.

Thanks

@TheBlueMatt
TheBlueMatt merged commit 8ee85bf into lightningdevkit:mainApr 4, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@carlaKC@ldk-reviews-bot@TheBlueMatt@valentinewallace@vincenzopalazzo
, '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('^' + ".*" + ' (1/3) Minor error code fixes by carlaKC · Pull Request #3699 · lightningdevkit/rust-lightning · GitHub
Skip to content

(1/3) Minor error code fixes - #3699

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor
Apr 4, 2025
Merged

(1/3) Minor error code fixes#3699
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor

Conversation

@carlaKC

Copy link
Copy Markdown
Contributor

This PR pulls a few trivial commits out of #3601 which deal with error code handling unrelated to the larger refactor.

Opening this up in a separate PR because it makes a change to one of the trampoline error codes that is a little spec-ambiguous, originally pointed out here.

This failure code isn't used anywhere in the codebase and is not defined
in BOLT 04.
@ldk-reviews-bot

ldk-reviews-bot commented Apr 2, 2025

Copy link
Copy Markdown

I've assigned @valentinewallace 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.

@carlaKCcarlaKC changed the title Minor error code fixes(1/3) Minor error code fixesApr 2, 2025
@codecov

codecovBot commented Apr 2, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 89.15%. Comparing base (dd4b580) to head (87a5756).
Report is 2 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/onion_utils.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3699 +/- ##
==========================================
- Coverage 89.17% 89.15% -0.02% 
==========================================
Files 155 155 Lines 121023 121023 Branches 121023 121023 ==========================================
- Hits 107926 107904 -22 - Misses 10447 10461 +14 - Partials 2650 2658 +8 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment threadlightning/src/ln/blinded_payment_tests.rs

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great clean up :) I left a comment, otherwise LGTM

@carlaKC

Copy link
Copy Markdown
ContributorAuthor

Pushed fixup for incorrect code for invalid_onion_version that @valentinewallace caught 🙏

@valentinewallacevalentinewallace left a comment

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.

Feel free to squash!

if hop_data.intro_node_blinding_point.is_some() {
return Err(OnionDecodeErr::Relay {
err_msg: "Non-final intro node Trampoline onion data provided to us as last hop",
err_code: INVALID_ONION_BLINDING,

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.

Nice catch here!

Realm is no longer specified in BOLT04, use the specified version
error instead.
As is, we're returning an `invalid_onion_blinding` error with no
associated data, because the calling code does not attach any data
when we have a `OnionDecodeErr::Relay` error. This is arguably not
the correct error code anyway, as described below, so this commit
updates it to `invalid_onion_payload` which does not require additional
error data.
In this case, we have received a trampoline payload which we believe
should contain details of the next trampoline hop. This information
is missing, so we've received an invalid payload. When a blinding point
point is present in the payload, we're also the introduction node.
BOLT04 indicates that if this `current_path_key` is present and we are
the final hop we should return a regular error (rather than using
`invalid_onion_blinding` when you're the the final hop). Before this
commit, this code was considering our node to be non-final and returning
an error accordingly.
Our role as the final hop is ambiguous here - we are the final hop in
the sphinx packet, but the trampoline packet implies that there should
be more hops to come. Given that the trampoline packet is invalid, we
defer to our position in the sphinx packet and send back an invalid
payload error instead.
Although the specification allows an all-zero sha256_of_onion for
invalid_onion_blinding errors, it still requires that the value is set.

@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.

Thanks

@TheBlueMatt
TheBlueMatt merged commit 8ee85bf into lightningdevkit:mainApr 4, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@carlaKC@ldk-reviews-bot@TheBlueMatt@valentinewallace@vincenzopalazzo
, '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" + ' (1/3) Minor error code fixes by carlaKC · Pull Request #3699 · lightningdevkit/rust-lightning · GitHub
Skip to content

(1/3) Minor error code fixes - #3699

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor
Apr 4, 2025
Merged

(1/3) Minor error code fixes#3699
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor

Conversation

@carlaKC

Copy link
Copy Markdown
Contributor

This PR pulls a few trivial commits out of #3601 which deal with error code handling unrelated to the larger refactor.

Opening this up in a separate PR because it makes a change to one of the trampoline error codes that is a little spec-ambiguous, originally pointed out here.

This failure code isn't used anywhere in the codebase and is not defined
in BOLT 04.
@ldk-reviews-bot

ldk-reviews-bot commented Apr 2, 2025

Copy link
Copy Markdown

I've assigned @valentinewallace 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.

@carlaKCcarlaKC changed the title Minor error code fixes(1/3) Minor error code fixesApr 2, 2025
@codecov

codecovBot commented Apr 2, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 89.15%. Comparing base (dd4b580) to head (87a5756).
Report is 2 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/onion_utils.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3699 +/- ##
==========================================
- Coverage 89.17% 89.15% -0.02% 
==========================================
Files 155 155 Lines 121023 121023 Branches 121023 121023 ==========================================
- Hits 107926 107904 -22 - Misses 10447 10461 +14 - Partials 2650 2658 +8 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment threadlightning/src/ln/blinded_payment_tests.rs

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great clean up :) I left a comment, otherwise LGTM

@carlaKC

Copy link
Copy Markdown
ContributorAuthor

Pushed fixup for incorrect code for invalid_onion_version that @valentinewallace caught 🙏

@valentinewallacevalentinewallace left a comment

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.

Feel free to squash!

if hop_data.intro_node_blinding_point.is_some() {
return Err(OnionDecodeErr::Relay {
err_msg: "Non-final intro node Trampoline onion data provided to us as last hop",
err_code: INVALID_ONION_BLINDING,

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.

Nice catch here!

Realm is no longer specified in BOLT04, use the specified version
error instead.
As is, we're returning an `invalid_onion_blinding` error with no
associated data, because the calling code does not attach any data
when we have a `OnionDecodeErr::Relay` error. This is arguably not
the correct error code anyway, as described below, so this commit
updates it to `invalid_onion_payload` which does not require additional
error data.
In this case, we have received a trampoline payload which we believe
should contain details of the next trampoline hop. This information
is missing, so we've received an invalid payload. When a blinding point
point is present in the payload, we're also the introduction node.
BOLT04 indicates that if this `current_path_key` is present and we are
the final hop we should return a regular error (rather than using
`invalid_onion_blinding` when you're the the final hop). Before this
commit, this code was considering our node to be non-final and returning
an error accordingly.
Our role as the final hop is ambiguous here - we are the final hop in
the sphinx packet, but the trampoline packet implies that there should
be more hops to come. Given that the trampoline packet is invalid, we
defer to our position in the sphinx packet and send back an invalid
payload error instead.
Although the specification allows an all-zero sha256_of_onion for
invalid_onion_blinding errors, it still requires that the value is set.

@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.

Thanks

@TheBlueMatt
TheBlueMatt merged commit 8ee85bf into lightningdevkit:mainApr 4, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@carlaKC@ldk-reviews-bot@TheBlueMatt@valentinewallace@vincenzopalazzo
, '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('^' + ".*" + ' (1/3) Minor error code fixes by carlaKC · Pull Request #3699 · lightningdevkit/rust-lightning · GitHub
Skip to content

(1/3) Minor error code fixes - #3699

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor
Apr 4, 2025
Merged

(1/3) Minor error code fixes#3699
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor

Conversation

@carlaKC

Copy link
Copy Markdown
Contributor

This PR pulls a few trivial commits out of #3601 which deal with error code handling unrelated to the larger refactor.

Opening this up in a separate PR because it makes a change to one of the trampoline error codes that is a little spec-ambiguous, originally pointed out here.

This failure code isn't used anywhere in the codebase and is not defined
in BOLT 04.
@ldk-reviews-bot

ldk-reviews-bot commented Apr 2, 2025

Copy link
Copy Markdown

I've assigned @valentinewallace 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.

@carlaKCcarlaKC changed the title Minor error code fixes(1/3) Minor error code fixesApr 2, 2025
@codecov

codecovBot commented Apr 2, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 89.15%. Comparing base (dd4b580) to head (87a5756).
Report is 2 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/onion_utils.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3699 +/- ##
==========================================
- Coverage 89.17% 89.15% -0.02% 
==========================================
Files 155 155 Lines 121023 121023 Branches 121023 121023 ==========================================
- Hits 107926 107904 -22 - Misses 10447 10461 +14 - Partials 2650 2658 +8 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment threadlightning/src/ln/blinded_payment_tests.rs

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great clean up :) I left a comment, otherwise LGTM

@carlaKC

Copy link
Copy Markdown
ContributorAuthor

Pushed fixup for incorrect code for invalid_onion_version that @valentinewallace caught 🙏

@valentinewallacevalentinewallace left a comment

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.

Feel free to squash!

if hop_data.intro_node_blinding_point.is_some() {
return Err(OnionDecodeErr::Relay {
err_msg: "Non-final intro node Trampoline onion data provided to us as last hop",
err_code: INVALID_ONION_BLINDING,

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.

Nice catch here!

Realm is no longer specified in BOLT04, use the specified version
error instead.
As is, we're returning an `invalid_onion_blinding` error with no
associated data, because the calling code does not attach any data
when we have a `OnionDecodeErr::Relay` error. This is arguably not
the correct error code anyway, as described below, so this commit
updates it to `invalid_onion_payload` which does not require additional
error data.
In this case, we have received a trampoline payload which we believe
should contain details of the next trampoline hop. This information
is missing, so we've received an invalid payload. When a blinding point
point is present in the payload, we're also the introduction node.
BOLT04 indicates that if this `current_path_key` is present and we are
the final hop we should return a regular error (rather than using
`invalid_onion_blinding` when you're the the final hop). Before this
commit, this code was considering our node to be non-final and returning
an error accordingly.
Our role as the final hop is ambiguous here - we are the final hop in
the sphinx packet, but the trampoline packet implies that there should
be more hops to come. Given that the trampoline packet is invalid, we
defer to our position in the sphinx packet and send back an invalid
payload error instead.
Although the specification allows an all-zero sha256_of_onion for
invalid_onion_blinding errors, it still requires that the value is set.

@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.

Thanks

@TheBlueMatt
TheBlueMatt merged commit 8ee85bf into lightningdevkit:mainApr 4, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@carlaKC@ldk-reviews-bot@TheBlueMatt@valentinewallace@vincenzopalazzo
, '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('^' + ".*" + ' (1/3) Minor error code fixes by carlaKC · Pull Request #3699 · lightningdevkit/rust-lightning · GitHub
Skip to content

(1/3) Minor error code fixes - #3699

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor
Apr 4, 2025
Merged

(1/3) Minor error code fixes#3699
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor

Conversation

@carlaKC

Copy link
Copy Markdown
Contributor

This PR pulls a few trivial commits out of #3601 which deal with error code handling unrelated to the larger refactor.

Opening this up in a separate PR because it makes a change to one of the trampoline error codes that is a little spec-ambiguous, originally pointed out here.

This failure code isn't used anywhere in the codebase and is not defined
in BOLT 04.
@ldk-reviews-bot

ldk-reviews-bot commented Apr 2, 2025

Copy link
Copy Markdown

I've assigned @valentinewallace 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.

@carlaKCcarlaKC changed the title Minor error code fixes(1/3) Minor error code fixesApr 2, 2025
@codecov

codecovBot commented Apr 2, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 89.15%. Comparing base (dd4b580) to head (87a5756).
Report is 2 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/onion_utils.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3699 +/- ##
==========================================
- Coverage 89.17% 89.15% -0.02% 
==========================================
Files 155 155 Lines 121023 121023 Branches 121023 121023 ==========================================
- Hits 107926 107904 -22 - Misses 10447 10461 +14 - Partials 2650 2658 +8 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment threadlightning/src/ln/blinded_payment_tests.rs

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great clean up :) I left a comment, otherwise LGTM

@carlaKC

Copy link
Copy Markdown
ContributorAuthor

Pushed fixup for incorrect code for invalid_onion_version that @valentinewallace caught 🙏

@valentinewallacevalentinewallace left a comment

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.

Feel free to squash!

if hop_data.intro_node_blinding_point.is_some() {
return Err(OnionDecodeErr::Relay {
err_msg: "Non-final intro node Trampoline onion data provided to us as last hop",
err_code: INVALID_ONION_BLINDING,

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.

Nice catch here!

Realm is no longer specified in BOLT04, use the specified version
error instead.
As is, we're returning an `invalid_onion_blinding` error with no
associated data, because the calling code does not attach any data
when we have a `OnionDecodeErr::Relay` error. This is arguably not
the correct error code anyway, as described below, so this commit
updates it to `invalid_onion_payload` which does not require additional
error data.
In this case, we have received a trampoline payload which we believe
should contain details of the next trampoline hop. This information
is missing, so we've received an invalid payload. When a blinding point
point is present in the payload, we're also the introduction node.
BOLT04 indicates that if this `current_path_key` is present and we are
the final hop we should return a regular error (rather than using
`invalid_onion_blinding` when you're the the final hop). Before this
commit, this code was considering our node to be non-final and returning
an error accordingly.
Our role as the final hop is ambiguous here - we are the final hop in
the sphinx packet, but the trampoline packet implies that there should
be more hops to come. Given that the trampoline packet is invalid, we
defer to our position in the sphinx packet and send back an invalid
payload error instead.
Although the specification allows an all-zero sha256_of_onion for
invalid_onion_blinding errors, it still requires that the value is set.

@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.

Thanks

@TheBlueMatt
TheBlueMatt merged commit 8ee85bf into lightningdevkit:mainApr 4, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@carlaKC@ldk-reviews-bot@TheBlueMatt@valentinewallace@vincenzopalazzo
, '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); } })(); })(); (1/3) Minor error code fixes by carlaKC · Pull Request #3699 · lightningdevkit/rust-lightning · GitHub
Skip to content

(1/3) Minor error code fixes - #3699

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor
Apr 4, 2025
Merged

(1/3) Minor error code fixes#3699
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
carlaKC:3541-prefactor

Conversation

@carlaKC

Copy link
Copy Markdown
Contributor

This PR pulls a few trivial commits out of #3601 which deal with error code handling unrelated to the larger refactor.

Opening this up in a separate PR because it makes a change to one of the trampoline error codes that is a little spec-ambiguous, originally pointed out here.

This failure code isn't used anywhere in the codebase and is not defined
in BOLT 04.
@ldk-reviews-bot

ldk-reviews-bot commented Apr 2, 2025

Copy link
Copy Markdown

I've assigned @valentinewallace 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.

@carlaKCcarlaKC changed the title Minor error code fixes(1/3) Minor error code fixesApr 2, 2025
@codecov

codecovBot commented Apr 2, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 89.15%. Comparing base (dd4b580) to head (87a5756).
Report is 2 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/onion_utils.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3699 +/- ##
==========================================
- Coverage 89.17% 89.15% -0.02% 
==========================================
Files 155 155 Lines 121023 121023 Branches 121023 121023 ==========================================
- Hits 107926 107904 -22 - Misses 10447 10461 +14 - Partials 2650 2658 +8 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment threadlightning/src/ln/blinded_payment_tests.rs

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great clean up :) I left a comment, otherwise LGTM

@carlaKC

Copy link
Copy Markdown
ContributorAuthor

Pushed fixup for incorrect code for invalid_onion_version that @valentinewallace caught 🙏

@valentinewallacevalentinewallace left a comment

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.

Feel free to squash!

if hop_data.intro_node_blinding_point.is_some() {
return Err(OnionDecodeErr::Relay {
err_msg: "Non-final intro node Trampoline onion data provided to us as last hop",
err_code: INVALID_ONION_BLINDING,

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.

Nice catch here!

Realm is no longer specified in BOLT04, use the specified version
error instead.
As is, we're returning an `invalid_onion_blinding` error with no
associated data, because the calling code does not attach any data
when we have a `OnionDecodeErr::Relay` error. This is arguably not
the correct error code anyway, as described below, so this commit
updates it to `invalid_onion_payload` which does not require additional
error data.
In this case, we have received a trampoline payload which we believe
should contain details of the next trampoline hop. This information
is missing, so we've received an invalid payload. When a blinding point
point is present in the payload, we're also the introduction node.
BOLT04 indicates that if this `current_path_key` is present and we are
the final hop we should return a regular error (rather than using
`invalid_onion_blinding` when you're the the final hop). Before this
commit, this code was considering our node to be non-final and returning
an error accordingly.
Our role as the final hop is ambiguous here - we are the final hop in
the sphinx packet, but the trampoline packet implies that there should
be more hops to come. Given that the trampoline packet is invalid, we
defer to our position in the sphinx packet and send back an invalid
payload error instead.
Although the specification allows an all-zero sha256_of_onion for
invalid_onion_blinding errors, it still requires that the value is set.

@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.

Thanks

@TheBlueMatt
TheBlueMatt merged commit 8ee85bf into lightningdevkit:mainApr 4, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@carlaKC@ldk-reviews-bot@TheBlueMatt@valentinewallace@vincenzopalazzo