Skip to content

Explicitly reject routes that double-back - #2741

Merged
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215
Nov 27, 2023
Merged

Explicitly reject routes that double-back#2741
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215

Conversation

@shaavan

Copy link
Copy Markdown
Member

Resolves#2215

  • If a path within a route passes through the same channelID twice, that shows the path is looped and will be rejected by nodes.
  • Add a check to explicitly reject such payments before trying to send them.

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

Thanks for taking a stab at this!

Comment threadlightning/src/ln/outbound_payment.rs Outdated
- If a path within a route passes through the same channelID twice,
that shows the path is looped and will be rejected by nodes.
- Add a check to explicitly reject such payment before trying to send
them.
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.01 -> pr2741.02 (diff)
Addressed @tnull suggestion

  • Modified the code to use nested for loops instead of a HashSet. Since the number of routeHops will always be very small (<20 for a path), this approach optimized the space complexity over time.

@codecov-commenter

codecov-commenter commented Nov 22, 2023

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.52%. Comparing base (870a0f1) to head (a06d158).
⚠️ Report is 4939 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/functional_tests.rs91.30%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2741 +/- ##
==========================================
- Coverage 88.55% 88.52% -0.04% 
==========================================
Files 113 113 Lines 89330 89351 +21 Branches 89330 89351 +21 ==========================================
- Hits 79110 79097 -13 - Misses 7849 7877 +28 - Partials 2371 2377 +6 

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

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

Pretty much looks good to me. Could we add some test coverage for it though?

You could add a tiny test case checking that we receive the correct APIError if we try to use a looping route. The setup should be similar to, e.g., fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() in functional_tests.rs.

- Also modify the unwrap_send_err!() macro to handle the
PathParameterError
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.02 -> pr2741.03 (diff)
Addressed @tnull comments

  • Added test coverage for the added code.
  • Also modified the unwrap_send_error!() macro to handle PaymentPathFailure case.

Thanks, @tnull, for the suggestion and for providing a reference to take inspiration for writing up the test.

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

LGTM

@tnull
tnull merged commit a0183d7 into lightningdevkit:mainNov 27, 2023
@shaavanshaavan mentioned this pull request Dec 15, 2023
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.

Explicitly reject routes which double back

3 participants

@shaavan@codecov-commenter@tnull
, '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" + '
Explicitly reject routes that double-back by shaavan · Pull Request #2741 · lightningdevkit/rust-lightning · GitHub
Skip to content

Explicitly reject routes that double-back - #2741

Merged
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215
Nov 27, 2023
Merged

Explicitly reject routes that double-back#2741
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215

Conversation

@shaavan

Copy link
Copy Markdown
Member

Resolves#2215

  • If a path within a route passes through the same channelID twice, that shows the path is looped and will be rejected by nodes.
  • Add a check to explicitly reject such payments before trying to send them.

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

Thanks for taking a stab at this!

Comment threadlightning/src/ln/outbound_payment.rs Outdated
- If a path within a route passes through the same channelID twice,
that shows the path is looped and will be rejected by nodes.
- Add a check to explicitly reject such payment before trying to send
them.
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.01 -> pr2741.02 (diff)
Addressed @tnull suggestion

  • Modified the code to use nested for loops instead of a HashSet. Since the number of routeHops will always be very small (<20 for a path), this approach optimized the space complexity over time.

@codecov-commenter

codecov-commenter commented Nov 22, 2023

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.52%. Comparing base (870a0f1) to head (a06d158).
⚠️ Report is 4939 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/functional_tests.rs91.30%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2741 +/- ##
==========================================
- Coverage 88.55% 88.52% -0.04% 
==========================================
Files 113 113 Lines 89330 89351 +21 Branches 89330 89351 +21 ==========================================
- Hits 79110 79097 -13 - Misses 7849 7877 +28 - Partials 2371 2377 +6 

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

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

Pretty much looks good to me. Could we add some test coverage for it though?

You could add a tiny test case checking that we receive the correct APIError if we try to use a looping route. The setup should be similar to, e.g., fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() in functional_tests.rs.

- Also modify the unwrap_send_err!() macro to handle the
PathParameterError
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.02 -> pr2741.03 (diff)
Addressed @tnull comments

  • Added test coverage for the added code.
  • Also modified the unwrap_send_error!() macro to handle PaymentPathFailure case.

Thanks, @tnull, for the suggestion and for providing a reference to take inspiration for writing up the test.

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

LGTM

@tnull
tnull merged commit a0183d7 into lightningdevkit:mainNov 27, 2023
@shaavanshaavan mentioned this pull request Dec 15, 2023
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.

Explicitly reject routes which double back

3 participants

@shaavan@codecov-commenter@tnull
, '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('^' + ".*" + ' Explicitly reject routes that double-back by shaavan · Pull Request #2741 · lightningdevkit/rust-lightning · GitHub
Skip to content

Explicitly reject routes that double-back - #2741

Merged
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215
Nov 27, 2023
Merged

Explicitly reject routes that double-back#2741
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215

Conversation

@shaavan

Copy link
Copy Markdown
Member

Resolves#2215

  • If a path within a route passes through the same channelID twice, that shows the path is looped and will be rejected by nodes.
  • Add a check to explicitly reject such payments before trying to send them.

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

Thanks for taking a stab at this!

Comment threadlightning/src/ln/outbound_payment.rs Outdated
- If a path within a route passes through the same channelID twice,
that shows the path is looped and will be rejected by nodes.
- Add a check to explicitly reject such payment before trying to send
them.
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.01 -> pr2741.02 (diff)
Addressed @tnull suggestion

  • Modified the code to use nested for loops instead of a HashSet. Since the number of routeHops will always be very small (<20 for a path), this approach optimized the space complexity over time.

@codecov-commenter

codecov-commenter commented Nov 22, 2023

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.52%. Comparing base (870a0f1) to head (a06d158).
⚠️ Report is 4939 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/functional_tests.rs91.30%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2741 +/- ##
==========================================
- Coverage 88.55% 88.52% -0.04% 
==========================================
Files 113 113 Lines 89330 89351 +21 Branches 89330 89351 +21 ==========================================
- Hits 79110 79097 -13 - Misses 7849 7877 +28 - Partials 2371 2377 +6 

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

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

Pretty much looks good to me. Could we add some test coverage for it though?

You could add a tiny test case checking that we receive the correct APIError if we try to use a looping route. The setup should be similar to, e.g., fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() in functional_tests.rs.

- Also modify the unwrap_send_err!() macro to handle the
PathParameterError
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.02 -> pr2741.03 (diff)
Addressed @tnull comments

  • Added test coverage for the added code.
  • Also modified the unwrap_send_error!() macro to handle PaymentPathFailure case.

Thanks, @tnull, for the suggestion and for providing a reference to take inspiration for writing up the test.

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

LGTM

@tnull
tnull merged commit a0183d7 into lightningdevkit:mainNov 27, 2023
@shaavanshaavan mentioned this pull request Dec 15, 2023
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.

Explicitly reject routes which double back

3 participants

@shaavan@codecov-commenter@tnull
, '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('^' + ".*" + ' Explicitly reject routes that double-back by shaavan · Pull Request #2741 · lightningdevkit/rust-lightning · GitHub
Skip to content

Explicitly reject routes that double-back - #2741

Merged
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215
Nov 27, 2023
Merged

Explicitly reject routes that double-back#2741
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215

Conversation

@shaavan

Copy link
Copy Markdown
Member

Resolves#2215

  • If a path within a route passes through the same channelID twice, that shows the path is looped and will be rejected by nodes.
  • Add a check to explicitly reject such payments before trying to send them.

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

Thanks for taking a stab at this!

Comment threadlightning/src/ln/outbound_payment.rs Outdated
- If a path within a route passes through the same channelID twice,
that shows the path is looped and will be rejected by nodes.
- Add a check to explicitly reject such payment before trying to send
them.
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.01 -> pr2741.02 (diff)
Addressed @tnull suggestion

  • Modified the code to use nested for loops instead of a HashSet. Since the number of routeHops will always be very small (<20 for a path), this approach optimized the space complexity over time.

@codecov-commenter

codecov-commenter commented Nov 22, 2023

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.52%. Comparing base (870a0f1) to head (a06d158).
⚠️ Report is 4939 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/functional_tests.rs91.30%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2741 +/- ##
==========================================
- Coverage 88.55% 88.52% -0.04% 
==========================================
Files 113 113 Lines 89330 89351 +21 Branches 89330 89351 +21 ==========================================
- Hits 79110 79097 -13 - Misses 7849 7877 +28 - Partials 2371 2377 +6 

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

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

Pretty much looks good to me. Could we add some test coverage for it though?

You could add a tiny test case checking that we receive the correct APIError if we try to use a looping route. The setup should be similar to, e.g., fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() in functional_tests.rs.

- Also modify the unwrap_send_err!() macro to handle the
PathParameterError
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.02 -> pr2741.03 (diff)
Addressed @tnull comments

  • Added test coverage for the added code.
  • Also modified the unwrap_send_error!() macro to handle PaymentPathFailure case.

Thanks, @tnull, for the suggestion and for providing a reference to take inspiration for writing up the test.

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

LGTM

@tnull
tnull merged commit a0183d7 into lightningdevkit:mainNov 27, 2023
@shaavanshaavan mentioned this pull request Dec 15, 2023
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.

Explicitly reject routes which double back

3 participants

@shaavan@codecov-commenter@tnull
, '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" + ' Explicitly reject routes that double-back by shaavan · Pull Request #2741 · lightningdevkit/rust-lightning · GitHub
Skip to content

Explicitly reject routes that double-back - #2741

Merged
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215
Nov 27, 2023
Merged

Explicitly reject routes that double-back#2741
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215

Conversation

@shaavan

Copy link
Copy Markdown
Member

Resolves#2215

  • If a path within a route passes through the same channelID twice, that shows the path is looped and will be rejected by nodes.
  • Add a check to explicitly reject such payments before trying to send them.

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

Thanks for taking a stab at this!

Comment threadlightning/src/ln/outbound_payment.rs Outdated
- If a path within a route passes through the same channelID twice,
that shows the path is looped and will be rejected by nodes.
- Add a check to explicitly reject such payment before trying to send
them.
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.01 -> pr2741.02 (diff)
Addressed @tnull suggestion

  • Modified the code to use nested for loops instead of a HashSet. Since the number of routeHops will always be very small (<20 for a path), this approach optimized the space complexity over time.

@codecov-commenter

codecov-commenter commented Nov 22, 2023

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.52%. Comparing base (870a0f1) to head (a06d158).
⚠️ Report is 4939 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/functional_tests.rs91.30%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2741 +/- ##
==========================================
- Coverage 88.55% 88.52% -0.04% 
==========================================
Files 113 113 Lines 89330 89351 +21 Branches 89330 89351 +21 ==========================================
- Hits 79110 79097 -13 - Misses 7849 7877 +28 - Partials 2371 2377 +6 

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

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

Pretty much looks good to me. Could we add some test coverage for it though?

You could add a tiny test case checking that we receive the correct APIError if we try to use a looping route. The setup should be similar to, e.g., fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() in functional_tests.rs.

- Also modify the unwrap_send_err!() macro to handle the
PathParameterError
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.02 -> pr2741.03 (diff)
Addressed @tnull comments

  • Added test coverage for the added code.
  • Also modified the unwrap_send_error!() macro to handle PaymentPathFailure case.

Thanks, @tnull, for the suggestion and for providing a reference to take inspiration for writing up the test.

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

LGTM

@tnull
tnull merged commit a0183d7 into lightningdevkit:mainNov 27, 2023
@shaavanshaavan mentioned this pull request Dec 15, 2023
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.

Explicitly reject routes which double back

3 participants

@shaavan@codecov-commenter@tnull
, '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('^' + ".*" + ' Explicitly reject routes that double-back by shaavan · Pull Request #2741 · lightningdevkit/rust-lightning · GitHub
Skip to content

Explicitly reject routes that double-back - #2741

Merged
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215
Nov 27, 2023
Merged

Explicitly reject routes that double-back#2741
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215

Conversation

@shaavan

Copy link
Copy Markdown
Member

Resolves#2215

  • If a path within a route passes through the same channelID twice, that shows the path is looped and will be rejected by nodes.
  • Add a check to explicitly reject such payments before trying to send them.

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

Thanks for taking a stab at this!

Comment threadlightning/src/ln/outbound_payment.rs Outdated
- If a path within a route passes through the same channelID twice,
that shows the path is looped and will be rejected by nodes.
- Add a check to explicitly reject such payment before trying to send
them.
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.01 -> pr2741.02 (diff)
Addressed @tnull suggestion

  • Modified the code to use nested for loops instead of a HashSet. Since the number of routeHops will always be very small (<20 for a path), this approach optimized the space complexity over time.

@codecov-commenter

codecov-commenter commented Nov 22, 2023

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.52%. Comparing base (870a0f1) to head (a06d158).
⚠️ Report is 4939 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/functional_tests.rs91.30%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2741 +/- ##
==========================================
- Coverage 88.55% 88.52% -0.04% 
==========================================
Files 113 113 Lines 89330 89351 +21 Branches 89330 89351 +21 ==========================================
- Hits 79110 79097 -13 - Misses 7849 7877 +28 - Partials 2371 2377 +6 

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

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

Pretty much looks good to me. Could we add some test coverage for it though?

You could add a tiny test case checking that we receive the correct APIError if we try to use a looping route. The setup should be similar to, e.g., fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() in functional_tests.rs.

- Also modify the unwrap_send_err!() macro to handle the
PathParameterError
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.02 -> pr2741.03 (diff)
Addressed @tnull comments

  • Added test coverage for the added code.
  • Also modified the unwrap_send_error!() macro to handle PaymentPathFailure case.

Thanks, @tnull, for the suggestion and for providing a reference to take inspiration for writing up the test.

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

LGTM

@tnull
tnull merged commit a0183d7 into lightningdevkit:mainNov 27, 2023
@shaavanshaavan mentioned this pull request Dec 15, 2023
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.

Explicitly reject routes which double back

3 participants

@shaavan@codecov-commenter@tnull
, '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); } })(); })(); Explicitly reject routes that double-back by shaavan · Pull Request #2741 · lightningdevkit/rust-lightning · GitHub
Skip to content

Explicitly reject routes that double-back - #2741

Merged
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215
Nov 27, 2023
Merged

Explicitly reject routes that double-back#2741
tnull merged 2 commits into
lightningdevkit:mainfrom
shaavan:issue-2215

Conversation

@shaavan

Copy link
Copy Markdown
Member

Resolves#2215

  • If a path within a route passes through the same channelID twice, that shows the path is looped and will be rejected by nodes.
  • Add a check to explicitly reject such payments before trying to send them.

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

Thanks for taking a stab at this!

Comment threadlightning/src/ln/outbound_payment.rs Outdated
- If a path within a route passes through the same channelID twice,
that shows the path is looped and will be rejected by nodes.
- Add a check to explicitly reject such payment before trying to send
them.
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.01 -> pr2741.02 (diff)
Addressed @tnull suggestion

  • Modified the code to use nested for loops instead of a HashSet. Since the number of routeHops will always be very small (<20 for a path), this approach optimized the space complexity over time.

@codecov-commenter

codecov-commenter commented Nov 22, 2023

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.52%. Comparing base (870a0f1) to head (a06d158).
⚠️ Report is 4939 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/functional_tests.rs91.30%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2741 +/- ##
==========================================
- Coverage 88.55% 88.52% -0.04% 
==========================================
Files 113 113 Lines 89330 89351 +21 Branches 89330 89351 +21 ==========================================
- Hits 79110 79097 -13 - Misses 7849 7877 +28 - Partials 2371 2377 +6 

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

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

Pretty much looks good to me. Could we add some test coverage for it though?

You could add a tiny test case checking that we receive the correct APIError if we try to use a looping route. The setup should be similar to, e.g., fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() in functional_tests.rs.

- Also modify the unwrap_send_err!() macro to handle the
PathParameterError
@shaavan

Copy link
Copy Markdown
MemberAuthor

Updated from pr2741.02 -> pr2741.03 (diff)
Addressed @tnull comments

  • Added test coverage for the added code.
  • Also modified the unwrap_send_error!() macro to handle PaymentPathFailure case.

Thanks, @tnull, for the suggestion and for providing a reference to take inspiration for writing up the test.

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

LGTM

@tnull
tnull merged commit a0183d7 into lightningdevkit:mainNov 27, 2023
@shaavanshaavan mentioned this pull request Dec 15, 2023
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.

Explicitly reject routes which double back

3 participants

@shaavan@codecov-commenter@tnull