Payee abstraction for use in get_route and PaymentPathFailed - #1134

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg
Oct 25, 2021
Merged

Payee abstraction for use in get_route and PaymentPathFailed#1134
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg

Conversation

@jkczyz

@jkczyzjkczyz commented Oct 20, 2021

Copy link
Copy Markdown
Contributor

Refactor's get_route to take a Payee parameter consisting of the payee's pubkey along with invoice features and route hints, if any. This is included in PaymentPathFailed as part of PaymentPathRetry along with a final amount and CLTV, used for re-computing a Route when retrying payments.

@jkczyz
jkczyz marked this pull request as draft October 20, 2021 14:28
@codecov

codecovBot commented Oct 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1134 (8e7ceab) into main (107c6c7) will increase coverage by 1.08%.
The diff coverage is 84.25%.

Impacted file tree graph

@@ Coverage Diff @@## main #1134 +/- ##
==========================================
+ Coverage 90.40% 91.49% +1.08% 
==========================================
Files 68 68 Lines 34796 40055 +5259 ==========================================
+ Hits 31458 36647 +5189 - Misses 3338 3408 +70 
Impacted FilesCoverage Δ
lightning/src/routing/scorer.rs66.66% <ø> (ø)
lightning/src/util/events.rs33.33% <20.00%> (ø)
lightning-invoice/src/lib.rs88.11% <50.00%> (ø)
lightning/src/routing/router.rs94.58% <83.23%> (-1.13%)⬇️
lightning/src/ln/channelmanager.rs87.41% <91.66%> (+3.89%)⬆️
lightning-invoice/src/utils.rs84.09% <100.00%> (-0.18%)⬇️
lightning/src/ln/functional_test_utils.rs96.54% <100.00%> (+1.45%)⬆️
lightning/src/ln/functional_tests.rs98.10% <100.00%> (+0.69%)⬆️
lightning/src/ln/onion_route_tests.rs96.60% <100.00%> (ø)
lightning/src/ln/shutdown_tests.rs95.89% <100.00%> (+0.01%)⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 107c6c7...8e7ceab. Read the comment docs.

@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from ffae900 to 74d8896CompareOctober 20, 2021 16:33
@TheBlueMattTheBlueMatt added this to the 0.0.103 milestone Oct 21, 2021
@jkczyz
jkczyz marked this pull request as ready for review October 22, 2021 05:39
Comment threadlightning/src/routing/router.rs Outdated
}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Hmm, I thought based on this discussion this type of constructor wasn't supported in the bindings? Wondering what's different in this case

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?

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.

Ah, right... foiled! Took @TheBlueMatt suggestion to maintain expressiveness. I could also make them take &self at the expense of a clone, FWIW. Let me know if you'd prefer that over not exposing them in bindings / making the fields pub.

all_paths_failed,
path: path.clone(),
short_channel_id: Some(path.first().unwrap().short_channel_id),
retry: None,

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.

Hmm, little confused why this isn't set anywhere atm -- maybe I should know this lol, but any TL;DR about how this PR fits into the largest retries picture?

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.

@TheBlueMatt is working on it. Getting this change in allows me to work on the InvoicePayer side independently.

Comment threadlightning/src/routing/router.rs Outdated
(2, short_channel_id, required),
(4, fees, required),
(6, cltv_expiry_delta, required),
(1, htlc_minimum_msat, option),

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.

Don't these need to go in type-order? Is there any test coverage of serializing a RouteHintHop?

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.

Whoops... was hoping we had some magic to write order. 🙂

Re-ordered. I could make them even instead. Not sure if you have a preference on these as they aren't in the invoice.

I guess we'll have coverage once PaymentPathRetry is populated in PaymentPathFailed.

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.

Yea, that all sounds fine, I don't have a preference about required or not.

}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?


/// The recipient of a payment.
#[derive(Clone, Debug)]
pub struct Payee {

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.

To make sure we're on the same page - do we intend to pass a Payee to ChannelManager::send_payment explicitly, or should we include it in the Route object as an extra field?

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.

Hmm... good question. Was thinking we'd pass it in to send_payment. Otherwise, you'd pass it to get_route only to have it cloned to include in the returned Route.

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.

I think I don't have a strong feelings. It kinda feels cool if its just kinda automagically passed in for you, without users having to do anything to get it there or any chance of setting it wrong or something, but its also a bit of a strange API, agreed there.

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.

That's a good point. We'll need to copy the payee potentially for each path anyhow. I'd be ok with adding a field to Route.

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

Going AFK shortly unfortunately, but this is looking fine to me, can't find much to comment on. Can give it another review over the weekend

Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from 5b7f044 to 6477442CompareOctober 22, 2021 22:21
Comment threadlightning/src/routing/router.rs Outdated
A payee can be identified by a pubkey and optionally have an associated
set of invoice features and route hints. Use this in get_route instead
of three separate parameters. This may be included in PaymentPathFailed
later to use when finding a new route.
When a payment path fails, it may be retried. Typically, this means
re-computing the route after updating the NetworkGraph and channel
scores in order to avoid the failing hop. The last hop in
PaymentPathFailed's path field contains the pubkey, amount, and CLTV
values needed to pass to get_route. However, it does not contain the
payee's features and route hints from the invoice.
Include the entire set of parameters in PaymentPathRetry and add it to
the PaymentPathFailed event. Add a get_retry_route wrapper around
get_route that takes PaymentPathRetry. This allows an EventHandler to
retry failed payment paths using the payee's route hints and features.
Using ignorable TLV decoding is only applicable for an Option containing
an enum, but short_channel_id is an Option<u64>. Use option TLV encoding
instead.
@TheBlueMatt
TheBlueMatt merged commit ca10349 into lightningdevkit:mainOct 25, 2021
@jkczyzjkczyz mentioned this pull request Oct 25, 2021
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.

3 participants

@jkczyz@TheBlueMatt@valentinewallace
, '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

Payee abstraction for use in get_route and PaymentPathFailed - #1134

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg
Oct 25, 2021
Merged

Payee abstraction for use in get_route and PaymentPathFailed#1134
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg

Conversation

@jkczyz

@jkczyzjkczyz commented Oct 20, 2021

Copy link
Copy Markdown
Contributor

Refactor's get_route to take a Payee parameter consisting of the payee's pubkey along with invoice features and route hints, if any. This is included in PaymentPathFailed as part of PaymentPathRetry along with a final amount and CLTV, used for re-computing a Route when retrying payments.

@jkczyz
jkczyz marked this pull request as draft October 20, 2021 14:28
@codecov

codecovBot commented Oct 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1134 (8e7ceab) into main (107c6c7) will increase coverage by 1.08%.
The diff coverage is 84.25%.

Impacted file tree graph

@@ Coverage Diff @@## main #1134 +/- ##
==========================================
+ Coverage 90.40% 91.49% +1.08% 
==========================================
Files 68 68 Lines 34796 40055 +5259 ==========================================
+ Hits 31458 36647 +5189 - Misses 3338 3408 +70 
Impacted FilesCoverage Δ
lightning/src/routing/scorer.rs66.66% <ø> (ø)
lightning/src/util/events.rs33.33% <20.00%> (ø)
lightning-invoice/src/lib.rs88.11% <50.00%> (ø)
lightning/src/routing/router.rs94.58% <83.23%> (-1.13%)⬇️
lightning/src/ln/channelmanager.rs87.41% <91.66%> (+3.89%)⬆️
lightning-invoice/src/utils.rs84.09% <100.00%> (-0.18%)⬇️
lightning/src/ln/functional_test_utils.rs96.54% <100.00%> (+1.45%)⬆️
lightning/src/ln/functional_tests.rs98.10% <100.00%> (+0.69%)⬆️
lightning/src/ln/onion_route_tests.rs96.60% <100.00%> (ø)
lightning/src/ln/shutdown_tests.rs95.89% <100.00%> (+0.01%)⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 107c6c7...8e7ceab. Read the comment docs.

@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from ffae900 to 74d8896CompareOctober 20, 2021 16:33
@TheBlueMattTheBlueMatt added this to the 0.0.103 milestone Oct 21, 2021
@jkczyz
jkczyz marked this pull request as ready for review October 22, 2021 05:39
Comment threadlightning/src/routing/router.rs Outdated
}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Hmm, I thought based on this discussion this type of constructor wasn't supported in the bindings? Wondering what's different in this case

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?

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.

Ah, right... foiled! Took @TheBlueMatt suggestion to maintain expressiveness. I could also make them take &self at the expense of a clone, FWIW. Let me know if you'd prefer that over not exposing them in bindings / making the fields pub.

all_paths_failed,
path: path.clone(),
short_channel_id: Some(path.first().unwrap().short_channel_id),
retry: None,

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.

Hmm, little confused why this isn't set anywhere atm -- maybe I should know this lol, but any TL;DR about how this PR fits into the largest retries picture?

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.

@TheBlueMatt is working on it. Getting this change in allows me to work on the InvoicePayer side independently.

Comment threadlightning/src/routing/router.rs Outdated
(2, short_channel_id, required),
(4, fees, required),
(6, cltv_expiry_delta, required),
(1, htlc_minimum_msat, option),

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.

Don't these need to go in type-order? Is there any test coverage of serializing a RouteHintHop?

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.

Whoops... was hoping we had some magic to write order. 🙂

Re-ordered. I could make them even instead. Not sure if you have a preference on these as they aren't in the invoice.

I guess we'll have coverage once PaymentPathRetry is populated in PaymentPathFailed.

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.

Yea, that all sounds fine, I don't have a preference about required or not.

}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?


/// The recipient of a payment.
#[derive(Clone, Debug)]
pub struct Payee {

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.

To make sure we're on the same page - do we intend to pass a Payee to ChannelManager::send_payment explicitly, or should we include it in the Route object as an extra field?

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.

Hmm... good question. Was thinking we'd pass it in to send_payment. Otherwise, you'd pass it to get_route only to have it cloned to include in the returned Route.

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.

I think I don't have a strong feelings. It kinda feels cool if its just kinda automagically passed in for you, without users having to do anything to get it there or any chance of setting it wrong or something, but its also a bit of a strange API, agreed there.

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.

That's a good point. We'll need to copy the payee potentially for each path anyhow. I'd be ok with adding a field to Route.

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

Going AFK shortly unfortunately, but this is looking fine to me, can't find much to comment on. Can give it another review over the weekend

Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from 5b7f044 to 6477442CompareOctober 22, 2021 22:21
Comment threadlightning/src/routing/router.rs Outdated
A payee can be identified by a pubkey and optionally have an associated
set of invoice features and route hints. Use this in get_route instead
of three separate parameters. This may be included in PaymentPathFailed
later to use when finding a new route.
When a payment path fails, it may be retried. Typically, this means
re-computing the route after updating the NetworkGraph and channel
scores in order to avoid the failing hop. The last hop in
PaymentPathFailed's path field contains the pubkey, amount, and CLTV
values needed to pass to get_route. However, it does not contain the
payee's features and route hints from the invoice.
Include the entire set of parameters in PaymentPathRetry and add it to
the PaymentPathFailed event. Add a get_retry_route wrapper around
get_route that takes PaymentPathRetry. This allows an EventHandler to
retry failed payment paths using the payee's route hints and features.
Using ignorable TLV decoding is only applicable for an Option containing
an enum, but short_channel_id is an Option<u64>. Use option TLV encoding
instead.
@TheBlueMatt
TheBlueMatt merged commit ca10349 into lightningdevkit:mainOct 25, 2021
@jkczyzjkczyz mentioned this pull request Oct 25, 2021
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.

3 participants

@jkczyz@TheBlueMatt@valentinewallace
, '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

Payee abstraction for use in get_route and PaymentPathFailed - #1134

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg
Oct 25, 2021
Merged

Payee abstraction for use in get_route and PaymentPathFailed#1134
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg

Conversation

@jkczyz

@jkczyzjkczyz commented Oct 20, 2021

Copy link
Copy Markdown
Contributor

Refactor's get_route to take a Payee parameter consisting of the payee's pubkey along with invoice features and route hints, if any. This is included in PaymentPathFailed as part of PaymentPathRetry along with a final amount and CLTV, used for re-computing a Route when retrying payments.

@jkczyz
jkczyz marked this pull request as draft October 20, 2021 14:28
@codecov

codecovBot commented Oct 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1134 (8e7ceab) into main (107c6c7) will increase coverage by 1.08%.
The diff coverage is 84.25%.

Impacted file tree graph

@@ Coverage Diff @@## main #1134 +/- ##
==========================================
+ Coverage 90.40% 91.49% +1.08% 
==========================================
Files 68 68 Lines 34796 40055 +5259 ==========================================
+ Hits 31458 36647 +5189 - Misses 3338 3408 +70 
Impacted FilesCoverage Δ
lightning/src/routing/scorer.rs66.66% <ø> (ø)
lightning/src/util/events.rs33.33% <20.00%> (ø)
lightning-invoice/src/lib.rs88.11% <50.00%> (ø)
lightning/src/routing/router.rs94.58% <83.23%> (-1.13%)⬇️
lightning/src/ln/channelmanager.rs87.41% <91.66%> (+3.89%)⬆️
lightning-invoice/src/utils.rs84.09% <100.00%> (-0.18%)⬇️
lightning/src/ln/functional_test_utils.rs96.54% <100.00%> (+1.45%)⬆️
lightning/src/ln/functional_tests.rs98.10% <100.00%> (+0.69%)⬆️
lightning/src/ln/onion_route_tests.rs96.60% <100.00%> (ø)
lightning/src/ln/shutdown_tests.rs95.89% <100.00%> (+0.01%)⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 107c6c7...8e7ceab. Read the comment docs.

@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from ffae900 to 74d8896CompareOctober 20, 2021 16:33
@TheBlueMattTheBlueMatt added this to the 0.0.103 milestone Oct 21, 2021
@jkczyz
jkczyz marked this pull request as ready for review October 22, 2021 05:39
Comment threadlightning/src/routing/router.rs Outdated
}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Hmm, I thought based on this discussion this type of constructor wasn't supported in the bindings? Wondering what's different in this case

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?

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.

Ah, right... foiled! Took @TheBlueMatt suggestion to maintain expressiveness. I could also make them take &self at the expense of a clone, FWIW. Let me know if you'd prefer that over not exposing them in bindings / making the fields pub.

all_paths_failed,
path: path.clone(),
short_channel_id: Some(path.first().unwrap().short_channel_id),
retry: None,

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.

Hmm, little confused why this isn't set anywhere atm -- maybe I should know this lol, but any TL;DR about how this PR fits into the largest retries picture?

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.

@TheBlueMatt is working on it. Getting this change in allows me to work on the InvoicePayer side independently.

Comment threadlightning/src/routing/router.rs Outdated
(2, short_channel_id, required),
(4, fees, required),
(6, cltv_expiry_delta, required),
(1, htlc_minimum_msat, option),

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.

Don't these need to go in type-order? Is there any test coverage of serializing a RouteHintHop?

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.

Whoops... was hoping we had some magic to write order. 🙂

Re-ordered. I could make them even instead. Not sure if you have a preference on these as they aren't in the invoice.

I guess we'll have coverage once PaymentPathRetry is populated in PaymentPathFailed.

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.

Yea, that all sounds fine, I don't have a preference about required or not.

}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?


/// The recipient of a payment.
#[derive(Clone, Debug)]
pub struct Payee {

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.

To make sure we're on the same page - do we intend to pass a Payee to ChannelManager::send_payment explicitly, or should we include it in the Route object as an extra field?

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.

Hmm... good question. Was thinking we'd pass it in to send_payment. Otherwise, you'd pass it to get_route only to have it cloned to include in the returned Route.

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.

I think I don't have a strong feelings. It kinda feels cool if its just kinda automagically passed in for you, without users having to do anything to get it there or any chance of setting it wrong or something, but its also a bit of a strange API, agreed there.

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.

That's a good point. We'll need to copy the payee potentially for each path anyhow. I'd be ok with adding a field to Route.

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

Going AFK shortly unfortunately, but this is looking fine to me, can't find much to comment on. Can give it another review over the weekend

Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from 5b7f044 to 6477442CompareOctober 22, 2021 22:21
Comment threadlightning/src/routing/router.rs Outdated
A payee can be identified by a pubkey and optionally have an associated
set of invoice features and route hints. Use this in get_route instead
of three separate parameters. This may be included in PaymentPathFailed
later to use when finding a new route.
When a payment path fails, it may be retried. Typically, this means
re-computing the route after updating the NetworkGraph and channel
scores in order to avoid the failing hop. The last hop in
PaymentPathFailed's path field contains the pubkey, amount, and CLTV
values needed to pass to get_route. However, it does not contain the
payee's features and route hints from the invoice.
Include the entire set of parameters in PaymentPathRetry and add it to
the PaymentPathFailed event. Add a get_retry_route wrapper around
get_route that takes PaymentPathRetry. This allows an EventHandler to
retry failed payment paths using the payee's route hints and features.
Using ignorable TLV decoding is only applicable for an Option containing
an enum, but short_channel_id is an Option<u64>. Use option TLV encoding
instead.
@TheBlueMatt
TheBlueMatt merged commit ca10349 into lightningdevkit:mainOct 25, 2021
@jkczyzjkczyz mentioned this pull request Oct 25, 2021
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.

3 participants

@jkczyz@TheBlueMatt@valentinewallace
, '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

Payee abstraction for use in get_route and PaymentPathFailed - #1134

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg
Oct 25, 2021
Merged

Payee abstraction for use in get_route and PaymentPathFailed#1134
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg

Conversation

@jkczyz

@jkczyzjkczyz commented Oct 20, 2021

Copy link
Copy Markdown
Contributor

Refactor's get_route to take a Payee parameter consisting of the payee's pubkey along with invoice features and route hints, if any. This is included in PaymentPathFailed as part of PaymentPathRetry along with a final amount and CLTV, used for re-computing a Route when retrying payments.

@jkczyz
jkczyz marked this pull request as draft October 20, 2021 14:28
@codecov

codecovBot commented Oct 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1134 (8e7ceab) into main (107c6c7) will increase coverage by 1.08%.
The diff coverage is 84.25%.

Impacted file tree graph

@@ Coverage Diff @@## main #1134 +/- ##
==========================================
+ Coverage 90.40% 91.49% +1.08% 
==========================================
Files 68 68 Lines 34796 40055 +5259 ==========================================
+ Hits 31458 36647 +5189 - Misses 3338 3408 +70 
Impacted FilesCoverage Δ
lightning/src/routing/scorer.rs66.66% <ø> (ø)
lightning/src/util/events.rs33.33% <20.00%> (ø)
lightning-invoice/src/lib.rs88.11% <50.00%> (ø)
lightning/src/routing/router.rs94.58% <83.23%> (-1.13%)⬇️
lightning/src/ln/channelmanager.rs87.41% <91.66%> (+3.89%)⬆️
lightning-invoice/src/utils.rs84.09% <100.00%> (-0.18%)⬇️
lightning/src/ln/functional_test_utils.rs96.54% <100.00%> (+1.45%)⬆️
lightning/src/ln/functional_tests.rs98.10% <100.00%> (+0.69%)⬆️
lightning/src/ln/onion_route_tests.rs96.60% <100.00%> (ø)
lightning/src/ln/shutdown_tests.rs95.89% <100.00%> (+0.01%)⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 107c6c7...8e7ceab. Read the comment docs.

@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from ffae900 to 74d8896CompareOctober 20, 2021 16:33
@TheBlueMattTheBlueMatt added this to the 0.0.103 milestone Oct 21, 2021
@jkczyz
jkczyz marked this pull request as ready for review October 22, 2021 05:39
Comment threadlightning/src/routing/router.rs Outdated
}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Hmm, I thought based on this discussion this type of constructor wasn't supported in the bindings? Wondering what's different in this case

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?

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.

Ah, right... foiled! Took @TheBlueMatt suggestion to maintain expressiveness. I could also make them take &self at the expense of a clone, FWIW. Let me know if you'd prefer that over not exposing them in bindings / making the fields pub.

all_paths_failed,
path: path.clone(),
short_channel_id: Some(path.first().unwrap().short_channel_id),
retry: None,

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.

Hmm, little confused why this isn't set anywhere atm -- maybe I should know this lol, but any TL;DR about how this PR fits into the largest retries picture?

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.

@TheBlueMatt is working on it. Getting this change in allows me to work on the InvoicePayer side independently.

Comment threadlightning/src/routing/router.rs Outdated
(2, short_channel_id, required),
(4, fees, required),
(6, cltv_expiry_delta, required),
(1, htlc_minimum_msat, option),

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.

Don't these need to go in type-order? Is there any test coverage of serializing a RouteHintHop?

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.

Whoops... was hoping we had some magic to write order. 🙂

Re-ordered. I could make them even instead. Not sure if you have a preference on these as they aren't in the invoice.

I guess we'll have coverage once PaymentPathRetry is populated in PaymentPathFailed.

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.

Yea, that all sounds fine, I don't have a preference about required or not.

}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?


/// The recipient of a payment.
#[derive(Clone, Debug)]
pub struct Payee {

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.

To make sure we're on the same page - do we intend to pass a Payee to ChannelManager::send_payment explicitly, or should we include it in the Route object as an extra field?

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.

Hmm... good question. Was thinking we'd pass it in to send_payment. Otherwise, you'd pass it to get_route only to have it cloned to include in the returned Route.

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.

I think I don't have a strong feelings. It kinda feels cool if its just kinda automagically passed in for you, without users having to do anything to get it there or any chance of setting it wrong or something, but its also a bit of a strange API, agreed there.

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.

That's a good point. We'll need to copy the payee potentially for each path anyhow. I'd be ok with adding a field to Route.

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

Going AFK shortly unfortunately, but this is looking fine to me, can't find much to comment on. Can give it another review over the weekend

Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from 5b7f044 to 6477442CompareOctober 22, 2021 22:21
Comment threadlightning/src/routing/router.rs Outdated
A payee can be identified by a pubkey and optionally have an associated
set of invoice features and route hints. Use this in get_route instead
of three separate parameters. This may be included in PaymentPathFailed
later to use when finding a new route.
When a payment path fails, it may be retried. Typically, this means
re-computing the route after updating the NetworkGraph and channel
scores in order to avoid the failing hop. The last hop in
PaymentPathFailed's path field contains the pubkey, amount, and CLTV
values needed to pass to get_route. However, it does not contain the
payee's features and route hints from the invoice.
Include the entire set of parameters in PaymentPathRetry and add it to
the PaymentPathFailed event. Add a get_retry_route wrapper around
get_route that takes PaymentPathRetry. This allows an EventHandler to
retry failed payment paths using the payee's route hints and features.
Using ignorable TLV decoding is only applicable for an Option containing
an enum, but short_channel_id is an Option<u64>. Use option TLV encoding
instead.
@TheBlueMatt
TheBlueMatt merged commit ca10349 into lightningdevkit:mainOct 25, 2021
@jkczyzjkczyz mentioned this pull request Oct 25, 2021
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.

3 participants

@jkczyz@TheBlueMatt@valentinewallace
, '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

Payee abstraction for use in get_route and PaymentPathFailed - #1134

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg
Oct 25, 2021
Merged

Payee abstraction for use in get_route and PaymentPathFailed#1134
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg

Conversation

@jkczyz

@jkczyzjkczyz commented Oct 20, 2021

Copy link
Copy Markdown
Contributor

Refactor's get_route to take a Payee parameter consisting of the payee's pubkey along with invoice features and route hints, if any. This is included in PaymentPathFailed as part of PaymentPathRetry along with a final amount and CLTV, used for re-computing a Route when retrying payments.

@jkczyz
jkczyz marked this pull request as draft October 20, 2021 14:28
@codecov

codecovBot commented Oct 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1134 (8e7ceab) into main (107c6c7) will increase coverage by 1.08%.
The diff coverage is 84.25%.

Impacted file tree graph

@@ Coverage Diff @@## main #1134 +/- ##
==========================================
+ Coverage 90.40% 91.49% +1.08% 
==========================================
Files 68 68 Lines 34796 40055 +5259 ==========================================
+ Hits 31458 36647 +5189 - Misses 3338 3408 +70 
Impacted FilesCoverage Δ
lightning/src/routing/scorer.rs66.66% <ø> (ø)
lightning/src/util/events.rs33.33% <20.00%> (ø)
lightning-invoice/src/lib.rs88.11% <50.00%> (ø)
lightning/src/routing/router.rs94.58% <83.23%> (-1.13%)⬇️
lightning/src/ln/channelmanager.rs87.41% <91.66%> (+3.89%)⬆️
lightning-invoice/src/utils.rs84.09% <100.00%> (-0.18%)⬇️
lightning/src/ln/functional_test_utils.rs96.54% <100.00%> (+1.45%)⬆️
lightning/src/ln/functional_tests.rs98.10% <100.00%> (+0.69%)⬆️
lightning/src/ln/onion_route_tests.rs96.60% <100.00%> (ø)
lightning/src/ln/shutdown_tests.rs95.89% <100.00%> (+0.01%)⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 107c6c7...8e7ceab. Read the comment docs.

@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from ffae900 to 74d8896CompareOctober 20, 2021 16:33
@TheBlueMattTheBlueMatt added this to the 0.0.103 milestone Oct 21, 2021
@jkczyz
jkczyz marked this pull request as ready for review October 22, 2021 05:39
Comment threadlightning/src/routing/router.rs Outdated
}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Hmm, I thought based on this discussion this type of constructor wasn't supported in the bindings? Wondering what's different in this case

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?

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.

Ah, right... foiled! Took @TheBlueMatt suggestion to maintain expressiveness. I could also make them take &self at the expense of a clone, FWIW. Let me know if you'd prefer that over not exposing them in bindings / making the fields pub.

all_paths_failed,
path: path.clone(),
short_channel_id: Some(path.first().unwrap().short_channel_id),
retry: None,

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.

Hmm, little confused why this isn't set anywhere atm -- maybe I should know this lol, but any TL;DR about how this PR fits into the largest retries picture?

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.

@TheBlueMatt is working on it. Getting this change in allows me to work on the InvoicePayer side independently.

Comment threadlightning/src/routing/router.rs Outdated
(2, short_channel_id, required),
(4, fees, required),
(6, cltv_expiry_delta, required),
(1, htlc_minimum_msat, option),

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.

Don't these need to go in type-order? Is there any test coverage of serializing a RouteHintHop?

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.

Whoops... was hoping we had some magic to write order. 🙂

Re-ordered. I could make them even instead. Not sure if you have a preference on these as they aren't in the invoice.

I guess we'll have coverage once PaymentPathRetry is populated in PaymentPathFailed.

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.

Yea, that all sounds fine, I don't have a preference about required or not.

}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?


/// The recipient of a payment.
#[derive(Clone, Debug)]
pub struct Payee {

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.

To make sure we're on the same page - do we intend to pass a Payee to ChannelManager::send_payment explicitly, or should we include it in the Route object as an extra field?

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.

Hmm... good question. Was thinking we'd pass it in to send_payment. Otherwise, you'd pass it to get_route only to have it cloned to include in the returned Route.

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.

I think I don't have a strong feelings. It kinda feels cool if its just kinda automagically passed in for you, without users having to do anything to get it there or any chance of setting it wrong or something, but its also a bit of a strange API, agreed there.

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.

That's a good point. We'll need to copy the payee potentially for each path anyhow. I'd be ok with adding a field to Route.

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

Going AFK shortly unfortunately, but this is looking fine to me, can't find much to comment on. Can give it another review over the weekend

Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from 5b7f044 to 6477442CompareOctober 22, 2021 22:21
Comment threadlightning/src/routing/router.rs Outdated
A payee can be identified by a pubkey and optionally have an associated
set of invoice features and route hints. Use this in get_route instead
of three separate parameters. This may be included in PaymentPathFailed
later to use when finding a new route.
When a payment path fails, it may be retried. Typically, this means
re-computing the route after updating the NetworkGraph and channel
scores in order to avoid the failing hop. The last hop in
PaymentPathFailed's path field contains the pubkey, amount, and CLTV
values needed to pass to get_route. However, it does not contain the
payee's features and route hints from the invoice.
Include the entire set of parameters in PaymentPathRetry and add it to
the PaymentPathFailed event. Add a get_retry_route wrapper around
get_route that takes PaymentPathRetry. This allows an EventHandler to
retry failed payment paths using the payee's route hints and features.
Using ignorable TLV decoding is only applicable for an Option containing
an enum, but short_channel_id is an Option<u64>. Use option TLV encoding
instead.
@TheBlueMatt
TheBlueMatt merged commit ca10349 into lightningdevkit:mainOct 25, 2021
@jkczyzjkczyz mentioned this pull request Oct 25, 2021
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.

3 participants

@jkczyz@TheBlueMatt@valentinewallace
, '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

Payee abstraction for use in get_route and PaymentPathFailed - #1134

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg
Oct 25, 2021
Merged

Payee abstraction for use in get_route and PaymentPathFailed#1134
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg

Conversation

@jkczyz

@jkczyzjkczyz commented Oct 20, 2021

Copy link
Copy Markdown
Contributor

Refactor's get_route to take a Payee parameter consisting of the payee's pubkey along with invoice features and route hints, if any. This is included in PaymentPathFailed as part of PaymentPathRetry along with a final amount and CLTV, used for re-computing a Route when retrying payments.

@jkczyz
jkczyz marked this pull request as draft October 20, 2021 14:28
@codecov

codecovBot commented Oct 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1134 (8e7ceab) into main (107c6c7) will increase coverage by 1.08%.
The diff coverage is 84.25%.

Impacted file tree graph

@@ Coverage Diff @@## main #1134 +/- ##
==========================================
+ Coverage 90.40% 91.49% +1.08% 
==========================================
Files 68 68 Lines 34796 40055 +5259 ==========================================
+ Hits 31458 36647 +5189 - Misses 3338 3408 +70 
Impacted FilesCoverage Δ
lightning/src/routing/scorer.rs66.66% <ø> (ø)
lightning/src/util/events.rs33.33% <20.00%> (ø)
lightning-invoice/src/lib.rs88.11% <50.00%> (ø)
lightning/src/routing/router.rs94.58% <83.23%> (-1.13%)⬇️
lightning/src/ln/channelmanager.rs87.41% <91.66%> (+3.89%)⬆️
lightning-invoice/src/utils.rs84.09% <100.00%> (-0.18%)⬇️
lightning/src/ln/functional_test_utils.rs96.54% <100.00%> (+1.45%)⬆️
lightning/src/ln/functional_tests.rs98.10% <100.00%> (+0.69%)⬆️
lightning/src/ln/onion_route_tests.rs96.60% <100.00%> (ø)
lightning/src/ln/shutdown_tests.rs95.89% <100.00%> (+0.01%)⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 107c6c7...8e7ceab. Read the comment docs.

@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from ffae900 to 74d8896CompareOctober 20, 2021 16:33
@TheBlueMattTheBlueMatt added this to the 0.0.103 milestone Oct 21, 2021
@jkczyz
jkczyz marked this pull request as ready for review October 22, 2021 05:39
Comment threadlightning/src/routing/router.rs Outdated
}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Hmm, I thought based on this discussion this type of constructor wasn't supported in the bindings? Wondering what's different in this case

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?

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.

Ah, right... foiled! Took @TheBlueMatt suggestion to maintain expressiveness. I could also make them take &self at the expense of a clone, FWIW. Let me know if you'd prefer that over not exposing them in bindings / making the fields pub.

all_paths_failed,
path: path.clone(),
short_channel_id: Some(path.first().unwrap().short_channel_id),
retry: None,

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.

Hmm, little confused why this isn't set anywhere atm -- maybe I should know this lol, but any TL;DR about how this PR fits into the largest retries picture?

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.

@TheBlueMatt is working on it. Getting this change in allows me to work on the InvoicePayer side independently.

Comment threadlightning/src/routing/router.rs Outdated
(2, short_channel_id, required),
(4, fees, required),
(6, cltv_expiry_delta, required),
(1, htlc_minimum_msat, option),

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.

Don't these need to go in type-order? Is there any test coverage of serializing a RouteHintHop?

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.

Whoops... was hoping we had some magic to write order. 🙂

Re-ordered. I could make them even instead. Not sure if you have a preference on these as they aren't in the invoice.

I guess we'll have coverage once PaymentPathRetry is populated in PaymentPathFailed.

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.

Yea, that all sounds fine, I don't have a preference about required or not.

}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?


/// The recipient of a payment.
#[derive(Clone, Debug)]
pub struct Payee {

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.

To make sure we're on the same page - do we intend to pass a Payee to ChannelManager::send_payment explicitly, or should we include it in the Route object as an extra field?

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.

Hmm... good question. Was thinking we'd pass it in to send_payment. Otherwise, you'd pass it to get_route only to have it cloned to include in the returned Route.

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.

I think I don't have a strong feelings. It kinda feels cool if its just kinda automagically passed in for you, without users having to do anything to get it there or any chance of setting it wrong or something, but its also a bit of a strange API, agreed there.

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.

That's a good point. We'll need to copy the payee potentially for each path anyhow. I'd be ok with adding a field to Route.

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

Going AFK shortly unfortunately, but this is looking fine to me, can't find much to comment on. Can give it another review over the weekend

Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from 5b7f044 to 6477442CompareOctober 22, 2021 22:21
Comment threadlightning/src/routing/router.rs Outdated
A payee can be identified by a pubkey and optionally have an associated
set of invoice features and route hints. Use this in get_route instead
of three separate parameters. This may be included in PaymentPathFailed
later to use when finding a new route.
When a payment path fails, it may be retried. Typically, this means
re-computing the route after updating the NetworkGraph and channel
scores in order to avoid the failing hop. The last hop in
PaymentPathFailed's path field contains the pubkey, amount, and CLTV
values needed to pass to get_route. However, it does not contain the
payee's features and route hints from the invoice.
Include the entire set of parameters in PaymentPathRetry and add it to
the PaymentPathFailed event. Add a get_retry_route wrapper around
get_route that takes PaymentPathRetry. This allows an EventHandler to
retry failed payment paths using the payee's route hints and features.
Using ignorable TLV decoding is only applicable for an Option containing
an enum, but short_channel_id is an Option<u64>. Use option TLV encoding
instead.
@TheBlueMatt
TheBlueMatt merged commit ca10349 into lightningdevkit:mainOct 25, 2021
@jkczyzjkczyz mentioned this pull request Oct 25, 2021
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.

3 participants

@jkczyz@TheBlueMatt@valentinewallace
, '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

Payee abstraction for use in get_route and PaymentPathFailed - #1134

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg
Oct 25, 2021
Merged

Payee abstraction for use in get_route and PaymentPathFailed#1134
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg

Conversation

@jkczyz

@jkczyzjkczyz commented Oct 20, 2021

Copy link
Copy Markdown
Contributor

Refactor's get_route to take a Payee parameter consisting of the payee's pubkey along with invoice features and route hints, if any. This is included in PaymentPathFailed as part of PaymentPathRetry along with a final amount and CLTV, used for re-computing a Route when retrying payments.

@jkczyz
jkczyz marked this pull request as draft October 20, 2021 14:28
@codecov

codecovBot commented Oct 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1134 (8e7ceab) into main (107c6c7) will increase coverage by 1.08%.
The diff coverage is 84.25%.

Impacted file tree graph

@@ Coverage Diff @@## main #1134 +/- ##
==========================================
+ Coverage 90.40% 91.49% +1.08% 
==========================================
Files 68 68 Lines 34796 40055 +5259 ==========================================
+ Hits 31458 36647 +5189 - Misses 3338 3408 +70 
Impacted FilesCoverage Δ
lightning/src/routing/scorer.rs66.66% <ø> (ø)
lightning/src/util/events.rs33.33% <20.00%> (ø)
lightning-invoice/src/lib.rs88.11% <50.00%> (ø)
lightning/src/routing/router.rs94.58% <83.23%> (-1.13%)⬇️
lightning/src/ln/channelmanager.rs87.41% <91.66%> (+3.89%)⬆️
lightning-invoice/src/utils.rs84.09% <100.00%> (-0.18%)⬇️
lightning/src/ln/functional_test_utils.rs96.54% <100.00%> (+1.45%)⬆️
lightning/src/ln/functional_tests.rs98.10% <100.00%> (+0.69%)⬆️
lightning/src/ln/onion_route_tests.rs96.60% <100.00%> (ø)
lightning/src/ln/shutdown_tests.rs95.89% <100.00%> (+0.01%)⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 107c6c7...8e7ceab. Read the comment docs.

@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from ffae900 to 74d8896CompareOctober 20, 2021 16:33
@TheBlueMattTheBlueMatt added this to the 0.0.103 milestone Oct 21, 2021
@jkczyz
jkczyz marked this pull request as ready for review October 22, 2021 05:39
Comment threadlightning/src/routing/router.rs Outdated
}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Hmm, I thought based on this discussion this type of constructor wasn't supported in the bindings? Wondering what's different in this case

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?

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.

Ah, right... foiled! Took @TheBlueMatt suggestion to maintain expressiveness. I could also make them take &self at the expense of a clone, FWIW. Let me know if you'd prefer that over not exposing them in bindings / making the fields pub.

all_paths_failed,
path: path.clone(),
short_channel_id: Some(path.first().unwrap().short_channel_id),
retry: None,

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.

Hmm, little confused why this isn't set anywhere atm -- maybe I should know this lol, but any TL;DR about how this PR fits into the largest retries picture?

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.

@TheBlueMatt is working on it. Getting this change in allows me to work on the InvoicePayer side independently.

Comment threadlightning/src/routing/router.rs Outdated
(2, short_channel_id, required),
(4, fees, required),
(6, cltv_expiry_delta, required),
(1, htlc_minimum_msat, option),

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.

Don't these need to go in type-order? Is there any test coverage of serializing a RouteHintHop?

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.

Whoops... was hoping we had some magic to write order. 🙂

Re-ordered. I could make them even instead. Not sure if you have a preference on these as they aren't in the invoice.

I guess we'll have coverage once PaymentPathRetry is populated in PaymentPathFailed.

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.

Yea, that all sounds fine, I don't have a preference about required or not.

}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?


/// The recipient of a payment.
#[derive(Clone, Debug)]
pub struct Payee {

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.

To make sure we're on the same page - do we intend to pass a Payee to ChannelManager::send_payment explicitly, or should we include it in the Route object as an extra field?

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.

Hmm... good question. Was thinking we'd pass it in to send_payment. Otherwise, you'd pass it to get_route only to have it cloned to include in the returned Route.

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.

I think I don't have a strong feelings. It kinda feels cool if its just kinda automagically passed in for you, without users having to do anything to get it there or any chance of setting it wrong or something, but its also a bit of a strange API, agreed there.

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.

That's a good point. We'll need to copy the payee potentially for each path anyhow. I'd be ok with adding a field to Route.

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

Going AFK shortly unfortunately, but this is looking fine to me, can't find much to comment on. Can give it another review over the weekend

Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from 5b7f044 to 6477442CompareOctober 22, 2021 22:21
Comment threadlightning/src/routing/router.rs Outdated
A payee can be identified by a pubkey and optionally have an associated
set of invoice features and route hints. Use this in get_route instead
of three separate parameters. This may be included in PaymentPathFailed
later to use when finding a new route.
When a payment path fails, it may be retried. Typically, this means
re-computing the route after updating the NetworkGraph and channel
scores in order to avoid the failing hop. The last hop in
PaymentPathFailed's path field contains the pubkey, amount, and CLTV
values needed to pass to get_route. However, it does not contain the
payee's features and route hints from the invoice.
Include the entire set of parameters in PaymentPathRetry and add it to
the PaymentPathFailed event. Add a get_retry_route wrapper around
get_route that takes PaymentPathRetry. This allows an EventHandler to
retry failed payment paths using the payee's route hints and features.
Using ignorable TLV decoding is only applicable for an Option containing
an enum, but short_channel_id is an Option<u64>. Use option TLV encoding
instead.
@TheBlueMatt
TheBlueMatt merged commit ca10349 into lightningdevkit:mainOct 25, 2021
@jkczyzjkczyz mentioned this pull request Oct 25, 2021
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.

3 participants

@jkczyz@TheBlueMatt@valentinewallace
, '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

Payee abstraction for use in get_route and PaymentPathFailed - #1134

Merged
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg
Oct 25, 2021
Merged

Payee abstraction for use in get_route and PaymentPathFailed#1134
TheBlueMatt merged 4 commits into
lightningdevkit:mainfrom
jkczyz:2021-10-payee-arg

Conversation

@jkczyz

@jkczyzjkczyz commented Oct 20, 2021

Copy link
Copy Markdown
Contributor

Refactor's get_route to take a Payee parameter consisting of the payee's pubkey along with invoice features and route hints, if any. This is included in PaymentPathFailed as part of PaymentPathRetry along with a final amount and CLTV, used for re-computing a Route when retrying payments.

@jkczyz
jkczyz marked this pull request as draft October 20, 2021 14:28
@codecov

codecovBot commented Oct 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1134 (8e7ceab) into main (107c6c7) will increase coverage by 1.08%.
The diff coverage is 84.25%.

Impacted file tree graph

@@ Coverage Diff @@## main #1134 +/- ##
==========================================
+ Coverage 90.40% 91.49% +1.08% 
==========================================
Files 68 68 Lines 34796 40055 +5259 ==========================================
+ Hits 31458 36647 +5189 - Misses 3338 3408 +70 
Impacted FilesCoverage Δ
lightning/src/routing/scorer.rs66.66% <ø> (ø)
lightning/src/util/events.rs33.33% <20.00%> (ø)
lightning-invoice/src/lib.rs88.11% <50.00%> (ø)
lightning/src/routing/router.rs94.58% <83.23%> (-1.13%)⬇️
lightning/src/ln/channelmanager.rs87.41% <91.66%> (+3.89%)⬆️
lightning-invoice/src/utils.rs84.09% <100.00%> (-0.18%)⬇️
lightning/src/ln/functional_test_utils.rs96.54% <100.00%> (+1.45%)⬆️
lightning/src/ln/functional_tests.rs98.10% <100.00%> (+0.69%)⬆️
lightning/src/ln/onion_route_tests.rs96.60% <100.00%> (ø)
lightning/src/ln/shutdown_tests.rs95.89% <100.00%> (+0.01%)⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 107c6c7...8e7ceab. Read the comment docs.

@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from ffae900 to 74d8896CompareOctober 20, 2021 16:33
@TheBlueMattTheBlueMatt added this to the 0.0.103 milestone Oct 21, 2021
@jkczyz
jkczyz marked this pull request as ready for review October 22, 2021 05:39
Comment threadlightning/src/routing/router.rs Outdated
}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Hmm, I thought based on this discussion this type of constructor wasn't supported in the bindings? Wondering what's different in this case

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?

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.

Ah, right... foiled! Took @TheBlueMatt suggestion to maintain expressiveness. I could also make them take &self at the expense of a clone, FWIW. Let me know if you'd prefer that over not exposing them in bindings / making the fields pub.

all_paths_failed,
path: path.clone(),
short_channel_id: Some(path.first().unwrap().short_channel_id),
retry: None,

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.

Hmm, little confused why this isn't set anywhere atm -- maybe I should know this lol, but any TL;DR about how this PR fits into the largest retries picture?

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.

@TheBlueMatt is working on it. Getting this change in allows me to work on the InvoicePayer side independently.

Comment threadlightning/src/routing/router.rs Outdated
(2, short_channel_id, required),
(4, fees, required),
(6, cltv_expiry_delta, required),
(1, htlc_minimum_msat, option),

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.

Don't these need to go in type-order? Is there any test coverage of serializing a RouteHintHop?

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.

Whoops... was hoping we had some magic to write order. 🙂

Re-ordered. I could make them even instead. Not sure if you have a preference on these as they aren't in the invoice.

I guess we'll have coverage once PaymentPathRetry is populated in PaymentPathFailed.

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.

Yea, that all sounds fine, I don't have a preference about required or not.

}

/// Includes the payee's features.
pub fn with_features(self, features: InvoiceFeatures) -> Self {

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.

Yea, I kinda hate to say it cause its quite nice, but to map this in bindings we have to clone at the ffi. We can keep these constructors, but maybe add a (C-not exported) tag to them and then just make the actual struct fields pub?


/// The recipient of a payment.
#[derive(Clone, Debug)]
pub struct Payee {

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.

To make sure we're on the same page - do we intend to pass a Payee to ChannelManager::send_payment explicitly, or should we include it in the Route object as an extra field?

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.

Hmm... good question. Was thinking we'd pass it in to send_payment. Otherwise, you'd pass it to get_route only to have it cloned to include in the returned Route.

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.

I think I don't have a strong feelings. It kinda feels cool if its just kinda automagically passed in for you, without users having to do anything to get it there or any chance of setting it wrong or something, but its also a bit of a strange API, agreed there.

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.

That's a good point. We'll need to copy the payee potentially for each path anyhow. I'd be ok with adding a field to Route.

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

Going AFK shortly unfortunately, but this is looking fine to me, can't find much to comment on. Can give it another review over the weekend

Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
Comment threadlightning/src/routing/router.rs Outdated
@jkczyz
jkczyzforce-pushed the 2021-10-payee-arg branch 2 times, most recently from 5b7f044 to 6477442CompareOctober 22, 2021 22:21
Comment threadlightning/src/routing/router.rs Outdated
A payee can be identified by a pubkey and optionally have an associated
set of invoice features and route hints. Use this in get_route instead
of three separate parameters. This may be included in PaymentPathFailed
later to use when finding a new route.
When a payment path fails, it may be retried. Typically, this means
re-computing the route after updating the NetworkGraph and channel
scores in order to avoid the failing hop. The last hop in
PaymentPathFailed's path field contains the pubkey, amount, and CLTV
values needed to pass to get_route. However, it does not contain the
payee's features and route hints from the invoice.
Include the entire set of parameters in PaymentPathRetry and add it to
the PaymentPathFailed event. Add a get_retry_route wrapper around
get_route that takes PaymentPathRetry. This allows an EventHandler to
retry failed payment paths using the payee's route hints and features.
Using ignorable TLV decoding is only applicable for an Option containing
an enum, but short_channel_id is an Option<u64>. Use option TLV encoding
instead.
@TheBlueMatt
TheBlueMatt merged commit ca10349 into lightningdevkit:mainOct 25, 2021
@jkczyzjkczyz mentioned this pull request Oct 25, 2021
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.

3 participants

@jkczyz@TheBlueMatt@valentinewallace